libegg r886 - in trunk: . libegg/iconchooser libegg/iconlist libegg/toolbar

[chpe svn gnome org]

Author: chpe
Date: Fri Jun 20 15:04:54 2008
New Revision: 886
URL: http://svn.gnome.org/viewvc/libegg?rev=886&view=rev

Log:
	* libegg/iconchooser/prop-editor.c: (connect_controller),
	(property_widget):
	* libegg/iconlist/prop-editor.c: (connect_controller),
	(property_widget):
	* libegg/toolbar/eggtoolbar.c: (egg_toolbar_append_item),
	(egg_toolbar_prepend_item), (egg_toolbar_insert_item),
	(egg_toolbar_insert_stock), (egg_toolbar_append_element),
	(egg_toolbar_prepend_element), (egg_toolbar_insert_element),
	(egg_toolbar_internal_insert_element):
	* libegg/toolbar/eggtoolbar.h:
	* libegg/toolbar/prop-editor.c: (g_object_connect_property),
	(connect_controller), (property_widget): Use GCallback instead of
	GtkSignalFunc.

Modified:
   trunk/ChangeLog
   trunk/libegg/iconchooser/prop-editor.c
   trunk/libegg/iconlist/prop-editor.c
   trunk/libegg/toolbar/eggtoolbar.c
   trunk/libegg/toolbar/eggtoolbar.h
   trunk/libegg/toolbar/prop-editor.c

Modified: trunk/libegg/iconchooser/prop-editor.c
==============================================================================
--- trunk/libegg/iconchooser/prop-editor.c	(original)
+++ trunk/libegg/iconchooser/prop-editor.c	Fri Jun 20 15:04:54 2008
@@ -101,7 +101,7 @@
                     const gchar *signal,
                     GObject *model,
                     const gchar *prop_name,
-                    GtkSignalFunc func)
+                    GCallback func)
 {
   ObjectProperty *p;
 
@@ -500,7 +500,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec->name, (GtkSignalFunc) int_modified);
+			    object, spec->name, (GCallback) int_modified);
     }
   else if (type == G_TYPE_PARAM_UINT)
     {
@@ -521,7 +521,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec->name, (GtkSignalFunc) uint_modified);
+			    object, spec->name, (GCallback) uint_modified);
     }
   else if (type == G_TYPE_PARAM_FLOAT)
     {
@@ -542,7 +542,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec->name, (GtkSignalFunc) float_modified);
+			    object, spec->name, (GCallback) float_modified);
     }
   else if (type == G_TYPE_PARAM_DOUBLE)
     {
@@ -562,7 +562,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec->name, (GtkSignalFunc) double_modified);
+			    object, spec->name, (GCallback) double_modified);
     }
   else if (type == G_TYPE_PARAM_STRING)
     {
@@ -574,7 +574,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (prop_edit), "changed",
-			    object, spec->name, (GtkSignalFunc) string_modified);
+			    object, spec->name, (GCallback) string_modified);
     }
   else if (type == G_TYPE_PARAM_BOOLEAN)
     {
@@ -586,7 +586,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (prop_edit), "toggled",
-			    object, spec->name, (GtkSignalFunc) bool_modified);
+			    object, spec->name, (GCallback) bool_modified);
     }
   else if (type == G_TYPE_PARAM_ENUM)
     {
@@ -625,7 +625,7 @@
 	
 	if (can_modify)
 	  connect_controller (G_OBJECT (prop_edit), "changed",
-			      object, spec->name, (GtkSignalFunc) enum_modified);
+			      object, spec->name, (GCallback) enum_modified);
       }
     }
   else if (type == G_TYPE_PARAM_UNICHAR)
@@ -639,7 +639,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (prop_edit), "changed",
-			    object, spec->name, (GtkSignalFunc) unichar_modified);
+			    object, spec->name, (GCallback) unichar_modified);
     }
   else if (type == G_TYPE_PARAM_POINTER)
     {

Modified: trunk/libegg/iconlist/prop-editor.c
==============================================================================
--- trunk/libegg/iconlist/prop-editor.c	(original)
+++ trunk/libegg/iconlist/prop-editor.c	Fri Jun 20 15:04:54 2008
@@ -100,7 +100,7 @@
                     const gchar *signal,
                     GObject *model,
                     const gchar *prop_name,
-                    GtkSignalFunc func)
+                    GCallback func)
 {
   ObjectProperty *p;
 
@@ -499,7 +499,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec->name, (GtkSignalFunc) int_modified);
+			    object, spec->name, (GCallback) int_modified);
     }
   else if (type == G_TYPE_PARAM_UINT)
     {
@@ -520,7 +520,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec->name, (GtkSignalFunc) uint_modified);
+			    object, spec->name, (GCallback) uint_modified);
     }
   else if (type == G_TYPE_PARAM_FLOAT)
     {
@@ -541,7 +541,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec->name, (GtkSignalFunc) float_modified);
+			    object, spec->name, (GCallback) float_modified);
     }
   else if (type == G_TYPE_PARAM_DOUBLE)
     {
@@ -561,7 +561,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec->name, (GtkSignalFunc) double_modified);
+			    object, spec->name, (GCallback) double_modified);
     }
   else if (type == G_TYPE_PARAM_STRING)
     {
@@ -573,7 +573,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (prop_edit), "changed",
-			    object, spec->name, (GtkSignalFunc) string_modified);
+			    object, spec->name, (GCallback) string_modified);
     }
   else if (type == G_TYPE_PARAM_BOOLEAN)
     {
@@ -585,7 +585,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (prop_edit), "toggled",
-			    object, spec->name, (GtkSignalFunc) bool_modified);
+			    object, spec->name, (GCallback) bool_modified);
     }
   else if (type == G_TYPE_PARAM_ENUM)
     {
@@ -624,7 +624,7 @@
 	
 	if (can_modify)
 	  connect_controller (G_OBJECT (prop_edit), "changed",
-			      object, spec->name, (GtkSignalFunc) enum_modified);
+			      object, spec->name, (GCallback) enum_modified);
       }
     }
   else if (type == G_TYPE_PARAM_UNICHAR)
