Merge lp:~muktupavels/indicator-applet/libpanel-applet-3.10+ into lp:indicator-applet

[Alberts Muktupāvels]

Update for new libpanel-applet version.

Update for new libpanel-applet version.

[Dmitry Shachnev (mitya57)]

Can you use some preprocessor magic to make it work with both old and new gnome-panel?

[Alberts Muktupāvels (muktupavels)]

> Can you use some preprocessor magic to make it work with both old and new
> gnome-panel?

Why? I think it is not worth to spend time trying to achieve it.

[Dmitry Shachnev (mitya57)]

I thought it is just a couple of #if/#else/#endif blocks, no? If you do that, it will ease a transition for us in Ubuntu (if there will be a transition), which is quite important as we are approaching the freeze.

[Alberts Muktupāvels (muktupavels)]

It would be that simple for changes in applet-main.c, but what about configure.ac?

I guess first we would need to detected what gnome-panel version we have. Then depending on that choose which package applet should require - libpanel-applet (new) or libpanelapplet-4.0 (old).

How about with debian/control? Depends packages will change too...

[Dmitry Shachnev (mitya57)]

Ok, let's leave it as is. But it won't be merged until I have working 3.10 packages (I am still waiting for some kind of tarballs, at least for gnome-flashback & gnome-applets).

[Alberts Muktupāvels (muktupavels)]

Can I do something like this?
Build-Deps: libpanel-applet-4-dev (<< 3.10) | libpanel-applet-dev (>= 3.10)

[Alberts Muktupāvels (muktupavels)]

Tested and seems that it works. :)

1. with pbuilder
bzr builddeb -- -S -us -uc
pbuilder-dist utopic build ../indicator-applet_12.10.2+14.04.20140403-0ubuntu1.dsc

2. localy
./autogen.sh
make

[Dmitry Shachnev (mitya57)]

One minor issue and it will be fine.

[Alberts Muktupāvels (muktupavels)]

> One minor issue and it will be fine.
But when new gnome-panel will be uploaded then libpanel-applet-4-dev will be replaced by new package. There won't be both packages.

[Dmitry Shachnev (mitya57)]

If there are no file conflicts, then technically old and new packages can co-exist. Also, the order has not only technical meaning, but also a semantic one.

[Alberts Muktupāvels (muktupavels)]

> If there are no file conflicts, then technically old and new packages can co-
> exist. Also, the order has not only technical meaning, but also a semantic
> one.

Ok, I changed order. :)

[Dmitry Shachnev (mitya57)]

