r1822 - trunk/src/target/OM-2007/applications/openmoko-dialer/src
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Tue Apr 24 17:03:40 CEST 2007
Author: thomas
Date: 2007-04-24 17:03:39 +0200 (Tue, 24 Apr 2007)
New Revision: 1822
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
Log:
* Remove remaining references to custom mainloop
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c 2007-04-24 14:54:40 UTC (rev 1821)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c 2007-04-24 15:03:39 UTC (rev 1822)
@@ -317,16 +317,9 @@
g_set_application_name ("OpenMoko Dialer");
-// gtk_main();
-
-
-
- GMainLoop *mainloop = 0;
- mainloop = g_main_loop_new (NULL, FALSE);
- p_dialer_data->mainloop = mainloop;
-
signal (SIGUSR1, handle_sigusr1);
-//init the dialer window
+
+ //init the dialer window
window_dialer_init (p_dialer_data);
window_incoming_init (p_dialer_data);
window_pin_init (p_dialer_data);
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h 2007-04-24 14:54:40 UTC (rev 1821)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h 2007-04-24 15:03:39 UTC (rev 1822)
@@ -35,8 +35,6 @@
//the global data area begins here
struct lgsm_handle *lh;
- GMainLoop *mainloop;
-
char str_sim_pin[MOKO_DIALER_MAX_PIN_LEN + 1];
gint int_sim_pin_end_point;
MokoDialerTextview *moko_dialer_text_view; ///<the textview for the dialer window
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c 2007-04-24 14:54:40 UTC (rev 1821)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c 2007-04-24 15:03:39 UTC (rev 1822)
@@ -232,8 +232,7 @@
on_dialer_menu_close (GtkWidget * widget, gpointer user_data)
{
MOKO_DIALER_APP_DATA *appdata = (MOKO_DIALER_APP_DATA *) user_data;
- g_main_loop_quit (appdata->mainloop);
-
+ gtk_main_quit ();
}
void
More information about the commitlog
mailing list