Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r4323 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
2. r4324 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
3. r4325 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/dialer ([EMAIL PROTECTED])
4. r4326 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
5. r4327 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/phone-kit ([EMAIL PROTECTED])
6. r4328 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/phone-kit ([EMAIL PROTECTED])
--- Begin Message ---
Author: rob
Date: 2008-04-08 12:19:34 +0200 (Tue, 08 Apr 2008)
New Revision: 4323
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
Remove the "Lock Phone" option from the power menu.
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2008-04-08
08:57:41 UTC (rev 4322)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2008-04-08
10:19:34 UTC (rev 4323)
@@ -800,11 +800,11 @@
g_signal_connect(G_OBJECT(lock_display), "clicked",
G_CALLBACK(neod_buttonactions_popup_selected_lock_display), NULL);
gtk_box_pack_start_defaults(GTK_BOX(box), lock_display);
-
+#if 0
GtkWidget* lock = gtk_button_new_with_label("Lock Phone");
g_signal_connect( G_OBJECT(lock), "clicked",
G_CALLBACK(neod_buttonactions_popup_selected_lock), NULL );
gtk_box_pack_start_defaults( GTK_BOX(box), lock );
-
+#endif
GtkWidget* poweroff = gtk_button_new_with_label( "Shutdown Now" );
g_signal_connect( G_OBJECT(poweroff), "clicked",
G_CALLBACK(neod_buttonactions_popup_selected_poweroff), NULL );
gtk_box_pack_start_defaults( GTK_BOX(box), poweroff );
--- End Message ---
--- Begin Message ---
Author: rob
Date: 2008-04-08 14:03:56 +0200 (Tue, 08 Apr 2008)
New Revision: 4324
Added:
trunk/src/target/OM-2007.2/daemons/neod/src/wifi.c
trunk/src/target/OM-2007.2/daemons/neod/src/wifi.h
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
Add Wifi control options to the power menu.
Hook up the peripheral control options to the function that actually makes the
changes.
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am 2008-04-08
10:19:34 UTC (rev 4323)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am 2008-04-08
12:03:56 UTC (rev 4324)
@@ -10,7 +10,9 @@
neod_SOURCES = \
buttonactions.c \
- neod-main.c
+ neod-main.c \
+ wifi.c \
+ wifi.h
neod_LDADD = @NEOD_LIBS@ -lapm
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2008-04-08
10:19:34 UTC (rev 4323)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2008-04-08
12:03:56 UTC (rev 4324)
@@ -15,6 +15,8 @@
*/
#include "buttonactions.h"
+#include "wifi.h"
+
#include <gconf/gconf-client.h>
#include <gtk/gtk.h>
@@ -75,6 +77,8 @@
#define HEADPHONE_INSERTION_SWITCHCODE 0x02
#define CHARGER_INSERTION_BUTTON 0x164
+#define WIFI_IFACE "eth0"
+
#define BIT_MASK( name, numbits ) \
unsigned short name[ ((numbits) - 1) / (sizeof( short ) * 8) + 1 ]; \
memset( name, 0, sizeof( name ) )
@@ -106,6 +110,7 @@
GSM = 0,
BLUETOOTH = 1,
GPS = 2,
+ WIFI = 3,
};
enum PowerManagementMode
@@ -652,6 +657,8 @@
return read_boolean_from_path(
"/sys/devices/platform/s3c2410-i2c/i2c-adapter/i2c-0/0-0008/gta01-pm-gps.0/pwron"
);
#endif
return FALSE;
+ case WIFI:
+ return wifi_radio_is_on ( WIFI_IFACE );
default:
g_assert( FALSE ); // should never reach this
}
@@ -677,6 +684,9 @@
write_boolean_to_path(
"/sys/devices/platform/s3c2410-i2c/i2c-adapter/i2c-0/0-0008/gta01-pm-gps.0/power_on",
on );
#endif
break;
+ case WIFI:
+ wifi_radio_control ( WIFI_IFACE, on );
+ break;
default:
g_assert( FALSE ); // should never reach this
}
@@ -685,9 +695,9 @@
void neod_buttonactions_popup_selected_switch_power( GtkWidget* button,
gpointer user_data )
{
gtk_widget_hide( power_menu );
- gboolean new_power_state = !is_turned_on( (int)user_data );
- g_debug( "switch power of unit %d to %d", (int)user_data,
(int)new_power_state );
- //FIXME implement this and notify user
+ gboolean new_power_state = !is_turned_on( GPOINTER_TO_INT( user_data ) );
+ g_debug( "switch power of unit %d to %d", GPOINTER_TO_INT( user_data ),
new_power_state );
+ peripheral_set_power ( GPOINTER_TO_INT( user_data ), new_power_state);
}
void neod_buttonactions_gconf_cb( GConfClient *client, guint cnxn_id,
GConfEntry *entry, gpointer data )
@@ -751,6 +761,7 @@
static GtkWidget* gsmpower = 0;
static GtkWidget* btpower = 0;
static GtkWidget* gpspower = 0;
+ static GtkWidget* wifipower = 0;
static GtkWidget* pmprofile = 0;
// remember last active window before showing popup menu
@@ -773,17 +784,21 @@
// gtk_box_pack_start_defaults( GTK_BOX(box), title );
gsmpower = gtk_button_new();
- g_signal_connect( G_OBJECT(gsmpower), "clicked",
G_CALLBACK(neod_buttonactions_popup_selected_switch_power), (void*)GSM );
+ g_signal_connect( G_OBJECT(gsmpower), "clicked",
G_CALLBACK(neod_buttonactions_popup_selected_switch_power), GINT_TO_POINTER(
GSM ) );
gtk_box_pack_start_defaults( GTK_BOX(box), gsmpower );
btpower = gtk_button_new();
- g_signal_connect( G_OBJECT(btpower), "clicked",
G_CALLBACK(neod_buttonactions_popup_selected_switch_power), (void*)BLUETOOTH );
+ g_signal_connect( G_OBJECT(btpower), "clicked",
G_CALLBACK(neod_buttonactions_popup_selected_switch_power), GINT_TO_POINTER(
BLUETOOTH ) );
gtk_box_pack_start_defaults( GTK_BOX(box), btpower );
gpspower = gtk_button_new();
- g_signal_connect( G_OBJECT(gpspower), "clicked",
G_CALLBACK(neod_buttonactions_popup_selected_switch_power), (void*)GPS );
+ g_signal_connect( G_OBJECT(gpspower), "clicked",
G_CALLBACK(neod_buttonactions_popup_selected_switch_power), GINT_TO_POINTER(
GPS ) );
gtk_box_pack_start_defaults( GTK_BOX(box), gpspower );
+ wifipower = gtk_button_new();
+ g_signal_connect( G_OBJECT(wifipower), "clicked",
G_CALLBACK(neod_buttonactions_popup_selected_switch_power), GINT_TO_POINTER(
WIFI ) );
+ gtk_box_pack_start_defaults( GTK_BOX(box), wifipower );
+
gtk_box_pack_start_defaults( GTK_BOX(box), gtk_hseparator_new() );
pmprofile = gtk_combo_box_new_text();
@@ -821,6 +836,8 @@
gtk_button_set_label( GTK_BUTTON(gsmpower), g_strdup_printf( "Turn %s
GSM", is_turned_on( GSM ) ? "off" : "on" ) );
gtk_button_set_label( GTK_BUTTON(btpower), g_strdup_printf( "Turn %s
Bluetooth", is_turned_on( BLUETOOTH ) ? "off" : "on" ) );
gtk_button_set_label( GTK_BUTTON(gpspower), g_strdup_printf( "Turn %s
GPS", is_turned_on( GPS ) ? "off" : "on" ) );
+ gtk_button_set_label( GTK_BUTTON(wifipower), g_strdup_printf( "Turn %s
Wifi", is_turned_on( WIFI ) ? "off" : "on" ) );
+
int response = gtk_dialog_run( GTK_DIALOG(power_menu) );
g_debug( "gtk_dialog_run completed, response = %d", response );
}
Added: trunk/src/target/OM-2007.2/daemons/neod/src/wifi.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/wifi.c 2008-04-08 10:19:34 UTC
(rev 4323)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/wifi.c 2008-04-08 12:03:56 UTC
(rev 4324)
@@ -0,0 +1,89 @@
+/*
+ * Authored by Rob Bradford <[EMAIL PROTECTED]>
+ * Copyright (C) 2008 OpenMoko, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Public License as published by
+ * the Free Software Foundation; version 2 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Public License for more details.
+ */
+
+
+#include "wifi.h"
+
+gboolean
+wifi_radio_is_on (const gchar *iface)
+{
+ struct iwreq wrq;
+ int sock = 0; /* socket */
+
+ /* Open socket to perform ioctl() on */
+ sock = socket (AF_INET, SOCK_DGRAM, 0);
+ if (!sock)
+ {
+ g_warning ("Unable to open socket: %s", g_strerror (errno));
+ return FALSE;
+ }
+
+ /* Clear our request and set the interface name */
+ memset (&wrq, 0, sizeof (struct iwreq));
+ strncpy ((char *)&wrq.ifr_name, iface, IFNAMSIZ);
+
+ /* Feel the power, uhh, do the ioctl() */
+ if (ioctl (sock, SIOCGIWTXPOW, &wrq) != 0)
+ {
+ g_warning ("Error performing ioctl: %s", g_strerror (errno));
+ close (sock);
+ return FALSE;
+ }
+
+ close (sock);
+
+ return !wrq.u.txpower.disabled;
+}
+
+gboolean
+wifi_radio_control (const gchar *iface, gboolean enable)
+{
+ struct iwreq wrq;
+ int sock = 0; /* socket */
+
+ /* Open socket to perform ioctl() on */
+ sock = socket (AF_INET, SOCK_DGRAM, 0);
+ if (!sock)
+ {
+ g_warning ("Unable to open socket: %s", g_strerror (errno));
+ return FALSE;
+ }
+
+ /* Clear our request and set the interface name */
+ memset (&wrq, 0, sizeof (struct iwreq));
+
+ strncpy ((char *)&wrq.ifr_name, iface, IFNAMSIZ);
+
+ /* Feel the power, uhh, do the ioctl() */
+ if (ioctl (sock, SIOCGIWTXPOW, &wrq) != 0)
+ {
+ g_warning ("Error performing ioctl: %s", g_strerror (errno));
+ close (sock);
+ return FALSE;
+ }
+
+ wrq.u.txpower.disabled = !enable;
+
+ /* Feel the power, uhh, do the ioctl() */
+ if (ioctl (sock, SIOCSIWTXPOW, &wrq) != 0)
+ {
+ g_warning ("Error performing ioctl: %s", g_strerror (errno));
+ close (sock);
+ return FALSE;
+ }
+
+ close (sock);
+
+ return TRUE;
+}
Added: trunk/src/target/OM-2007.2/daemons/neod/src/wifi.h
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/wifi.h 2008-04-08 10:19:34 UTC
(rev 4323)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/wifi.h 2008-04-08 12:03:56 UTC
(rev 4324)
@@ -0,0 +1,34 @@
+/*
+ * Authored by Rob Bradford <[EMAIL PROTECTED]>
+ * Copyright (C) 2008 OpenMoko, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Public License as published by
+ * the Free Software Foundation; version 2 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Public License for more details.
+ */
+
+#ifndef __WIFI_H_
+#define __WIFI_H_
+
+#include <glib.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <netdb.h>
+#include <unistd.h>
+
+#include <linux/if.h>
+#include <linux/wireless.h>
+
+gboolean wifi_radio_is_on (const gchar *iface);
+gboolean wifi_radio_control (const gchar *iface, gboolean enable);
+#endif /* __WIFI_H_ */
+
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-08 15:37:05 +0200 (Tue, 08 Apr 2008)
New Revision: 4325
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
Log:
2008-04-08 Thomas Wood <[EMAIL PROTECTED]>
* src/dialer/dialer-main.c: (main): Revert previous history widget
creation changes until at least after MP image.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-04-08 12:03:56 UTC (rev 4324)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-04-08 13:37:05 UTC (rev 4325)
@@ -1,5 +1,10 @@
2008-04-08 Thomas Wood <[EMAIL PROTECTED]>
+ * src/dialer/dialer-main.c: (main): Revert previous history widget
+ creation changes until at least after MP image.
+
+2008-04-08 Thomas Wood <[EMAIL PROTECTED]>
+
* src/common/Makefile.am: Add missing header file
* src/dialer/dialer-main.c: (program_log), (main): Create the history
widget after everything else has loaded, unless it is explicitly
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
2008-04-08 12:03:56 UTC (rev 4324)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
2008-04-08 13:37:05 UTC (rev 4325)
@@ -29,13 +29,10 @@
{
GtkWidget *notebook;
GtkWidget *history;
-
- GtkWidget *history_placeholder;
GtkWidget *main_window;
DBusGProxy *dialer_proxy;
- MokoJournal *journal;
} DialerData;
static gboolean show_missed;
@@ -101,18 +98,6 @@
g_free (str);
}
-gboolean
-create_history_window (DialerData *data)
-{
- /* create the history window in an idle callback, if we don't need it
straight
- * away */
- data->history = moko_history_new (data->journal);
- g_signal_connect (data->history, "dial_number", G_CALLBACK
(dial_clicked_cb), data);
- gtk_container_add (GTK_CONTAINER (data->history_placeholder), data->history);
- return FALSE;
-
-}
-
int main (int argc, char **argv)
{
GtkWidget *window, *keypad;
@@ -168,7 +153,7 @@
/* Set up the journal */
program_log ("load journal");
- data->journal = journal = moko_journal_open_default ();
+ journal = moko_journal_open_default ();
if (!journal || !moko_journal_load_from_storage (journal))
{
g_warning ("Could not load journal");
@@ -195,32 +180,20 @@
gtk_notebook_append_page (GTK_NOTEBOOK (data->notebook), keypad,
gtk_image_new_from_file (PKGDATADIR"/dtmf.png"));
gtk_container_child_set (GTK_CONTAINER (data->notebook), keypad,
"tab-expand", TRUE, NULL);
-
+ /* History */
program_log ("create history widget");
- if (!show_missed)
- {
- /* set a temporary widget while we create the real history widget */
- data->history_placeholder = gtk_alignment_new (0, 0, 1, 1);
- gtk_notebook_append_page (GTK_NOTEBOOK (data->notebook),
data->history_placeholder,
- gtk_image_new_from_icon_name
("moko-call-history",
- GTK_ICON_SIZE_BUTTON));
- gtk_container_child_set (GTK_CONTAINER (data->notebook),
data->history_placeholder,
- "tab-expand", TRUE,
- NULL);
- /* wait until everything else finishes before creating the history widget
*/
- g_idle_add ((GSourceFunc) create_history_window, data);
- }
- else
- {
- /* we need to show the history window right now, so don't delay creation */
- create_history_window (data);
- }
+ data->history = moko_history_new (journal);
+ g_signal_connect (data->history, "dial_number", G_CALLBACK
(dial_clicked_cb), data);
+ gtk_notebook_append_page (GTK_NOTEBOOK (data->notebook), data->history,
+ gtk_image_new_from_icon_name ("moko-call-history",
+ GTK_ICON_SIZE_BUTTON));
+ gtk_container_child_set (GTK_CONTAINER (data->notebook), data->history,
+ "tab-expand", TRUE,
+ NULL);
program_log ("show window");
gtk_widget_show_all (window);
-
- /* History */
if (show_missed)
gtk_notebook_set_current_page (GTK_NOTEBOOK (data->notebook), 1);
else
--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-04-08 17:05:59 +0200 (Tue, 08 Apr 2008)
New Revision: 4326
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: modify gsm, gps, bluetooth device PATH (Erin Yueh)
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2008-04-08
13:37:05 UTC (rev 4325)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2008-04-08
15:05:59 UTC (rev 4326)
@@ -644,17 +644,17 @@
{
case GSM:
#ifdef NEOD_PLATFORM_FIC_NEO1973
- return read_boolean_from_path(
"/sys/devices/platform/gta01-pm-gsm.0/power_on" );
+ return read_boolean_from_path(
"/sys/bus/platform/devices/neo1973-pm-gsm.0/power_on" );
#endif
return FALSE;
case BLUETOOTH:
#ifdef NEOD_PLATFORM_FIC_NEO1973
- return read_boolean_from_path(
"/sys/devices/platform/s3c2410-i2c/i2c-adapter/i2c-0/0-0008/gta01-pm-bt.0/power_on"
);
+ return read_boolean_from_path(
"/sys/bus/platform/devices/neo1973-pm-bt.0/power_on" );
#endif
return FALSE;
case GPS:
#ifdef NEOD_PLATFORM_FIC_NEO1973
- return read_boolean_from_path(
"/sys/devices/platform/s3c2410-i2c/i2c-adapter/i2c-0/0-0008/gta01-pm-gps.0/pwron"
);
+ return read_boolean_from_path(
"/sys/bus/platform/devices/neo1973-pm-gps.0/pwron" );
#endif
return FALSE;
case WIFI:
@@ -676,12 +676,13 @@
break;
case BLUETOOTH:
#ifdef NEOD_PLATFORM_FIC_NEO1973
- write_boolean_to_path(
"/sys/devices/platform/s3c2410-i2c/i2c-adapter/i2c-0/0-0008/gta01-pm-bt.0/power_on",
on );
+ write_boolean_to_path(
"/sys/bus/platform/devices/neo1973-pm-bt.0/power_on", on );
+ write_boolean_to_path(
"/sys/bus/platform/devices/neo1973-pm-bt.0/reset", 0 );
#endif
break;
case GPS:
#ifdef NEOD_PLATFORM_FIC_NEO1973
- write_boolean_to_path(
"/sys/devices/platform/s3c2410-i2c/i2c-adapter/i2c-0/0-0008/gta01-pm-gps.0/power_on",
on );
+ write_boolean_to_path(
"/sys/bus/platform/devices/neo1973-pm-gps.0/pwron", on );
#endif
break;
case WIFI:
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-08 18:10:48 +0200 (Tue, 08 Apr 2008)
New Revision: 4327
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
Log:
2008-04-08 Thomas Wood <[EMAIL PROTECTED]>
* src/phone-kit/moko-talking.c: (moko_talking_init): Remove toolbar
separators to make UI consistent with other applications
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-04-08 15:05:59 UTC (rev 4326)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-04-08 16:10:48 UTC (rev 4327)
@@ -1,5 +1,10 @@
2008-04-08 Thomas Wood <[EMAIL PROTECTED]>
+ * src/phone-kit/moko-talking.c: (moko_talking_init): Remove toolbar
+ separators to make UI consistent with other applications
+
+2008-04-08 Thomas Wood <[EMAIL PROTECTED]>
+
* src/dialer/dialer-main.c: (main): Revert previous history widget
creation changes until at least after MP image.
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
2008-04-08 15:05:59 UTC (rev 4326)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
2008-04-08 16:10:48 UTC (rev 4327)
@@ -545,21 +545,17 @@
item = gtk_tool_button_new (gtk_image_new_from_file
(PKGDATADIR"/moko-call-answer.png"), NULL);
gtk_tool_item_set_expand (item, TRUE);
g_signal_connect (item, "clicked", G_CALLBACK (on_answer_clicked), talking);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 0);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (),
1);
-
item = gtk_tool_button_new (gtk_image_new_from_file
(PKGDATADIR"/moko-call-ignore.png"), NULL);
gtk_tool_item_set_expand (item, TRUE);
g_signal_connect (item, "clicked", G_CALLBACK (on_silence_clicked), talking);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 2);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (),
3);
-
item = gtk_tool_button_new (gtk_image_new_from_file
(PKGDATADIR"/moko-call-hangup.png"), NULL);
gtk_tool_item_set_expand (item, TRUE);
g_signal_connect (item, "clicked", G_CALLBACK (on_reject_clicked), talking);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 4);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
/* Volume controls */
priv->headphone = moko_alsa_volume_control_new ();
@@ -580,15 +576,13 @@
gtk_tool_item_set_expand (item, TRUE);
g_signal_connect (item, "toggled", G_CALLBACK (on_speaker_toggled), talking);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 0);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
priv->speaker_toggle_btn = item;
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (),
1);
-
item = gtk_tool_button_new (gtk_image_new_from_file
(PKGDATADIR"/moko-call-hangup.png"), NULL);
gtk_tool_item_set_expand (item, TRUE);
g_signal_connect (item, "clicked", G_CALLBACK (on_cancel_clicked), talking);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 2);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
/* The title label and image */
vbox = gtk_vbox_new (FALSE, 0);
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-08 22:55:03 +0200 (Tue, 08 Apr 2008)
New Revision: 4328
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network-dbus.xml
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.h
Log:
2008-04-08 Thomas Wood <[EMAIL PROTECTED]>
* src/phone-kit/moko-network-dbus.xml:
* src/phone-kit/moko-network.c:
(moko_network_get_home_country_code):
* src/phone-kit/moko-network.h:
Add get_imsi method to MokoNetwork object
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-04-08 16:10:48 UTC (rev 4327)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-04-08 20:55:03 UTC (rev 4328)
@@ -1,5 +1,14 @@
2008-04-08 Thomas Wood <[EMAIL PROTECTED]>
+ * src/phone-kit/moko-network-dbus.xml:
+ * src/phone-kit/moko-network.c:
+ (moko_network_get_home_country_code):
+ * src/phone-kit/moko-network.h:
+
+ Add get_imsi method to MokoNetwork object
+
+2008-04-08 Thomas Wood <[EMAIL PROTECTED]>
+
* src/phone-kit/moko-talking.c: (moko_talking_init): Remove toolbar
separators to make UI consistent with other applications
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network-dbus.xml
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network-dbus.xml
2008-04-08 16:10:48 UTC (rev 4327)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network-dbus.xml
2008-04-08 20:55:03 UTC (rev 4328)
@@ -21,6 +21,10 @@
<arg type="s" name="dial_code" direction="out" />
</method>
+ <method name="GetImsi">
+ <arg type="s" name="imsi" direction="out" />
+ </method>
+
<signal name="SubscriberNumberChanged">
<arg type="s" name="number" />
</signal>
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c
2008-04-08 16:10:48 UTC (rev 4327)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c
2008-04-08 20:55:03 UTC (rev 4328)
@@ -1094,3 +1094,25 @@
return TRUE;
}
+gboolean
+moko_network_get_imsi (MokoNetwork *self, gchar **imsi, GError **error)
+{
+ MokoNetworkPrivate *priv;
+
+ if (!moko_network_get_lgsm_handle (self, NULL, error)) return FALSE;
+ if (!moko_network_check_registration (self, error)) return FALSE;
+ priv = self->priv;
+
+ if (!priv->imsi) {
+ if (error) *error = g_error_new (PHONE_KIT_NETWORK_ERROR,
+ PK_NETWORK_ERROR_NO_IMSI,
+ "Unable to retrieve IMSI");
+ return FALSE;
+ }
+
+ if (imsi)
+ *imsi = g_strdup (priv->imsi);
+
+ return TRUE;
+
+}
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.h
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.h
2008-04-08 16:10:48 UTC (rev 4327)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.h
2008-04-08 20:55:03 UTC (rev 4328)
@@ -127,6 +127,9 @@
moko_network_get_home_country_code (MokoNetwork *self, gchar **dial_code,
GError **error);
+gboolean
+moko_network_get_imsi (MokoNetwork *self, gchar **imsi, GError **error);
+
G_END_DECLS
#endif /* _HAVE_MOKO_NETWORK_H */
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
