r963 - trunk/src/target/OM-2007/applications/openmoko-dialer/src
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Mon Feb 12 13:21:28 CET 2007
Author: thomas
Date: 2007-02-12 13:21:26 +0100 (Mon, 12 Feb 2007)
New Revision: 963
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/error.h
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-history.c
Log:
* Prevent UI from appearing up and disappearing before needed
* Use glib debug functions in debug macros
* Prevent a segfault from finger wheel
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/error.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/error.h 2007-02-12 09:21:19 UTC (rev 962)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/error.h 2007-02-12 12:21:26 UTC (rev 963)
@@ -48,17 +48,16 @@
#ifdef _FIC_DEBUG
/** @brief Define a debug message output */
-#define DBG_MESSAGE(x...) {if(DBG_MESSAGE_ON) {g_print(x);g_print("\n");}}
+#define DBG_MESSAGE(x...) {if(DBG_MESSAGE_ON) {g_debug(x);}}
/** @brief Define a error message output */
-#define DBG_ERROR(x...) {if(DBG_ERROR_ON) {g_print("%s : %s : %d\nERROR:\n",__FILE__,__FUNCTION__,__LINE__);g_print(x);g_print("\n");}}
+#define DBG_ERROR(x...) {if(DBG_ERROR_ON) {g_error ("%s : %s : %d\nERROR:\n",__FILE__,__FUNCTION__,__LINE__);g_error(x);}}
+#define DBG_WARN(x...) {if(DBG_WARNING_ON) {g_warning(x);}}
+#define DBG_ENTER() {if(DBG_FUN_ENTER_ON) {g_debug("ENTER: %s() : %s:%d",__FUNCTION__,__FILE__,__LINE__);}}
+#define DBG_LEAVE() {if(DBG_FUN_LEAVE_ON) {g_debug("LEAVE: %s() : %s:%d",__FUNCTION__,__FILE__,__LINE__);}}
+#define DBG_TRACE() {if(DBG_TRACE_ON) {g_debug("TRACE: %s() : %s:%d",__FUNCTION__,__FILE__,__LINE__);}}
-#define DBG_WARN(x...) {if(DBG_WARNING_ON) {g_print("WARN:\n");g_print(x);g_print("\n");}}
-#define DBG_ENTER() {if(DBG_FUN_ENTER_ON) {g_print(">>>>>>>>%s : %d\n",__FUNCTION__,__LINE__);}}
-#define DBG_LEAVE() {if(DBG_FUN_LEAVE_ON) {g_print("%s : %d>>>>>>>\n",__FUNCTION__,__LINE__);}}
-#define DBG_TRACE() {if(DBG_TRACE_ON) {g_print("TRACE: %s : %d\n\n",__FUNCTION__,__LINE__);}}
-
#else
#define DBG(x...)
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-02-12 09:21:19 UTC (rev 962)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c 2007-02-12 12:21:26 UTC (rev 963)
@@ -216,12 +216,9 @@
}
void
-on_dialer_menu_hide (GtkWidget * widget, gpointer user_data)
+on_dialer_menu_hide (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
{
- MOKO_DIALER_APP_DATA *appdata = (MOKO_DIALER_APP_DATA *) user_data;
gtk_widget_hide (appdata->window_dialer);
-
-
}
@@ -266,7 +263,6 @@
on_dialer_panel_user_hold (GtkWidget * widget, gchar parac,
gpointer user_data)
{
-
g_print ("on_dialer_panel_user_hold:%c\n", parac);
}
@@ -274,17 +270,16 @@
on_window_dialer_hide (GtkWidget *widget,
MOKO_DIALER_APP_DATA * appdata)
{
-appdata->window_present=0;
-
+ appdata->window_present=0;
}
void
on_window_dialer_show (GtkWidget *widget,
MOKO_DIALER_APP_DATA * appdata)
{
-DBG_ENTER();
-appdata->window_present=widget;
-DBG_LEAVE();
+ DBG_ENTER();
+ appdata->window_present=widget;
+ DBG_LEAVE();
}
@@ -325,13 +320,15 @@
moko_finger_window_set_application_menu (MOKO_FINGER_WINDOW (window), appmenu);
-// g_signal_connect( G_OBJECT(window), "delete_event", G_CALLBACK( gtk_main_quit ), NULL );
+ g_signal_connect(G_OBJECT (window), "delete_event",
+ G_CALLBACK (gtk_widget_hide_on_delete),
+ NULL);
g_signal_connect (G_OBJECT (window), "show",
- G_CALLBACK (on_window_dialer_show),
- p_dialer_data);
+ G_CALLBACK (on_window_dialer_show),
+ p_dialer_data);
g_signal_connect (G_OBJECT (window), "hide",
- G_CALLBACK (on_window_dialer_hide),
- p_dialer_data);
+ G_CALLBACK (on_window_dialer_hide),
+ p_dialer_data);
@@ -341,8 +338,6 @@
GtkWidget *eventbox1 = gtk_event_box_new ();
- gtk_widget_show (eventbox1);
- // gtk_widget_set_size_request (eventbox1, 480, 132);
gtk_widget_set_name (eventbox1, "gtkeventbox-black");
GtkWidget *autolist = moko_dialer_autolist_new ();
@@ -373,7 +368,6 @@
eventbox1 = gtk_event_box_new ();
- gtk_widget_show (eventbox1);
gtk_widget_set_name (eventbox1, "gtkeventbox-black");
gtk_widget_modify_bg (eventbox1, GTK_STATE_NORMAL, &color);
// gtk_widget_set_size_request (eventbox1, 480, 132);
@@ -461,14 +455,8 @@
moko_finger_window_set_contents (MOKO_FINGER_WINDOW (window), vbox);
-
p_dialer_data->window_dialer = window;
- gtk_widget_show_all (window);
- gtk_widget_hide(window);
-
-
-
}
return 1;
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c 2007-02-12 09:21:19 UTC (rev 962)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c 2007-02-12 12:21:26 UTC (rev 963)
@@ -359,13 +359,14 @@
- gtk_widget_show_all (GTK_WIDGET (window));
+ // gtk_widget_show_all (GTK_WIDGET (window));
//the gtk_widget_show_all is really bad, cause i have to call it and then hide some widgets.
//now the wheel and tool box, why should the wheel and toolbox created after the gtk_widget_show_all???
- gtk_widget_show (GTK_WIDGET (moko_finger_window_get_wheel (window)));
+ // This causes a segfault for me... maybe a problem in libmokoui? - thomas
+ //gtk_widget_show (GTK_WIDGET (moko_finger_window_get_wheel (window)));
g_signal_connect (G_OBJECT (moko_finger_window_get_wheel (window)),
"press_left_up",
@@ -408,7 +409,7 @@
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_tool_button_history_delete_clicked),
p_dialer_data);
- gtk_widget_show (GTK_WIDGET (tools));
+ //gtk_widget_show (GTK_WIDGET (tools));
button =
GTK_WIDGET (moko_finger_tool_box_add_button_without_label (tools));
@@ -418,12 +419,12 @@
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_tool_button_history_back_clicked),
p_dialer_data);
- gtk_widget_show (GTK_WIDGET (tools));
+ //gtk_widget_show (GTK_WIDGET (tools));
p_dialer_data->wheel_history = GTK_WIDGET (moko_finger_window_get_wheel (window));
p_dialer_data->toolbox_history = GTK_WIDGET (tools);
- gtk_widget_hide (GTK_WIDGET (window));
+ //gtk_widget_hide (GTK_WIDGET (window));
DBG_LEAVE ();
}
More information about the commitlog
mailing list
