Fixed compilation issue with gtk3.10 and deprecation of

  GtkActionEntry. Menu is defined in glade file instead of
  hardcoded.

diff --git a/NEWS b/NEWS
index 5439b35..5b94380 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,9 @@ v0.8.0.5
 * Fixed some french translations.
 * AppIndicator icons: removed shadow, added padding. (Closes LP:
 #1290072).
+* Fixed compilation issue with gtk3.10 and deprecation of
+  GtkActionEntry. Menu is defined in glade file instead of
+  hardcoded.
 
 v0.8.0.4
 --------

diff --git a/NEWS.html b/NEWS.html
index 79b7fc9..2f4327a 100644 (file)
--- a/NEWS.html
+++ b/NEWS.html
@@ -429,6 +429,17 @@ Merged Russian translation from LP (Dmitry).
 Merged Turkish translation from LP (İbrahim Çelik).\r
 </p>\r
 </li>\r
+<li>\r
+<p>\r
+Fixed some french translations.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+AppIndicator icons: removed shadow, added padding. (Closes LP:\r
+#1290072).\r
+</p>\r
+</li>\r
 </ul></div>\r
 </div>\r
 </div>\r
@@ -2452,7 +2463,7 @@ Fixed BR1: crash when no temperature sensor is available
 <div id="footnotes"><hr /></div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2014-02-11 21:18:49 CET\r
+Last updated 2014-04-07 08:14:11 CEST\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/src/glade/psensor.glade b/src/glade/psensor.glade
index 71276b3..25b2109 100644 (file)
--- a/src/glade/psensor.glade
+++ b/src/glade/psensor.glade
@@ -5,6 +5,16 @@
     <property name="label" translatable="yes">About</property>
     <signal name="activate" handler="ui_cb_about" swapped="no"/>
   </object>
+  <object class="GtkAction" id="AppIndicatorPreferencesAction">
+    <property name="label" translatable="yes">Preferences</property>
+    <property name="short_label" translatable="yes">Preferences</property>
+    <signal name="activate" handler="ui_appindicator_cb_preferences" swapped="no"/>
+  </object>
+  <object class="GtkAction" id="AppIndicatorSensorPreferencesAction">
+    <property name="label" translatable="yes">Sensor Preferences</property>
+    <property name="short_label" translatable="yes">Sensor Preferences</property>
+    <signal name="activate" handler="ui_appindicator_cb_sensor_preferences" swapped="no"/>
+  </object>
   <object class="GtkAction" id="PreferencesAction">
     <property name="label" translatable="yes">Preferences</property>
     <signal name="activate" handler="ui_cb_preferences" swapped="no"/>
@@ -17,6 +27,80 @@
     <property name="label" translatable="yes">Sensor Preferences</property>
     <signal name="activate" handler="ui_cb_sensor_preferences" swapped="no"/>
   </object>
+  <object class="GtkAction" id="ShowAction">
+    <property name="label" translatable="yes">Show</property>
+    <signal name="activate" handler="cb_menu_show" swapped="no"/>
+  </object>
+  <object class="GtkMenu" id="appindicator_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkImageMenuItem" id="menuitem8">
+        <property name="related_action">ShowAction</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_stock">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="menuitem9">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="menuitem1">
+        <property name="related_action">AppIndicatorPreferencesAction</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_stock">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="menuitem2">
+        <property name="related_action">AppIndicatorSensorPreferencesAction</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_stock">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="menuitem3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="menuitem4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="menuitem5">
+        <property name="related_action">AboutAction</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="menuitem6">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="menuitem7">
+        <property name="related_action">QuitAction</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
+      </object>
+    </child>
+  </object>
   <object class="GtkMenu" id="popup_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index b6bea65..49ca58f 100644 (file)
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -40,17 +40,12 @@ static int appindicator_supported = 1;
 static AppIndicator *indicator;
 static struct ui_psensor *ui_psensor;
 
-static void cb_menu_show(GtkMenuItem *mi, gpointer data)
+void cb_menu_show(GtkMenuItem *mi, gpointer data)
 {
        ui_window_show((struct ui_psensor *)data);
 }
 
-static void cb_menu_quit(GtkMenuItem *mi, gpointer data)
-{
-       ui_psensor_quit(data);
-}
-
-static void cb_menu_preferences(GtkMenuItem *mi, gpointer data)
+void ui_appindicator_cb_preferences(GtkMenuItem *mi, gpointer data)
 {
 #ifdef HAVE_APPINDICATOR_029
        gdk_threads_enter();
@@ -63,7 +58,7 @@ static void cb_menu_preferences(GtkMenuItem *mi, gpointer data)
 #endif
 }
 
-static void cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
+void ui_appindicator_cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
 {
        struct ui_psensor *ui = data;
 
@@ -79,59 +74,6 @@ static void cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
 #endif
 }
 
-static void cb_about(GtkMenuItem *mi, gpointer data)
-{
-       ui_show_about_dialog();
-}
-
-static const char *menu_desc =
-"<ui>"
-"  <popup name='MainMenu'>"
-"      <menuitem name='Show' action='ShowAction' />"
-"      <separator />"
-"      <separator />"
-"      <menuitem name='Preferences' action='PreferencesAction' />"
-"      <menuitem name='SensorPreferences' action='SensorPreferencesAction' />"
-"      <separator />"
-"      <menuitem name='About' action='AboutAction' />"
-"      <separator />"
-"      <menuitem name='Quit' action='QuitAction' />"
-"  </popup>"
-"</ui>";
-
-static GtkActionEntry entries[] = {
-       { "PsensorMenuAction", NULL, "_Psensor" },
-
-       { "ShowAction", NULL,
-         N_("_Show"), NULL,
-         N_("Show"),
-         G_CALLBACK(cb_menu_show) },
-
-       { "PreferencesAction", GTK_STOCK_PREFERENCES,
-         N_("_Preferences"), NULL,
-         N_("Preferences"),
-         G_CALLBACK(cb_menu_preferences) },
-
-       { "SensorPreferencesAction", GTK_STOCK_PREFERENCES,
-         N_("S_ensor Preferences"),
-         NULL,
-         N_("SensorPreferences"),
-         G_CALLBACK(cb_sensor_preferences) },
-
-       { "AboutAction", NULL,
-         N_("_About"),
-         NULL,
-         N_("About"),
-         G_CALLBACK(cb_about) },
-
-       { "QuitAction",
-         GTK_STOCK_QUIT,
-         N_("_Quit"),
-         NULL, N_("Quit"),
-         G_CALLBACK(cb_menu_quit) }
-};
-static guint n_entries = G_N_ELEMENTS(entries);
-
 static void
 update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celcius)
 {
@@ -201,27 +143,31 @@ build_sensor_menu_items(const struct ui_psensor *ui,
 
 static GtkWidget *get_menu(struct ui_psensor *ui)
 {
-       GtkActionGroup *action_group;
-       GtkUIManager *menu_manager;
        GError *error;
        GtkMenu *menu;
+       guint ok;
+       GtkBuilder *builder;
 
-       action_group = gtk_action_group_new("PsensorActions");
-       gtk_action_group_set_translation_domain(action_group, PACKAGE);
-       menu_manager = gtk_ui_manager_new();
-
-       gtk_action_group_add_actions(action_group, entries, n_entries, ui);
-       gtk_ui_manager_insert_action_group(menu_manager, action_group, 0);
+       builder = gtk_builder_new();
 
        error = NULL;
-       gtk_ui_manager_add_ui_from_string(menu_manager, menu_desc, -1, &error);
-
-       if (error)
-               g_error(_("building menus failed: %s"), error->message);
-
-       menu = GTK_MENU(gtk_ui_manager_get_widget(menu_manager, "/MainMenu"));
+       ok = gtk_builder_add_from_file
+               (builder,
+                PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "psensor.glade",
+                &error);
+
+       if (!ok) {
+               log_printf(LOG_ERR, error->message);
+               g_error_free(error);
+               return NULL;
+       }
 
+       menu = GTK_MENU(gtk_builder_get_object(builder, "appindicator_menu"));
        build_sensor_menu_items(ui, menu);
+       gtk_builder_connect_signals(builder, ui);
+
+       g_object_ref(G_OBJECT(menu));
+       g_object_unref(G_OBJECT(builder));
 
        return GTK_WIDGET(menu);
 }
@@ -307,5 +253,4 @@ int is_appindicator_supported()
 void ui_appindicator_cleanup()
 {
        free(sensors);
-       /* TODO: cleanup menu items. */
 }