r968 - trunk/src/target/OM-2007/applications/openmoko-dialer/src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-02-12 16:01:19 +0100 (Mon, 12 Feb 2007)
New Revision: 968

Modified:
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/error.h
   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-history.c
Log:
* Prevent some glib warnings in the dialer


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 15:00:09 UTC (rev 967)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/error.h	2007-02-12 15:01:19 UTC (rev 968)
@@ -53,11 +53,13 @@
 /** @brief Define a error message output */
 #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_MSG(x...)  {if(DBG_WARNING_ON) {g_debug(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__);}}
 
 
+
 #else
 
 #define DBG(x...)

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-02-12 15:00:09 UTC (rev 967)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c	2007-02-12 15:01:19 UTC (rev 968)
@@ -292,7 +292,7 @@
   window_history_init(p_dialer_data); 
 
 
-DBG_WARN("\nusage: \"openmoko-dialer\" will not show any GUI initialy until you reactivate the app using another \"openmoko-dialer\" command");
+  DBG_MSG ("\nusage: \"openmoko-dialer\" will not show any GUI initialy until you reactivate the app using another \"openmoko-dialer\" command");
 
 
 

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-02-12 15:00:09 UTC (rev 967)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h	2007-02-12 15:01:19 UTC (rev 968)
@@ -95,7 +95,7 @@
   gboolean dtmf_in_talking_window;
   gboolean history_need_to_update;
 
-  GtkListStore *g_list_store_filter;    ///<the list store used by the gtktreeview, for displaying the history list dynamically.
+  GtkTreeModel *g_list_store_filter;    ///<the list store used by the gtktreeview, for displaying the history list dynamically.
 
   HISTORY_TYPE g_history_filter_type;   ///<indicates the current history filter type, the gtktreeview will be filtered on the value.
 

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 15:00:09 UTC (rev 967)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c	2007-02-12 15:01:19 UTC (rev 968)
@@ -657,7 +657,7 @@
                                    G_TYPE_INT, -1);
   //we will use a filter to facilitate the filtering in treeview without rebuilding the database.                         
   p_dialer_data->g_list_store_filter =
-    GTK_LIST_STORE (gtk_tree_model_filter_new (GTK_TREE_MODEL (list_store), NULL));
+    gtk_tree_model_filter_new (GTK_TREE_MODEL (list_store), NULL);
   gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER
                                           (p_dialer_data->
                                            g_list_store_filter),