Thanks, looks fine to me now (though I don't have rights to merge this).

Also, please change the status from "Work in Progress" to "Needs Review", to mark it as ready for merging.

review: Approve

[Alberts Muktupāvels (muktupavels)]

> Thanks, looks fine to me now (though I don't have rights to merge this).
>
> Also, please change the status from "Work in Progress" to "Needs Review", to
> mark it as ready for merging.

Should not we wait until we will know for sure that we will have 3.10+ release?

[Dmitry Shachnev (mitya57)]

You made it work with the old version, so I don't see why we should wait. Now when/if we get the new version, we'll need to just rebuild indicator-applet in Ubuntu.

[Alberts Muktupāvels (muktupavels)]

Ok, changed status to "Needs Review"

[Iain Lane (laney)]

HAVE_LIBPANEL_APPLET is a confusing name given what it means here. :)

But, seems fine - approving.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-07-11 16:25:20 +0000
+++ configure.ac	2014-08-18 15:45:47 +0000
@@ -22,13 +22,24 @@
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 ###########################
+# libpanel-applet version
+###########################
+
+PKG_CHECK_MODULES(LIBPANEL_APPLET_TEST, [libpanel-applet >= 3.10], [have_libpanel_applet=yes], [have_libpanel_applet=no])
+if test "$have_libpanel_applet" = "yes"; then
+    APPLET_PKG=libpanel-applet
+    AC_DEFINE([HAVE_LIBPANEL_APPLET], 1, [Define to use new libpanel-applet])
+else
+    APPLET_PKG=libpanelapplet-4.0
+fi
+
+###########################
 # Dependencies 
 ###########################
 
 GTK_REQUIRED_VERSION=3.1
 INDICATOR_REQUIRED_VERSION=0.3.92
 INDICATOR_PKG=indicator3-0.4
-APPLET_PKG=libpanelapplet-4.0
 
 PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK_REQUIRED_VERSION
                           x11
@@ -59,6 +70,8 @@
 	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir $INDICATOR_PKG`
 fi
 
+LIBPANEL_APPLET_API_VERSION=`$PKG_CONFIG --variable=libpanel_applet_api_version $APPLET_PKG`
+
 AC_SUBST(APPLETDIR)
 AC_SUBST(INDICATORDIR)
 AC_SUBST(INDICATORICONSDIR)
@@ -141,4 +154,5 @@
 Indicator Applet Configuration:
 
 	Prefix:                 $prefix
+	libpanel-applet API:    $LIBPANEL_APPLET_API_VERSION
 ])

=== modified file 'debian/control'
--- debian/control	2014-04-02 15:21:08 +0000
+++ debian/control	2014-08-18 15:45:47 +0000
@@ -11,7 +11,7 @@
                gnome-doc-utils,
                gtk-doc-tools,
                libgtk-3-dev,
-               libpanel-applet-4-dev,
+               libpanel-applet-dev | libpanel-applet-4-dev,
                libxml2-dev,
                libindicator3-dev,
                libido3-0.1-dev (>= 13.10.0),

=== modified file 'src/applet-main.c'
--- src/applet-main.c	2014-04-02 16:15:55 +0000
+++ src/applet-main.c	2014-08-18 15:45:47 +0000
@@ -813,8 +813,14 @@
 }
 
 static void
+#ifdef HAVE_LIBPANEL_APPLET
+about_cb (GSimpleAction *action G_GNUC_UNUSED,
+          GVariant      *parameter G_GNUC_UNUSED,
+          gpointer       data G_GNUC_UNUSED)
+#else
 about_cb (GtkAction *action G_GNUC_UNUSED,
           gpointer   data G_GNUC_UNUSED)
+#endif
 {
   static const gchar *authors[] = {
     "Ted Gould <[e-mail]>",
@@ -993,16 +999,33 @@
                 gpointer data G_GNUC_UNUSED)
 {
   ido_init();
-  
+
+#ifdef HAVE_LIBPANEL_APPLET
+  static const GActionEntry menu_actions[] = {
+    {"about", about_cb }
+  };
+  static const gchar *menu_xml = ""
+    "<section>"
+    "<item>"
+    "<attribute name=\"label\" translatable=\"yes\">_About</attribute>"
+    "<attribute name=\"action\">indicator-applet.about</attribute>"
+    "</item>"
+    "</section>";
+#else
   static const GtkActionEntry menu_actions[] = {
     {"About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, G_CALLBACK(about_cb)}
   };
   static const gchar *menu_xml = "<menuitem name=\"About\" action=\"About\"/>";
+#endif
 
   static gboolean first_time = FALSE;
   GtkWidget *menubar;
   gint indicators_loaded = 0;
+#ifdef HAVE_LIBPANEL_APPLET
+  GSimpleActionGroup *action_group;
+#else
   GtkActionGroup *action_group;
+#endif
 
 #ifdef INDICATOR_APPLET_SESSION
   /* check if we are running stracciatella session */
@@ -1037,6 +1060,15 @@
   gtk_container_set_border_width(GTK_CONTAINER (applet), 0);
   panel_applet_set_flags(applet, PANEL_APPLET_EXPAND_MINOR);
   menubar = gtk_menu_bar_new();
+
+#ifdef HAVE_LIBPANEL_APPLET
+  action_group = g_simple_action_group_new ();
+  g_action_map_add_action_entries (G_ACTION_MAP (action_group), menu_actions,
+                                   G_N_ELEMENTS (menu_actions), menubar);
+  panel_applet_setup_menu(applet, menu_xml, action_group, GETTEXT_PACKAGE);
+  gtk_widget_insert_action_group (GTK_WIDGET (applet), "indicator-applet", G_ACTION_GROUP (action_group));
+  g_object_unref(action_group);
+#else
   action_group = gtk_action_group_new ("Indicator Applet Actions");
   gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
   gtk_action_group_add_actions (action_group, menu_actions,
@@ -1044,6 +1076,8 @@
                                 menubar);
   panel_applet_setup_menu(applet, menu_xml, action_group);
   g_object_unref(action_group);
+#endif
+
 #ifdef INDICATOR_APPLET
   atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
                        "indicator-applet");