libegg r885 - in trunk: . libegg/combo-old libegg/dock libegg/toolbar

[chpe svn gnome org]

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

Log:
	* libegg/combo-old/eggentry.c: (append_action_signal),
	(popup_targets_received):
	* libegg/dock/egg-dock-layout.c:
	(egg_dock_layout_construct_layouts_ui):
	* libegg/toolbar/prop-editor.c: (property_widget),
	(create_prop_editor): Remove more deprecated gtk macros.

Modified:
   trunk/ChangeLog
   trunk/libegg/combo-old/eggentry.c
   trunk/libegg/dock/egg-dock-layout.c
   trunk/libegg/toolbar/prop-editor.c

Modified: trunk/libegg/combo-old/eggentry.c
==============================================================================
--- trunk/libegg/combo-old/eggentry.c	(original)
+++ trunk/libegg/combo-old/eggentry.c	Fri Jun 20 15:01:28 2008
@@ -3905,7 +3905,7 @@
 
   gtk_object_set_data (GTK_OBJECT (menuitem), "gtk-signal", (char *)signal);
   gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
-		      GTK_SIGNAL_FUNC (activate_cb), entry);
+		      G_CALLBACK (activate_cb), entry);
 
   gtk_widget_set_sensitive (menuitem, sensitive);
   
@@ -3994,7 +3994,7 @@
       
       menuitem = gtk_menu_item_new_with_label (_("Select All"));
       gtk_signal_connect_object (GTK_OBJECT (menuitem), "activate",
-				 GTK_SIGNAL_FUNC (egg_entry_select_all), entry);
+				 G_CALLBACK (egg_entry_select_all), entry);
       gtk_widget_show (menuitem);
       gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
       

Modified: trunk/libegg/dock/egg-dock-layout.c
==============================================================================
--- trunk/libegg/dock/egg-dock-layout.c	(original)
+++ trunk/libegg/dock/egg-dock-layout.c	Fri Jun 20 15:01:28 2008
@@ -746,13 +746,13 @@
                       G_CALLBACK (selection_changed_cb), ui_data);
 
     glade_xml_signal_connect_data (gui, "on_newlayout_entry_activate",
-                                   GTK_SIGNAL_FUNC (save_layout_cb), ui_data);
+                                   G_CALLBACK (save_layout_cb), ui_data);
     glade_xml_signal_connect_data (gui, "on_save_button_clicked",
-                                   GTK_SIGNAL_FUNC (save_layout_cb), ui_data);
+                                   G_CALLBACK (save_layout_cb), ui_data);
     glade_xml_signal_connect_data (gui, "on_load_button_clicked",
-                                   GTK_SIGNAL_FUNC (load_layout_cb), ui_data);
+                                   G_CALLBACK (load_layout_cb), ui_data);
     glade_xml_signal_connect_data (gui, "on_delete_button_clicked",
-                                   GTK_SIGNAL_FUNC (delete_layout_cb), ui_data);
+                                   G_CALLBACK (delete_layout_cb), ui_data);
 
     g_signal_connect (container, "destroy", (GCallback) layout_ui_destroyed, NULL);
 

Modified: trunk/libegg/toolbar/prop-editor.c
==============================================================================
--- trunk/libegg/toolbar/prop-editor.c	(original)
+++ trunk/libegg/toolbar/prop-editor.c	Fri Jun 20 15:01:28 2008
@@ -471,7 +471,7 @@
       prop_edit = gtk_spin_button_new (adj, 1.0, 0);
       
       g_object_connect_property (object, spec->name,
-				 GTK_SIGNAL_FUNC (int_changed),
+				 G_CALLBACK (int_changed),
 				 adj, G_OBJECT (adj));
       
       if (can_modify)
@@ -492,7 +492,7 @@
       prop_edit = gtk_spin_button_new (adj, 1.0, 0);
       
       g_object_connect_property (object, spec->name,
-				 GTK_SIGNAL_FUNC (uint_changed),
+				 G_CALLBACK (uint_changed),
 				 adj, G_OBJECT (adj));
       
       if (can_modify)
@@ -513,7 +513,7 @@
       prop_edit = gtk_spin_button_new (adj, 0.1, 2);
       
       g_object_connect_property (object, spec->name,
-				 GTK_SIGNAL_FUNC (float_changed),
+				 G_CALLBACK (float_changed),
 				 adj, G_OBJECT (adj));
       
       if (can_modify)
@@ -533,7 +533,7 @@
       prop_edit = gtk_spin_button_new (adj, 0.1, 2);
       
       g_object_connect_property (object, spec->name,
-				 GTK_SIGNAL_FUNC (double_changed),
+				 G_CALLBACK (double_changed),
 				 adj, G_OBJECT (adj));
       
       if (can_modify)
@@ -545,7 +545,7 @@
       prop_edit = gtk_entry_new ();
       
       g_object_connect_property (object, spec->name,
-				 GTK_SIGNAL_FUNC (string_changed),
+				 G_CALLBACK (string_changed),
 				 prop_edit, G_OBJECT (prop_edit));
       
       if (can_modify)
@@ -557,7 +557,7 @@
       prop_edit = gtk_toggle_button_new_with_label ("");
       
       g_object_connect_property (object, spec->name,
-				 GTK_SIGNAL_FUNC (bool_changed),
+				 G_CALLBACK (bool_changed),
 				 prop_edit, G_OBJECT (prop_edit));
       
       if (can_modify)
@@ -596,7 +596,7 @@
 	gtk_option_menu_set_menu (GTK_OPTION_MENU (prop_edit), menu);
 	
 	g_object_connect_property (object, spec->name,
-				   GTK_SIGNAL_FUNC (enum_changed),
+				   G_CALLBACK (enum_changed),
 				   prop_edit, G_OBJECT (prop_edit));
 	
 	if (can_modify)
@@ -610,7 +610,7 @@
       gtk_entry_set_max_length (GTK_ENTRY (prop_edit), 1);
       
       g_object_connect_property (object, spec->name,
-				 GTK_SIGNAL_FUNC (unichar_changed),
+				 G_CALLBACK (unichar_changed),
 				 prop_edit, G_OBJECT (prop_edit));
       
       if (can_modify)
@@ -622,7 +622,7 @@
       prop_edit = gtk_label_new ("");
       
       g_object_connect_property (object, spec->name,
-				 GTK_SIGNAL_FUNC (pointer_changed),
+				 G_CALLBACK (pointer_changed),
 				 prop_edit, G_OBJECT (prop_edit));
     }
   else if (type == G_TYPE_PARAM_OBJECT)
@@ -630,7 +630,7 @@
       prop_edit = gtk_label_new ("");
       
       g_object_connect_property (object, spec->name,
-				 GTK_SIGNAL_FUNC (object_changed),
+				 G_CALLBACK (object_changed),
 				 prop_edit, G_OBJECT (prop_edit));
     }
   else
@@ -755,7 +755,7 @@
   
   tips = gtk_tooltips_new ();
   g_signal_connect_data (GTK_OBJECT (win), "destroy",
-			 GTK_SIGNAL_FUNC (gtk_object_destroy), GTK_OBJECT (tips), NULL,
+			 G_CALLBACK (gtk_object_destroy), GTK_OBJECT (tips), NULL,
 			 G_CONNECT_SWAPPED);
 
   /* hold a weak ref to the object we're editing */