Merge lp:~indicator-applet-developers/indicator-applet/ubuntu into lp:~ubuntu-desktop/indicator-applet/ubuntu

[Ted Gould]

=== modified file 'ChangeLog'
--- ChangeLog	2008-10-30 02:30:35 +0000
+++ ChangeLog	2009-12-10 18:30:32 +0000
@@ -0,0 +1,1 @@
+Updating to 2a
 
=== modified file 'configure.ac'
--- configure.ac	2009-09-01 14:25:04 +0000
+++ configure.ac	2009-12-10 18:30:32 +0000
@@ -4,7 +4,7 @@
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-applet, 0.2.0)
+AM_INIT_AUTOMAKE(indicator-applet, 0.3.0)
 
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
@@ -28,11 +28,10 @@
 GTK_REQUIRED_VERSION=2.12
 PANEL_REQUIRED_VERSION=2.0.0
 DBUS_REQUIRED_VERSION=0.76
-INDICATOR_REQUIRED_VERSION=0.1.0
+INDICATOR_REQUIRED_VERSION=0.3.0
 
 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
-						  libgnomeui-2.0
 						  indicator >= $INDICATOR_REQUIRED_VERSION)
 AC_SUBST(APPLET_CFLAGS)
 AC_SUBST(APPLET_LIBS)
 
