Mercurial > dwindows

changeset 1742:cebf830e3da7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor GTK3 code cleanups from attempt at fixing combobox event order.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 03 Jun 2012 19:09:41 +0000
parents 1b3b059a74b1
children a297b2bde127
files gtk3/dw.c
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gtk3/dw.c	Fri Jun 01 23:05:21 2012 +0000
+++ b/gtk3/dw.c	Sun Jun 03 19:09:41 2012 +0000
@@ -1329,10 +1329,9 @@
 static gint _combobox_select_event(GtkWidget *widget, gpointer data)
 {
    SignalHandler work = _get_signal_handler(widget, data);
-   static int _dw_recursing = 0;
    int retval = FALSE;
 
-   if(_dw_recursing)
+   if(g_object_get_data(G_OBJECT(widget), "_dw_recursing"))
       return FALSE;
 
    if(work.window && GTK_IS_COMBO_BOX(widget))
@@ -1344,7 +1343,7 @@
          GtkTreeIter iter;
          GtkTreePath *path;
 
-         _dw_recursing = 1;
+         g_object_set_data(G_OBJECT(widget), "_dw_recursing", GINT_TO_POINTER(1));
 
          if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter))
          {
@@ -1364,7 +1363,7 @@
             }
          }
 
-         _dw_recursing = 0;
+         g_object_set_data(G_OBJECT(widget), "_dw_recursing", NULL);
       }
    }
    return retval;
@@ -4403,7 +4402,7 @@
  */
 char *dw_window_get_text(HWND handle)
 {
-   const char *possible = "";
+   const char *possible = NULL;
    int _locked_by_me = FALSE;
 
    DW_MUTEX_LOCK;
@@ -4413,7 +4412,7 @@
       possible = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(handle))));
 
    DW_MUTEX_UNLOCK;
-   return strdup(possible);
+   return strdup(possible ? possible : "");
 }
 
 /*