GNOME.org
 

[epiphany-extensions] all: update for menu name changes

commit d23dbba82286672b517c528e6f0866f5ca6aee9e
Author: Diego Escalante Urrelo <diegoe igalia com>
Date:   Sat Feb 25 14:54:14 2012 -0500

    all: update for menu name changes

 extensions/actions/ephy-actions-extension.c        |    2 +-
 extensions/adblock/ephy-adblock-extension.c        |    2 +-
 .../auto-reload/ephy-auto-reload-extension.c       |   11 -----
 .../certificates/ephy-certificates-extension.c     |    8 ++--
 .../error-viewer/ephy-error-viewer-extension.c     |   12 +++---
 .../ephy-extensions-manager-ui-extension.c         |   47 +-------------------
 .../ephy-livehttpheaders-extension.c               |    2 +-
 extensions/rss/ephy-rss-extension.c                |    2 +-
 extensions/soup-fly/ephy-soup-fly-extension.c      |    4 +-
 9 files changed, 18 insertions(+), 72 deletions(-)
---
diff --git a/extensions/actions/ephy-actions-extension.c b/extensions/actions/ephy-actions-extension.c
index b3bf925..12060e7 100644
--- a/extensions/actions/ephy-actions-extension.c
+++ b/extensions/actions/ephy-actions-extension.c
@@ -623,7 +623,7 @@ ephy_actions_extension_attach_window (EphyExtension *extension,
 
 	gtk_ui_manager_add_ui (manager,
 			       data->ui_id,
-			       "/menubar/EditMenu",
+			       "/ui/PagePopup/ExtensionsMenu",
 			       "EphyActionsExtensionEditActions",
 			       "EphyActionsExtensionEditActions",
 			       GTK_UI_MANAGER_MENUITEM,
diff --git a/extensions/adblock/ephy-adblock-extension.c b/extensions/adblock/ephy-adblock-extension.c
index ba9d7bd..fc279ee 100644
--- a/extensions/adblock/ephy-adblock-extension.c
+++ b/extensions/adblock/ephy-adblock-extension.c
@@ -254,7 +254,7 @@ impl_attach_window (EphyExtension *ext,
 
   gtk_ui_manager_add_ui (manager,
                          data->ui_id,
-                         "/menubar/ToolsMenu",
+                         "/ui/PagePopup/ExtensionsMenu",
                          "EphyAdblockExtensionEdit",
                          "EphyAdblockExtensionEdit",
                          GTK_UI_MANAGER_MENUITEM,
diff --git a/extensions/auto-reload/ephy-auto-reload-extension.c b/extensions/auto-reload/ephy-auto-reload-extension.c
index 3fef46a..84f4d97 100644
--- a/extensions/auto-reload/ephy-auto-reload-extension.c
+++ b/extensions/auto-reload/ephy-auto-reload-extension.c
@@ -44,7 +44,6 @@ typedef struct
 	GtkToggleAction *action;
 	guint ui_id;
 	GtkAction *popup;
-	GtkAction *menu;
 } WindowData;
 
 typedef struct
@@ -201,20 +200,12 @@ impl_attach_window (EphyExtension *ext,
 	gtk_ui_manager_add_ui (manager, data->ui_id, "/EphyNotebookPopup",
 			       "AutoReload", "AutoReload",
 			       GTK_UI_MANAGER_MENUITEM, FALSE);
-	gtk_ui_manager_add_ui (manager, data->ui_id, "/menubar/ViewMenu",
-			       "AutoReload", "AutoReload",
-			       GTK_UI_MANAGER_MENUITEM, FALSE);
 	data->action = GTK_TOGGLE_ACTION (gtk_action_group_get_action (data->action_group, "AutoReload"));
 
 	data->popup = gtk_ui_manager_get_action (manager, "/EphyNotebookPopup");
 	g_return_if_fail (data->popup != NULL);
 	g_signal_connect (data->popup, "activate",
 			  G_CALLBACK (update_auto_reload_menu_cb), window);
-
-	data->menu = gtk_ui_manager_get_action (manager, "/menubar/ViewMenu");
-	g_return_if_fail (data->menu != NULL);
-	g_signal_connect (data->menu, "activate",
-					G_CALLBACK (update_auto_reload_menu_cb), window);
 }
 
 static void
@@ -235,8 +226,6 @@ impl_detach_window (EphyExtension *ext,
 	/* Remove callbacks */
 	g_signal_handlers_disconnect_by_func
 		(data->popup, G_CALLBACK (update_auto_reload_menu_cb), window);
-	g_signal_handlers_disconnect_by_func
-		(data->menu, G_CALLBACK (update_auto_reload_menu_cb), window);
 
 	/* Destroy data */
 	g_object_set_data (G_OBJECT (window), WINDOW_DATA_KEY, NULL);
diff --git a/extensions/certificates/ephy-certificates-extension.c b/extensions/certificates/ephy-certificates-extension.c
index 0d4a71d..fffda31 100644
--- a/extensions/certificates/ephy-certificates-extension.c
+++ b/extensions/certificates/ephy-certificates-extension.c
@@ -243,18 +243,18 @@ impl_attach_window (EphyExtension *ext,
 
 	win_data->ui_id = ui_id = gtk_ui_manager_new_merge_id (manager);
 
-	gtk_ui_manager_add_ui (manager, ui_id, "/menubar/ToolsMenu",
+	gtk_ui_manager_add_ui (manager, ui_id, "/ui/PagePopup/ExtensionsMenu",
 			       "ToolsSCSep1", NULL,
 			       GTK_UI_MANAGER_SEPARATOR, FALSE);
-	gtk_ui_manager_add_ui (manager, ui_id, "/menubar/ToolsMenu",
+	gtk_ui_manager_add_ui (manager, ui_id, "/ui/PagePopup/ExtensionsMenu",
 			       "ToolsCertificateManagerItem",
 			       "ToolsCertificateManager",
 			       GTK_UI_MANAGER_MENUITEM, FALSE);
-	gtk_ui_manager_add_ui (manager, ui_id, "/menubar/ToolsMenu",
+	gtk_ui_manager_add_ui (manager, ui_id, "/ui/PagePopup/ExtensionsMenu",
 			       "ToolsSecurityDevicesManagerItem",
 			       "ToolsSecurityDevicesManager",
 			       GTK_UI_MANAGER_MENUITEM, FALSE);
-	gtk_ui_manager_add_ui (manager, ui_id, "/menubar/ToolsMenu",
+	gtk_ui_manager_add_ui (manager, ui_id, "/ui/PagePopup/ExtensionsMenu",
 			       "ToolsSCSep2", NULL,
 			       GTK_UI_MANAGER_SEPARATOR, FALSE);
 
diff --git a/extensions/error-viewer/ephy-error-viewer-extension.c b/extensions/error-viewer/ephy-error-viewer-extension.c
index 65c83f0..ca520fd 100644
--- a/extensions/error-viewer/ephy-error-viewer-extension.c
+++ b/extensions/error-viewer/ephy-error-viewer-extension.c
@@ -274,9 +274,9 @@ update_actions (EphyWindow *window)
 	g_value_set_boolean (&sensitive, FALSE);
 
 	action1 = gtk_ui_manager_get_action (GTK_UI_MANAGER (ephy_window_get_ui_manager (window)),
-					     "/menubar/ToolsMenu/SgmlValidate");
+					     "/ui/PagePopup/ExtensionsMenu/SgmlValidate");
 	action2 = gtk_ui_manager_get_action (GTK_UI_MANAGER (ephy_window_get_ui_manager (window)),
-					     "/menubar/ToolsMenu/CheckLinks");
+					     "/ui/PagePopup/ExtensionsMenu/CheckLinks");
 
 	embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
 
@@ -391,18 +391,18 @@ impl_attach_window (EphyExtension *extension,
 	g_object_set_data_full (G_OBJECT (window), WINDOW_DATA_KEY, data,
 				(GDestroyNotify) free_window_data);
 
-	gtk_ui_manager_add_ui (manager, merge_id, "/menubar/ToolsMenu",
+	gtk_ui_manager_add_ui (manager, merge_id, "/ui/PagePopup/ExtensionsMenu",
 			       "ErrorViewerSep", NULL,
 			       GTK_UI_MANAGER_SEPARATOR, FALSE);
-	gtk_ui_manager_add_ui (manager, merge_id, "/menubar/ToolsMenu",
+	gtk_ui_manager_add_ui (manager, merge_id, "/ui/PagePopup/ExtensionsMenu",
 			       "CheckLinks", "CheckLinks",
 			       GTK_UI_MANAGER_MENUITEM, FALSE);
 #ifdef HAVE_OPENSP
-	gtk_ui_manager_add_ui (manager, merge_id, "/menubar/ToolsMenu",
+	gtk_ui_manager_add_ui (manager, merge_id, "/ui/PagePopup/ExtensionsMenu",
 			       "SgmlValidate", "SgmlValidate",
 			       GTK_UI_MANAGER_MENUITEM, FALSE);
 #endif /* HAVE_OPENSP */
-	gtk_ui_manager_add_ui (manager, merge_id, "/menubar/ToolsMenu",
+	gtk_ui_manager_add_ui (manager, merge_id, "/ui/PagePopup/ExtensionsMenu",
 			       "ErrorViewer", "ErrorViewer",
 			       GTK_UI_MANAGER_MENUITEM, FALSE);
 
diff --git a/extensions/extensions-manager-ui/ephy-extensions-manager-ui-extension.c b/extensions/extensions-manager-ui/ephy-extensions-manager-ui-extension.c
index af60196..402c042 100644
--- a/extensions/extensions-manager-ui/ephy-extensions-manager-ui-extension.c
+++ b/extensions/extensions-manager-ui/ephy-extensions-manager-ui-extension.c
@@ -58,8 +58,6 @@ typedef struct
 
 static void display_cb (GtkAction *action,
 			EphyWindow *window);
-static void help_cb    (GtkAction *action,
-			EphyWindow *window);
 
 static const GtkActionEntry action_entries [] =
 {
@@ -69,13 +67,6 @@ static const GtkActionEntry action_entries [] =
 	  NULL,
 	  N_("Load and unload extensions"),
 	  G_CALLBACK (display_cb) },
-	{ "ExtensionsManagerHelp",
-	  NULL,
-	  N_("_Extensions"),
-	  NULL,
-	  N_("Help about extensions"),
-	  G_CALLBACK (help_cb)
-	}
 };
 
 static GObjectClass *parent_class = NULL;
@@ -174,33 +165,6 @@ display_cb (GtkAction *action,
 }
 
 static void
-help_cb (GtkAction *action,
-	 EphyWindow *window)
-{
-	GdkScreen *screen;
-	GError *error = NULL;
-
-	screen = gtk_widget_get_screen (GTK_WIDGET (window));
-	gtk_show_uri (screen, "ghelp:epiphany-extensions",
-		      gtk_get_current_event_time (), &error);
-
-	if (error)
-	{
-		GtkWidget *errord;
-		errord = gtk_message_dialog_new (GTK_WINDOW (window),
-						 GTK_DIALOG_DESTROY_WITH_PARENT,
-						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_OK,
-						 _("Could not display help: %s"),
-						 error->message);
-		g_error_free (error);
-		g_signal_connect (errord, "response",
-				  G_CALLBACK (gtk_widget_destroy), NULL);
-		gtk_widget_show (errord);
-	}
-}
-
-static void
 impl_attach_window (EphyExtension *ext,
 		    EphyWindow *window)
 {
@@ -229,19 +193,12 @@ impl_attach_window (EphyExtension *ext,
 	g_object_set_data_full (G_OBJECT (window), WINDOW_DATA_KEY, data,
 				(GDestroyNotify) g_free);
 
-	gtk_ui_manager_add_ui (manager, ui_id, "/menubar/ToolsMenu",
+	gtk_ui_manager_add_ui (manager, ui_id, "/ui/PagePopup/ExtensionsMenu",
 			       "ExtensionsManagerUISep", NULL,
 			       GTK_UI_MANAGER_SEPARATOR, FALSE);
-	gtk_ui_manager_add_ui (manager, ui_id, "/menubar/ToolsMenu",
+	gtk_ui_manager_add_ui (manager, ui_id, "/ui/PagePopup/ExtensionsMenu",
 			       "ExtensionsManagerUI", "ExtensionsManagerUI",
 			       GTK_UI_MANAGER_MENUITEM, FALSE);
-	gtk_ui_manager_add_ui (manager, ui_id, "/menubar/ToolsMenu",
-			       "ExtensionsManagerUISep2", NULL,
-			       GTK_UI_MANAGER_SEPARATOR, FALSE);
-
-	gtk_ui_manager_add_ui (manager, ui_id, "/menubar/HelpMenu/HelpContentsMenu",
-			       "ExtensionsManagerHelp", "ExtensionsManagerHelp",
-			       GTK_UI_MANAGER_MENUITEM, FALSE);
 }
 
 static void
diff --git a/extensions/livehttpheaders/ephy-livehttpheaders-extension.c b/extensions/livehttpheaders/ephy-livehttpheaders-extension.c
index 5ee92db..313e9bc 100644
--- a/extensions/livehttpheaders/ephy-livehttpheaders-extension.c
+++ b/extensions/livehttpheaders/ephy-livehttpheaders-extension.c
@@ -134,7 +134,7 @@ impl_attach_window (EphyExtension *ext,
 
 	gtk_ui_manager_add_ui (manager,
 			       ui_id,
-			       "/menubar/ToolsMenu",
+			       "/ui/PagePopup/ExtensionsMenu",
 			       HTTP_HEADERS_ACTION "Menu",
 			       HTTP_HEADERS_ACTION,
 			       GTK_UI_MANAGER_MENUITEM,
diff --git a/extensions/rss/ephy-rss-extension.c b/extensions/rss/ephy-rss-extension.c
index f799b66..c2c9909 100644
--- a/extensions/rss/ephy-rss-extension.c
+++ b/extensions/rss/ephy-rss-extension.c
@@ -50,7 +50,7 @@ static GType type = 0;
 /* Menu item stuff */
 #define WINDOW_DATA_KEY	"EphyRssExtensionWindowData"
 #define EPHY_RSS_EXTENSION_DATA_KEY "EphyRssExtension"
-#define MENU_PATH	"/menubar/ToolsMenu"
+#define MENU_PATH	"/ui/PagePopup/ExtensionsMenu"
 
 /* Status Bar stuff */
 #define FEED_ICON	"feed-presence"
diff --git a/extensions/soup-fly/ephy-soup-fly-extension.c b/extensions/soup-fly/ephy-soup-fly-extension.c
index 125824d..204cb1a 100644
--- a/extensions/soup-fly/ephy-soup-fly-extension.c
+++ b/extensions/soup-fly/ephy-soup-fly-extension.c
@@ -203,10 +203,10 @@ impl_attach_window (EphyExtension *extension,
   g_object_set_data_full (G_OBJECT (window), WINDOW_DATA_KEY, data,
                           (GDestroyNotify) free_window_data);
 
-  gtk_ui_manager_add_ui (manager, merge_id, "/menubar/ToolsMenu",
+  gtk_ui_manager_add_ui (manager, merge_id, "/ui/PagePopup/ExtensionsMenu",
                          "SoupFlySep", NULL,
                          GTK_UI_MANAGER_SEPARATOR, FALSE);
-  gtk_ui_manager_add_ui (manager, merge_id, "/menubar/ToolsMenu",
+  gtk_ui_manager_add_ui (manager, merge_id, "/ui/PagePopup/ExtensionsMenu",
                          "SoupFly", "SoupFly",
                          GTK_UI_MANAGER_MENUITEM, FALSE);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]