=== modified file 'debian/changelog'
--- debian/changelog	2009-10-14 18:38:45 +0000
+++ debian/changelog	2009-12-10 18:30:32 +0000
@@ -1,3 +1,28 @@
+indicator-applet (0.3.0-0ubuntu1~ppa1) karmic; urgency=low
+
+  * Upstream release 0.3.0
+    * Update to libindicator 0.3.0 API 
+  * debian/control: Updating libindicator to 0.3.0~dev or greater.
+
+ -- Ted Gould <[e-mail]>  Thu, 10 Dec 2009 11:34:33 -0600
+
+indicator-applet (0.2.0-0ubuntu3~ppa2) karmic; urgency=low
+
+  * Fixing version number in About dialog.  (LP: #443196)
+  * Fixing application names in About dialog. (LP: #449036)
+  * Removing libgnomeui dependency. (LP: #458470)
+  * debian/control: Removing dependency on libgnomeui-dev 
+
+ -- Ted Gould <[e-mail]>  Mon, 26 Oct 2009 20:58:09 -0500
+
+indicator-applet (0.2.0-0ubuntu3~ppa1) karmic; urgency=low
+
+  * Patch from Martin Pitt to disable session menu on Stracciatella
+    session.
+  * Remove debian/patches/01_stracciatella.patch
+
+ -- Ted Gould <[e-mail]>  Mon, 26 Oct 2009 14:46:02 -0500
+
 indicator-applet (0.2.0-0ubuntu2) karmic; urgency=low
 
   * debian/rules: Enable simple-patchsys.
 
=== modified file 'debian/control'
--- debian/control	2009-08-25 13:02:19 +0000
+++ debian/control	2009-12-10 18:30:32 +0000
@@ -8,12 +8,11 @@
                libpanel-applet2-dev (>= 2.0.0),
                libdbus-glib-1-dev,
                gnome-doc-utils,
-               libgnomeui-dev,
                libtool,
                intltool,
                libxml2-dev,
                gtk-doc-tools,
-               libindicator-dev (>= 0.2.0~bzr325)
+               libindicator-dev (>= 0.3.0~dev)
 Standards-Version: 3.8.0
 Homepage: https://launchpad.net/indicator-applet
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-applet/ubuntu
 
=== removed file 'debian/patches/01_stracciatella.patch'
--- debian/patches/01_stracciatella.patch	2009-10-14 18:12:47 +0000
+++ debian/patches/01_stracciatella.patch	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-# Description: Do not show up in stracciatella session.
-# Ubuntu: https://launchpad.net/bugs/444149
---- indicator-applet-0.2.0/src-session/applet-main.c	2009-10-14 20:10:27.000000000 +0200
-+++ indicator-applet-0.2.0.new/src-session/applet-main.c	2009-10-14 20:11:03.300289347 +0200
-@@ -214,6 +214,12 @@
- 	gint indicators_loaded = 0;
- 	static gboolean first_time = FALSE;
- 
-+	/* check if we are running stracciatella session */
-+	if (g_strcmp0(g_getenv("GDMSESSION"), "gnome-stracciatella") == 0) {
-+		g_debug("Running stracciatella GNOME session, disabling myself");
-+		return TRUE;
-+	}
-+
- 	if (!first_time)
- 	{
-         gint argc = 1;
 
=== modified file 'src-session/applet-main.c'
--- src-session/applet-main.c	2009-08-24 18:23:17 +0000
+++ src-session/applet-main.c	2009-12-10 18:30:32 +0000
@@ -22,9 +22,8 @@
 
 #include <config.h>
 #include <panel-applet.h>
-#include <libgnomeui/gnome-ui-init.h>
 
-#include "libindicator/indicator.h"
+#include "libindicator/indicator-object.h"
 
 static gboolean     applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data);
 
@@ -35,13 +34,6 @@
                         				         GdkPixmap                 *pixmap,
                                          GtkWidget                 *menubar);
 
-/* ****************** *
- *  Global Variables  *
- * ****************** */
-
-static GnomeProgram *program = NULL;
-
-
 /*************
  * main
  * ***********/
@@ -67,57 +59,35 @@
 	g_debug("Loading Module: %s", name);
 
 	gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL);
-	GModule * module = g_module_open(fullpath,
-                                     G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+	IndicatorObject * io = indicator_object_new_from_file(fullpath);
 	g_free(fullpath);
-	g_return_val_if_fail(module != NULL, FALSE);
-
-	get_version_t lget_version = NULL;
-	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_VERSION_S, (gpointer *)(&lget_version)), FALSE);
-	if (!INDICATOR_VERSION_CHECK(lget_version())) {
-		g_warning("Indicator using API version '%s' we're expecting '%s'", lget_version(), INDICATOR_VERSION);
-		return FALSE;
-	}
-
-	get_label_t lget_label = NULL;
-	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_LABEL_S, (gpointer *)(&lget_label)), FALSE);
-	g_return_val_if_fail(lget_label != NULL, FALSE);
-	GtkLabel * label = lget_label();
-
-	get_icon_t lget_icon = NULL;
-	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_ICON_S, (gpointer *)(&lget_icon)), FALSE);
-	g_return_val_if_fail(lget_icon != NULL, FALSE);
-	GtkImage * icon = lget_icon();
-
-	get_menu_t lget_menu = NULL;
-	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_MENU_S, (gpointer *)(&lget_menu)), FALSE);
-	g_return_val_if_fail(lget_menu != NULL, FALSE);
-	GtkMenu * lmenu = lget_menu();
-
-	if (label == NULL && icon == NULL) {
-		/* This is the case where there is nothing to display,
-		   kinda odd that we'd have a module with nothing. */
-		g_warning("No label or icon.  Odd.");
-		return FALSE;
-	}
-
-	GtkWidget * menuitem = gtk_menu_item_new();
-	GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
-	if (icon != NULL) {
-		gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(icon), FALSE, FALSE, 0);
-	}
-	if (label != NULL) {
-		gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label), FALSE, FALSE, 0);
-	}
-	gtk_container_add(GTK_CONTAINER(menuitem), hbox);
-	gtk_widget_show(hbox);
-
-	if (lmenu != NULL) {
-		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(lmenu));
-	}
-
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-	gtk_widget_show(menuitem);
+
+	GList * entries = indicator_object_get_entries(io);
+	GList * entry = NULL;
+
+	for (entry = entries; entry != NULL; entry = g_list_next(entry)) {
+		IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data;
+
+		GtkWidget * menuitem = gtk_menu_item_new();
+		GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
+		if (entrydata->image != NULL) {
+			gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entrydata->image), FALSE, FALSE, 0);
+		}
+		if (entrydata->label != NULL) {
+			gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entrydata->label), FALSE, FALSE, 0);
+		}
+		gtk_container_add(GTK_CONTAINER(menuitem), hbox);
+		gtk_widget_show(hbox);
+
+		if (entrydata->menu != NULL) {
+			gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entrydata->menu));
+		}
+
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+		gtk_widget_show(menuitem);
+	}
+
+	g_list_free(entries);
 
 	return TRUE;
 }
