phonemgr r331 - in trunk: . cut-n-paste/gconf-bridge

[hadess svn gnome org]

Author: hadess
Date: Wed Feb  4 16:37:58 2009
New Revision: 331
URL: http://svn.gnome.org/viewvc/phonemgr?rev=331&view=rev

Log:
2009-02-04  Bastien Nocera  <hadess hadess net>

	* cut-n-paste/gconf-bridge/Makefile.am:
	* cut-n-paste/gconf-bridge/gconf-bridge.c
	(gconf_bridge_bind_window), (window_binding_unbind),
	(gconf_bridge_bind_string_list_store):
	* cut-n-paste/gconf-bridge/gconf-bridge.h: Update from
	libgconf-bridge



Modified:
   trunk/ChangeLog
   trunk/cut-n-paste/gconf-bridge/Makefile.am
   trunk/cut-n-paste/gconf-bridge/gconf-bridge.c
   trunk/cut-n-paste/gconf-bridge/gconf-bridge.h

Modified: trunk/cut-n-paste/gconf-bridge/Makefile.am
==============================================================================
--- trunk/cut-n-paste/gconf-bridge/Makefile.am	(original)
+++ trunk/cut-n-paste/gconf-bridge/Makefile.am	Wed Feb  4 16:37:58 2009
@@ -6,3 +6,8 @@
 libgconf_bridge_la_SOURCES =	\
 	gconf-bridge.c	\
 	gconf-bridge.h
+
+EGGDIR=$(srcdir)/../../../libgconf-bridge/libgconf-bridge/
+EGGFILES=gconf-bridge.c gconf-bridge.h
+regenerate-built-sources:
+	EGGFILES="$(EGGFILES)" EGGDIR="$(EGGDIR)" $(srcdir)/../update-from-egg.sh || true

Modified: trunk/cut-n-paste/gconf-bridge/gconf-bridge.c
==============================================================================
--- trunk/cut-n-paste/gconf-bridge/gconf-bridge.c	(original)
+++ trunk/cut-n-paste/gconf-bridge/gconf-bridge.c	Wed Feb  4 16:37:58 2009
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <glib/gi18n-lib.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 #include "gconf-bridge.h"
@@ -70,6 +70,7 @@
 
         GtkWindow *window;
         gulong configure_event_id;
+	gulong window_state_event_id;
         gulong unmap_id;
         guint sync_timeout_id;
 } WindowBinding;
@@ -819,7 +820,7 @@
                                         (window_binding_configure_event_cb),
                                   binding);
 
-        binding->configure_event_id =
+        binding->window_state_event_id =
                 g_signal_connect (window,
                                   "window_state_event",
                                   G_CALLBACK
@@ -857,6 +858,8 @@
                 g_signal_handler_disconnect (binding->window,
                                              binding->configure_event_id);
                 g_signal_handler_disconnect (binding->window,
+					     binding->window_state_event_id);
+                g_signal_handler_disconnect (binding->window,
                                              binding->unmap_id);
 
                 g_object_weak_unref (G_OBJECT (binding->window),
@@ -1079,17 +1082,17 @@
                                           (list_store_binding_store_changed_cb),
                                           binding);
         binding->row_changed_id =
-                g_signal_connect_swapped (list_store, "row-inserted",
+                g_signal_connect_swapped (list_store, "row-changed",
                                           G_CALLBACK
                                           (list_store_binding_store_changed_cb),
                                           binding);
         binding->row_deleted_id =
-                g_signal_connect_swapped (list_store, "row-inserted",
+                g_signal_connect_swapped (list_store, "row-deleted",
                                           G_CALLBACK
                                           (list_store_binding_store_changed_cb),
                                           binding);
         binding->rows_reordered_id =
-                g_signal_connect_swapped (list_store, "row-inserted",
+                g_signal_connect_swapped (list_store, "rows-reordered",
                                           G_CALLBACK
                                           (list_store_binding_store_changed_cb),
                                           binding);

Modified: trunk/cut-n-paste/gconf-bridge/gconf-bridge.h
==============================================================================
--- trunk/cut-n-paste/gconf-bridge/gconf-bridge.h	(original)
+++ trunk/cut-n-paste/gconf-bridge/gconf-bridge.h	Wed Feb  4 16:37:58 2009
@@ -23,8 +23,7 @@
 #define __GCONF_BRIDGE_H__
 
 #include <gconf/gconf-client.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS