Migrate to D-Bus

Bonobo is deprecated, see http://live.gnome.org/GnomeGoals/AppletsDbusMigration
alexkay · Sep 17, 2011 · 9243d49 · 9243d49
1 parent b347a7f
commit 9243d49
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *.o
+*.panel-applet
 *.tar.gz
 .#*
 .*.swp
@@ -14,4 +15,3 @@ install-sh
 missing
 stamp-h1
 xmonad-log-applet
-xmonad-log-applet.server
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,5 @@
 Copyright (c) 2009,2010,2011 Adam Wick
+Copyright (c) 2011 Alexander Kojevnikov
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/Makefile.am b/Makefile.am
@@ -26,21 +26,22 @@ install-data-local:
 	done ;
 endif
 
-serverdir = $(libdir)/bonobo/servers
-server_files = xmonad-log-applet.server
-server_DATA = $(server_files)
+# TODO: use libpanel_applet_dir in GNOME3
+appletdir = $(datadir)/gnome-panel/applets
+applet_files = org.xmonad.Log.panel-applet
+applet_DATA = $(applet_files)
 
-$(server_files): $(server_files:.server=.server.in)
+$(applet_files): $(applet_files:.panel-applet=.panel-applet.in)
 	$(SED) -e "s|\@LIBEXECDIR\@|$(libexecdir)|"	\
 		-e "s|\@DATADIR\@|$(datadir)|" < $< > $@
 
 DISTCLEANFILES = \
-	$(server_DATA)
+	$(applet_DATA)
 
 EXTRA_DIST = \
 	xmonad48.png \
 	xmonad-log-applet.schema \
-	xmonad-log-applet.server.in
+	org.xmonad.Log.panel-applet.in
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t
 

diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ AC_HEADER_STDC
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.20.0)
 PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.80)
-PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-2.0 >= 2.26.0)
+PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-3.0 >= 2.32.0)
 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.26.0)
 
 AM_GCONF_SOURCE_2

diff --git a/main.c b/main.c
@@ -1,6 +1,11 @@
-/* Copyright (C) 2009 Adam Wick
+/* main.c
+ *
+ * Copyright (c) 2009 Adam Wick
+ * Copyright (c) 2011 Alexander Kojevnikov
+ *
  * See LICENSE for licensing information
  */
+
 #include <string.h>
 #include <panel-applet.h>
 #include <gtk/gtklabel.h>
@@ -9,9 +14,10 @@
 #include <stdlib.h>
 
 /* AW: I pulled this code off the interwebs. It makes background 
- * transparency actually work */
-void change_bg(PanelApplet *applet, PanelAppletBackgroundType type,
-               GdkColor *color, GdkPixmap *pixmap)
+ * transparency actually work
+ */
+static void change_bg(PanelApplet *applet, PanelAppletBackgroundType type,
+                      GdkColor *color, GdkPixmap *pixmap)
 {
   GtkRcStyle *rc_style;
   GtkStyle *style;
@@ -81,7 +87,7 @@ void xmonadlog_applet_size_change(GConfClient *client,
 
 static gboolean xmonadlog_applet_fill(PanelApplet *applet)
 {
-  GtkWidget *label = gtk_label_new("Waiting for XMonad");
+  GtkWidget *label = gtk_label_new("Waiting for Xmonad...");
 
   // Set up Gconf
   GConfClient* client = gconf_client_get_default();
@@ -125,7 +131,7 @@ static gboolean xmonadlog_applet_factory(PanelApplet *applet,
 {
   gboolean retval = FALSE;
 
-  if(!strcmp(iid, "OAFIID:XMonadLogApplet"))
+  if(!strcmp(iid, "XmonadLogApplet"))
     retval = xmonadlog_applet_fill(applet);
 
   if(retval == FALSE) {
@@ -136,9 +142,8 @@ static gboolean xmonadlog_applet_factory(PanelApplet *applet,
   return retval;
 }
 
-PANEL_APPLET_BONOBO_FACTORY("OAFIID:XMonadLogApplet_Factory",
-                            PANEL_TYPE_APPLET,
-                            "XMonadLogApplet",
-                            "0.0.1",
-                            xmonadlog_applet_factory,
-                            NULL);
+PANEL_APPLET_OUT_PROCESS_FACTORY("XmonadLogAppletFactory",
+                                 PANEL_TYPE_APPLET,
+                                 "XmonadLogApplet",
+                                 xmonadlog_applet_factory,
+                                 NULL);
diff --git a/org.xmonad.Log.panel-applet.in b/org.xmonad.Log.panel-applet.in
@@ -0,0 +1,11 @@
+[Applet Factory]
+Id=XmonadLogAppletFactory
+Location=@LIBEXECDIR@/xmonad-log-applet
+Name=Xmonad Log Factory
+Description=Factory for the xmonad-log-applet
+
+[XmonadLogApplet]
+Name=Xmonad Log Applet
+Description=Monitor your Xmonad log
+Icon=xmonad48
+BonoboId=OAFIID:XmonadLogApplet
diff --git a/org.xmonad.XmonadLogAppletFactory.service.in b/org.xmonad.XmonadLogAppletFactory.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.xmonad.XmonadLogAppletFactory
+Exec=@LIBEXECDIR@/xmonad-log-applet
diff --git a/xmonad-log-applet.server.in b/xmonad-log-applet.server.in