@@ -173,9 +143,9 @@
 	license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL);
 
 	gtk_show_about_dialog(NULL,
-		"version", "0.1",
+		"version", VERSION,
 		"copyright", "Copyright \xc2\xa9 2009 Canonical, Ltd.",
-		"comments", _("An applet to hold all of the system indicators."),
+		"comments", _("A place to adjust your status, change users or exit your session."),
 		"authors", authors,
 		"license", license_i18n,
 		"wrap-license", TRUE,
@@ -214,16 +184,16 @@
 	gint indicators_loaded = 0;
 	static gboolean first_time = FALSE;
 
+	/* check if we are running stracciatella session */
+	if (g_strcmp0(g_getenv("GDMSESSION"), "gnome-stracciatella") == 0) {
+		g_debug("Running stracciatella GNOME session, disabling myself");
+		return TRUE;
+	}
+
 	if (!first_time)
 	{
-        gint argc = 1;
-        gchar *argv[2] = { "indicator-applet-session", NULL};
-	    
 		first_time = TRUE;
-		program = gnome_program_init ("indicator-applet-session", "0.1",
-				    LIBGNOMEUI_MODULE, argc, argv,
-				    GNOME_PROGRAM_STANDARD_PROPERTIES,
-				    NULL);
+		g_set_application_name(_("Indicator Applet Session"));
 	}
 
 	/* Set panel options */
 
=== modified file 'src/applet-main.c'
--- src/applet-main.c	2009-09-01 14:25:04 +0000
+++ src/applet-main.c	2009-12-10 18:30:32 +0000
@@ -22,9 +22,10 @@
 
 #include <config.h>
 #include <panel-applet.h>
-#include <libgnomeui/gnome-ui-init.h>
-
-#include "libindicator/indicator.h"
+
+#include "libindicator/indicator-object.h"
+
+#define ENTRY_DATA_NAME "indicator-custom-entry-data"
 
 static gboolean     applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data);
 
@@ -35,13 +36,6 @@
                         				         GdkPixmap                 *pixmap,
                                          GtkWidget                 *menubar);
 
-/* ****************** *
- *  Global Variables  *
- * ****************** */
-
-static GnomeProgram *program = NULL;
-
-
 /*************
  * main
  * ***********/
@@ -54,6 +48,58 @@
 /*************
  * init function
  * ***********/
+static void
+entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menu)
+{
+	g_debug("Signal: Entry Added");
+
+	GtkWidget * menuitem = gtk_menu_item_new();
+	GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
+
+	if (entry->image != NULL) {
+		gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry->image), FALSE, FALSE, 0);
+	}
+	if (entry->label != NULL) {
+		gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry->label), FALSE, FALSE, 0);
+	}
+	gtk_container_add(GTK_CONTAINER(menuitem), hbox);
+	gtk_widget_show(hbox);
+
+	if (entry->menu != NULL) {
+		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entry->menu));
+	}
+
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+	gtk_widget_show(menuitem);
+
+	g_object_set_data(G_OBJECT(menuitem), ENTRY_DATA_NAME, entry);
+
+	return;
+}
+
+static void
+entry_removed_cb (GtkWidget * widget, gpointer userdata)
+{
+	gpointer data = g_object_get_data(G_OBJECT(widget), ENTRY_DATA_NAME);
+
+	if (data != userdata) {
+		return;
+	}
+
+	gtk_widget_destroy(widget);
+	return;
+}
+
+static void 
+entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data)
+{
+	g_debug("Signal: Entry Removed");
+
+	gtk_container_foreach(GTK_CONTAINER(user_data), entry_removed_cb, entry);
+
+	return;
+}
+
 static gboolean
 load_module (const gchar * name, GtkWidget * menu)
 {
@@ -66,58 +112,25 @@
 
 	g_debug("Loading Module: %s", name);
 
+	/* Build the object for the module */
 	gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL);
