Merge lp:~muktupavels/indicator-applet/about-menu into lp:indicator-applet

[Alberts Muktupāvels]

Restore applet menu.

[lp:~muktupavels/indicator-applet/about-menu]

447. By Alberts Muktupāvels on 2020-04-09

Restore applet menu.

=== modified file 'src/indicator-applet-appmenu.c'
--- src/indicator-applet-appmenu.c	2020-03-22 12:39:10 +0000
+++ src/indicator-applet-appmenu.c	2020-04-09 11:05:51 +0000
@@ -65,6 +65,26 @@
   return "<Super>F1";
 }
 
+static const char *
+indicator_applet_appmenu_get_menu_xml (void)
+{
+  const char *menu_xml;
+
+  menu_xml = ""
+    "<interface>"
+    "  <menu id=\"indicator-appmenu-menu\">"
+    "    <section>"
+    "      <item>"
+    "        <attribute name=\"label\" translatable=\"yes\">_About</attribute>"
+    "        <attribute name=\"action\">indicator-appmenu.about</attribute>"
+    "      </item>"
+    "    </section>"
+    "  </menu>"
+    "</interface>";
+
+  return menu_xml;
+}
+
 static void
 indicator_applet_appmenu_class_init (IndicatorAppletAppmenuClass *self_class)
 {
@@ -78,6 +98,7 @@
   applet_class->load_module = indicator_applet_appmenu_load_module;
   applet_class->load_indicator = indicator_applet_appmenu_load_indicator;
   applet_class->get_hotkey_keycode = indicator_applet_appmenu_get_hotkey_keycode;
+  applet_class->get_menu_xml = indicator_applet_appmenu_get_menu_xml;
 }
 
 static void

=== modified file 'src/indicator-applet-complete.c'
--- src/indicator-applet-complete.c	2020-03-22 12:39:10 +0000
+++ src/indicator-applet-complete.c	2020-04-09 11:05:51 +0000
@@ -71,6 +71,26 @@
   return "<Super>S";
 }
 
+static const char *
+indicator_applet_complete_get_menu_xml (void)
+{
+  const char *menu_xml;
+
+  menu_xml = ""
+    "<interface>"
+    "  <menu id=\"indicator-complete-menu\">"
+    "    <section>"
+    "      <item>"
+    "        <attribute name=\"label\" translatable=\"yes\">_About</attribute>"
+    "        <attribute name=\"action\">indicator-complete.about</attribute>"
+    "      </item>"
+    "    </section>"
+    "  </menu>"
+    "</interface>";
+
+  return menu_xml;
+}
+
 static void
 indicator_applet_complete_class_init (IndicatorAppletCompleteClass *self_class)
 {
@@ -84,6 +104,7 @@
   applet_class->load_module = indicator_applet_complete_load_module;
   applet_class->load_indicator = indicator_applet_complete_load_indicator;
   applet_class->get_hotkey_keycode = indicator_applet_complete_get_hotkey_keycode;
+  applet_class->get_menu_xml = indicator_applet_complete_get_menu_xml;
 }
 
 static void

=== modified file 'src/indicator-applet-session.c'
--- src/indicator-applet-session.c	2020-03-22 12:39:10 +0000
+++ src/indicator-applet-session.c	2020-04-09 11:05:51 +0000
@@ -67,6 +67,26 @@
   return "<Super>S";
 }
 
+static const char *
+indicator_applet_session_get_menu_xml (void)
+{
+  const char *menu_xml;
+
+  menu_xml = ""
+    "<interface>"
+    "  <menu id=\"indicator-session-menu\">"
+    "    <section>"
+    "      <item>"
+    "        <attribute name=\"label\" translatable=\"yes\">_About</attribute>"
+    "        <attribute name=\"action\">indicator-session.about</attribute>"
+    "      </item>"
+    "    </section>"
+    "  </menu>"
+    "</interface>";
+
+  return menu_xml;
+}
+
 static void
 indicator_applet_session_class_init (IndicatorAppletSessionClass *self_class)
 {
@@ -79,8 +99,8 @@
   applet_class->get_indicator_env = indicator_applet_session_get_indicator_env;
   applet_class->load_module = indicator_applet_session_load_module;
   applet_class->load_indicator = indicator_applet_session_load_indicator;
-
   applet_class->get_hotkey_keycode = indicator_applet_session_get_hotkey_keycode;
+  applet_class->get_menu_xml = indicator_applet_session_get_menu_xml;
 }
 
 static void

=== modified file 'src/indicator-applet.c'
--- src/indicator-applet.c	2020-03-29 14:43:47 +0000
+++ src/indicator-applet.c	2020-04-09 11:05:51 +0000
@@ -857,17 +857,6 @@
     {"about", about_cb },
     { NULL }
   };
-  static const gchar *menu_xml = ""
-    "<interface>"
-    "<menu id=\"indicator-applet-menu\">"
-    "<section>"
-    "<item>"
-    "<attribute name=\"label\" translatable=\"yes\">_About</attribute>"
-    "<attribute name=\"action\">indicator-applet.about</attribute>"
-    "</item>"
-    "</section>"
-    "</menu>"
-    "</interface>";
 
   static gboolean first_time = FALSE;
   gint indicators_loaded = 0;
@@ -892,7 +881,9 @@
   gp_applet_set_flags (applet, GP_APPLET_FLAGS_EXPAND_MINOR);
   priv->menubar = gtk_menu_bar_new ();
 
-  gp_applet_setup_menu (applet, menu_xml, menu_actions);
+  gp_applet_setup_menu (applet,
+                        INDICATOR_APPLET_GET_CLASS (self)->get_menu_xml (),
+                        menu_actions);
 
   gtk_widget_set_name(GTK_WIDGET (applet), "fast-user-switch-applet");
 
@@ -1009,6 +1000,26 @@
   return "<Super>M";
 }
 
+static const char *
+indicator_applet_get_menu_xml (void)
+{
+  const char *menu_xml;
+
+  menu_xml = ""
+    "<interface>"
+    "  <menu id=\"indicator-menu\">"
+    "    <section>"
+    "      <item>"
+    "        <attribute name=\"label\" translatable=\"yes\">_About</attribute>"
+    "        <attribute name=\"action\">indicator.about</attribute>"
+    "      </item>"
+    "    </section>"
+    "  </menu>"
+    "</interface>";
+
+  return menu_xml;
+}
+
 static void
 indicator_applet_class_init (IndicatorAppletClass *self_class)
 {
@@ -1025,6 +1036,7 @@
   self_class->load_module = indicator_applet_load_module;
   self_class->load_indicator = indicator_applet_load_indicator;
   self_class->get_hotkey_keycode = indicator_applet_get_hotkey_keycode;
+  self_class->get_menu_xml = indicator_applet_get_menu_xml;
 }
 
 static void

=== modified file 'src/indicator-applet.h'
--- src/indicator-applet.h	2020-03-22 12:39:10 +0000
+++ src/indicator-applet.h	2020-04-09 11:05:51 +0000
@@ -39,6 +39,8 @@
   gboolean     (* load_indicator)     (const char *name);
 
   const char * (* get_hotkey_keycode) (void);
+
+  const char * (* get_menu_xml)       (void);
 };
 
 G_END_DECLS