@@ -638,7 +638,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (prop_edit), "changed",
-			    object, spec->name, (GtkSignalFunc) unichar_modified);
+			    object, spec->name, (GCallback) unichar_modified);
     }
   else if (type == G_TYPE_PARAM_POINTER)
     {

Modified: trunk/libegg/toolbar/eggtoolbar.c
==============================================================================
--- trunk/libegg/toolbar/eggtoolbar.c	(original)
+++ trunk/libegg/toolbar/eggtoolbar.c	Fri Jun 20 15:04:54 2008
@@ -173,7 +173,7 @@
 						       const char          *tooltip_text,
 						       const char          *tooltip_private_text,
 						       GtkWidget           *icon,
-						       GtkSignalFunc        callback,
+						       GCallback        callback,
 						       gpointer             user_data,
 						       gint                 position,
 						       gboolean             use_stock);
@@ -2383,7 +2383,7 @@
 			 const char    *tooltip_text,
 			 const char    *tooltip_private_text,
 			 GtkWidget     *icon,
-			 GtkSignalFunc  callback,
+			 GCallback  callback,
 			 gpointer       user_data)
 {
   return egg_toolbar_insert_element (toolbar, EGG_TOOLBAR_CHILD_BUTTON,
@@ -2399,7 +2399,7 @@
 			  const char    *tooltip_text,
 			  const char    *tooltip_private_text,
 			  GtkWidget     *icon,
-			  GtkSignalFunc  callback,
+			  GCallback  callback,
 			  gpointer       user_data)
 {
   return egg_toolbar_insert_element (toolbar, EGG_TOOLBAR_CHILD_BUTTON,
@@ -2415,7 +2415,7 @@
 			 const char    *tooltip_text,
 			 const char    *tooltip_private_text,
 			 GtkWidget     *icon,
-			 GtkSignalFunc  callback,
+			 GCallback  callback,
 			 gpointer       user_data,
 			 gint           position)
 {
@@ -2431,7 +2431,7 @@
 			  const gchar     *stock_id,
 			  const char      *tooltip_text,
 			  const char      *tooltip_private_text,
-			  GtkSignalFunc    callback,
+			  GCallback    callback,
 			  gpointer         user_data,
 			  gint             position)
 {
@@ -2548,7 +2548,7 @@
 			    const char          *tooltip_text,
 			    const char          *tooltip_private_text,
 			    GtkWidget           *icon,
-			    GtkSignalFunc        callback,
+			    GCallback        callback,
 			    gpointer             user_data)
 {
   return egg_toolbar_insert_element (toolbar, type, widget, text,
@@ -2565,7 +2565,7 @@
 			     const char          *tooltip_text,
 			     const char          *tooltip_private_text,
 			     GtkWidget           *icon,
-			     GtkSignalFunc        callback,
+			     GCallback        callback,
 			     gpointer             user_data)
 {
   return egg_toolbar_insert_element (toolbar, type, widget, text,
@@ -2581,7 +2581,7 @@
 			    const char          *tooltip_text,
 			    const char          *tooltip_private_text,
 			    GtkWidget           *icon,
-			    GtkSignalFunc        callback,
+			    GCallback        callback,
 			    gpointer             user_data,
 			    gint                 position)
 {
@@ -2624,7 +2624,7 @@
 				     const char          *tooltip_text,
 				     const char          *tooltip_private_text,
 				     GtkWidget           *icon,
-				     GtkSignalFunc        callback,
+				     GCallback        callback,
 				     gpointer             user_data,
 				     gint                 position,
 				     gboolean             use_stock)

Modified: trunk/libegg/toolbar/eggtoolbar.h
==============================================================================
--- trunk/libegg/toolbar/eggtoolbar.h	(original)
+++ trunk/libegg/toolbar/eggtoolbar.h	Fri Jun 20 15:04:54 2008
@@ -166,21 +166,21 @@
 				      const char      *tooltip_text,
 				      const char      *tooltip_private_text,
 				      GtkWidget       *icon,
-				      GtkSignalFunc    callback,
+				      GCallback    callback,
 				      gpointer         user_data);
 GtkWidget* egg_toolbar_prepend_item  (EggToolbar      *toolbar,
 				      const char      *text,
 				      const char      *tooltip_text,
 				      const char      *tooltip_private_text,
 				      GtkWidget       *icon,
-				      GtkSignalFunc    callback,
+				      GCallback    callback,
 				      gpointer         user_data);
 GtkWidget* egg_toolbar_insert_item   (EggToolbar      *toolbar,
 				      const char      *text,
 				      const char      *tooltip_text,
 				      const char      *tooltip_private_text,
 				      GtkWidget       *icon,
-				      GtkSignalFunc    callback,
+				      GCallback    callback,
 				      gpointer         user_data,
 				      gint             position);
 
@@ -189,7 +189,7 @@
 					const gchar     *stock_id,
 					const char      *tooltip_text,
 					const char      *tooltip_private_text,
-					GtkSignalFunc    callback,
+					GCallback    callback,
 					gpointer         user_data,
 					gint             position);
 
@@ -208,7 +208,7 @@
 					const char      *tooltip_text,
 					const char      *tooltip_private_text,
 					GtkWidget       *icon,
-					GtkSignalFunc    callback,
+					GCallback    callback,
 					gpointer         user_data);
 
 GtkWidget* egg_toolbar_prepend_element (EggToolbar      *toolbar,
@@ -218,7 +218,7 @@
 					const char      *tooltip_text,
 					const char      *tooltip_private_text,
 					GtkWidget       *icon,
-					GtkSignalFunc    callback,
+					GCallback    callback,
 					gpointer         user_data);
 
 GtkWidget* egg_toolbar_insert_element  (EggToolbar      *toolbar,
@@ -228,7 +228,7 @@
 					const char      *tooltip_text,
 					const char      *tooltip_private_text,
 					GtkWidget       *icon,
-					GtkSignalFunc    callback,
+					GCallback    callback,
 					gpointer         user_data,
 					gint             position);
 

Modified: trunk/libegg/toolbar/prop-editor.c
==============================================================================
--- trunk/libegg/toolbar/prop-editor.c	(original)
+++ trunk/libegg/toolbar/prop-editor.c	Fri Jun 20 15:04:54 2008
@@ -52,7 +52,7 @@
 static void
 g_object_connect_property (GObject *object,
                            const gchar *prop_name,
-                           GtkSignalFunc func,
+                           GCallback func,
                            gpointer data,
                            GObject *alive_object)
 {
@@ -99,7 +99,7 @@
                     const gchar *signal,
                     GObject *model,
                     const gchar *prop_name,
-                    GtkSignalFunc func)
+                    GCallback func)
 {
   ObjectProperty *p;
 
@@ -476,7 +476,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec->name, (GtkSignalFunc) int_modified);
+			    object, spec->name, (GCallback) int_modified);
     }
   else if (type == G_TYPE_PARAM_UINT)
     {
@@ -497,7 +497,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec->name, (GtkSignalFunc) uint_modified);
+			    object, spec->name, (GCallback) uint_modified);
     }
   else if (type == G_TYPE_PARAM_FLOAT)
     {
@@ -518,7 +518,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec->name, (GtkSignalFunc) float_modified);
+			    object, spec->name, (GCallback) float_modified);
     }
   else if (type == G_TYPE_PARAM_DOUBLE)
     {
@@ -538,7 +538,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec->name, (GtkSignalFunc) double_modified);
+			    object, spec->name, (GCallback) double_modified);
     }
   else if (type == G_TYPE_PARAM_STRING)
     {
@@ -550,7 +550,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (prop_edit), "changed",
-			    object, spec->name, (GtkSignalFunc) string_modified);
+			    object, spec->name, (GCallback) string_modified);
     }
   else if (type == G_TYPE_PARAM_BOOLEAN)
     {
@@ -562,7 +562,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (prop_edit), "toggled",
-			    object, spec->name, (GtkSignalFunc) bool_modified);
+			    object, spec->name, (GCallback) bool_modified);
     }
   else if (type == G_TYPE_PARAM_ENUM)
     {
@@ -601,7 +601,7 @@
 	
 	if (can_modify)
 	  connect_controller (G_OBJECT (prop_edit), "changed",
-			      object, spec->name, (GtkSignalFunc) enum_modified);
+			      object, spec->name, (GCallback) enum_modified);
       }
     }
   else if (type == G_TYPE_PARAM_UNICHAR)
@@ -615,7 +615,7 @@
       
       if (can_modify)
 	connect_controller (G_OBJECT (prop_edit), "changed",
-			    object, spec->name, (GtkSignalFunc) unichar_modified);
+			    object, spec->name, (GCallback) unichar_modified);
     }
   else if (type == G_TYPE_PARAM_POINTER)
     {