-	GModule * module = g_module_open(fullpath,
-                                     G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+	IndicatorObject * io = indicator_object_new_from_file(fullpath);
 	g_free(fullpath);
-	g_return_val_if_fail(module != NULL, FALSE);
-
-	get_version_t lget_version = NULL;
-	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_VERSION_S, (gpointer *)(&lget_version)), FALSE);
-	if (!INDICATOR_VERSION_CHECK(lget_version())) {
-		g_warning("Indicator using API version '%s' we're expecting '%s'", lget_version(), INDICATOR_VERSION);
-		return FALSE;
-	}
-
-	get_label_t lget_label = NULL;
-	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_LABEL_S, (gpointer *)(&lget_label)), FALSE);
-	g_return_val_if_fail(lget_label != NULL, FALSE);
-	GtkLabel * label = lget_label();
-
-	get_icon_t lget_icon = NULL;
-	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_ICON_S, (gpointer *)(&lget_icon)), FALSE);
-	g_return_val_if_fail(lget_icon != NULL, FALSE);
-	GtkImage * icon = lget_icon();
-
-	get_menu_t lget_menu = NULL;
-	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_MENU_S, (gpointer *)(&lget_menu)), FALSE);
-	g_return_val_if_fail(lget_menu != NULL, FALSE);
-	GtkMenu * lmenu = lget_menu();
-
-	if (label == NULL && icon == NULL) {
-		/* This is the case where there is nothing to display,
-		   kinda odd that we'd have a module with nothing. */
-		g_warning("No label or icon.  Odd.");
-		return FALSE;
-	}
-
-	GtkWidget * menuitem = gtk_menu_item_new();
-	GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
-	if (icon != NULL) {
-		gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(icon), FALSE, FALSE, 0);
-	}
-	if (label != NULL) {
-		gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label), FALSE, FALSE, 0);
-	}
-	gtk_container_add(GTK_CONTAINER(menuitem), hbox);
-	gtk_widget_show(hbox);
-
-	if (lmenu != NULL) {
-		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(lmenu));
-	}
-
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-	gtk_widget_show(menuitem);
+
+	/* Connect to it's signals */
+	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,   G_CALLBACK(entry_added),    menu);
+	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_removed),  menu);
+
+	/* Work on the entries */
+	GList * entries = indicator_object_get_entries(io);
+	GList * entry = NULL;
+
+	for (entry = entries; entry != NULL; entry = g_list_next(entry)) {
+		IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data;
+		entry_added(io, entrydata, menu);
+	}
+
+	g_list_free(entries);
 
 	return TRUE;
 }
@@ -173,7 +186,7 @@
 	license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL);
 
 	gtk_show_about_dialog(NULL,
-		"version", "0.1",
+		"version", VERSION,
 		"copyright", "Copyright \xc2\xa9 2009 Canonical, Ltd.",
 		"comments", _("An applet to hold all of the system indicators."),
 		"authors", authors,
@@ -223,14 +236,8 @@
 
 	if (!first_time)
 	{
-        gint argc = 1;
-        gchar *argv[2] = { "indicator-applet", NULL};
-	    
 		first_time = TRUE;
-		program = gnome_program_init ("indicator-applet", "0.1",
-				    LIBGNOMEUI_MODULE, argc, argv,
-				    GNOME_PROGRAM_STANDARD_PROPERTIES,
-				    NULL);
+		g_set_application_name(_("Indicator Applet"));
 	}
 
 	/* Set panel options */