Merge from trunk

(bzr r9508.1.89)

1 files changed, 18 insertions, 18 deletions

diff --git a/src/ui/context-menu.cpp b/src/ui/context-menu.cpp
index 05fe9a459..a45b8ceaa 100644
--- a/src/ui/context-menu.cpp
+++ b/src/ui/context-menu.cpp
@@ -42,7 +42,7 @@ sp_object_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu)
 
 /* Implementation */
 
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 
 #include <glibmm/i18n.h>
 
@@ -111,7 +111,7 @@ sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
     /* Item dialog */
     w = gtk_menu_item_new_with_mnemonic(_("_Object Properties..."));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_item_properties), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_properties), item);
     gtk_widget_show(w);
     gtk_menu_append(GTK_MENU(m), w);
     /* Separator */
@@ -124,21 +124,21 @@ sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
         gtk_widget_set_sensitive(w, FALSE);
     } else {
         gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-        gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_item_select_this), item);
+        g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_select_this), item);
     }
     gtk_widget_show(w);
     gtk_menu_append(GTK_MENU(m), w);
     /* Create link */
     w = gtk_menu_item_new_with_mnemonic(_("_Create Link"));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_item_create_link), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_create_link), item);
     gtk_widget_set_sensitive(w, !SP_IS_ANCHOR(item));
     gtk_widget_show(w);
     gtk_menu_append(GTK_MENU(m), w);
     /* Set mask */
     w = gtk_menu_item_new_with_mnemonic(_("Set Mask"));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_set_mask), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_set_mask), item);
     if ((item && item->mask_ref && item->mask_ref->getObject()) || (item->clip_ref && item->clip_ref->getObject())) {
         gtk_widget_set_sensitive(w, FALSE);
     } else {
@@ -149,7 +149,7 @@ sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
     /* Release mask */
     w = gtk_menu_item_new_with_mnemonic(_("Release Mask"));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_release_mask), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_release_mask), item);
     if (item && item->mask_ref && item->mask_ref->getObject()) {
         gtk_widget_set_sensitive(w, TRUE);
     } else {
@@ -160,7 +160,7 @@ sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
     /* Set Clip */
     w = gtk_menu_item_new_with_mnemonic(_("Set _Clip"));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_set_clip), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_set_clip), item);
     if ((item && item->mask_ref && item->mask_ref->getObject()) || (item->clip_ref && item->clip_ref->getObject())) {
         gtk_widget_set_sensitive(w, FALSE);
     } else {
@@ -171,7 +171,7 @@ sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
     /* Release Clip */
     w = gtk_menu_item_new_with_mnemonic(_("Release C_lip"));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_release_clip), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_release_clip), item);
     if (item && item->clip_ref && item->clip_ref->getObject()) {
         gtk_widget_set_sensitive(w, TRUE);
     } else {
@@ -312,7 +312,7 @@ sp_group_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu)
     /* "Ungroup" */
     w = gtk_menu_item_new_with_mnemonic(_("_Ungroup"));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_item_group_ungroup_activate), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_group_ungroup_activate), item);
     gtk_widget_show(w);
     gtk_menu_append(GTK_MENU(menu), w);
 }
@@ -352,18 +352,18 @@ sp_anchor_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
     /* Link dialog */
     w = gtk_menu_item_new_with_mnemonic(_("Link _Properties..."));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_anchor_link_properties), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_anchor_link_properties), item);
     gtk_widget_show(w);
     gtk_menu_append(GTK_MENU(m), w);
     /* Select item */
     w = gtk_menu_item_new_with_mnemonic(_("_Follow Link"));
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_anchor_link_follow), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_anchor_link_follow), item);
     gtk_widget_show(w);
     gtk_menu_append(GTK_MENU(m), w);
     /* Reset transformations */
     w = gtk_menu_item_new_with_mnemonic(_("_Remove Link"));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_anchor_link_remove), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_anchor_link_remove), item);
     gtk_widget_show(w);
     gtk_menu_append(GTK_MENU(m), w);
 }
@@ -411,13 +411,13 @@ sp_image_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
     /* Link dialog */
     w = gtk_menu_item_new_with_mnemonic(_("Image _Properties..."));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_image_image_properties), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_image_image_properties), item);
     gtk_widget_show(w);
     gtk_menu_append(GTK_MENU(m), w);
 
     w = gtk_menu_item_new_with_mnemonic(_("Edit Externally..."));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_image_image_edit), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_image_image_edit), item);
     gtk_widget_show(w);
     gtk_menu_append(GTK_MENU(m), w);
     Inkscape::XML::Node *ir = object->getRepr();
@@ -534,7 +534,7 @@ sp_shape_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
     /* Item dialog */
     w = gtk_menu_item_new_with_mnemonic(_("_Fill and Stroke..."));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_fill_settings), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_fill_settings), item);
     gtk_widget_show(w);
     gtk_menu_append(GTK_MENU(m), w);
 }
@@ -590,21 +590,21 @@ sp_text_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
     /* Fill and Stroke dialog */
     w = gtk_menu_item_new_with_mnemonic(_("_Fill and Stroke..."));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_fill_settings), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_fill_settings), item);
     gtk_widget_show(w);
     gtk_menu_append(GTK_MENU(m), w);
     
     /* Edit Text dialog */
     w = gtk_menu_item_new_with_mnemonic(_("_Text and Font..."));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_text_settings), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_text_settings), item);
     gtk_widget_show(w);
     gtk_menu_append(GTK_MENU(m), w);
 
     /* Spellcheck dialog */
     w = gtk_menu_item_new_with_mnemonic(_("Check Spellin_g..."));
     gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
-    gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_spellcheck_settings), item);
+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_spellcheck_settings), item);
     gtk_widget_show(w);
     gtk_menu_append(GTK_MENU(m), w);
 }