[Pkg-xfce-commits] r4121 - in goodies/trunk/xfce4-indicator-plugin/debian: . patches source
Evgeni Golov
evgeni at alioth.debian.org
Mon May 31 11:39:51 UTC 2010
Author: evgeni
Date: 2010-05-31 11:39:42 +0000 (Mon, 31 May 2010)
New Revision: 4121
Added:
goodies/trunk/xfce4-indicator-plugin/debian/patches/
goodies/trunk/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch
goodies/trunk/xfce4-indicator-plugin/debian/patches/series
goodies/trunk/xfce4-indicator-plugin/debian/source/
goodies/trunk/xfce4-indicator-plugin/debian/source/format
Modified:
goodies/trunk/xfce4-indicator-plugin/debian/changelog
goodies/trunk/xfce4-indicator-plugin/debian/control
Log:
update for libindicator 0.3.0
Modified: goodies/trunk/xfce4-indicator-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/changelog 2010-05-31 09:31:06 UTC (rev 4120)
+++ goodies/trunk/xfce4-indicator-plugin/debian/changelog 2010-05-31 11:39:42 UTC (rev 4121)
@@ -2,4 +2,4 @@
* Initial release closes: #534555
- -- Evgeni Golov <evgeni at debian.org> Tue, 06 Oct 2009 22:05:51 +0200
+ -- Evgeni Golov <evgeni at debian.org> Mon, 31 May 2010 11:42:49 +0200
Modified: goodies/trunk/xfce4-indicator-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/control 2010-05-31 09:31:06 UTC (rev 4120)
+++ goodies/trunk/xfce4-indicator-plugin/debian/control 2010-05-31 11:39:42 UTC (rev 4121)
@@ -5,8 +5,9 @@
Uploaders: Yves-Alexis Perez <corsac at debian.org>,
Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
Evgeni Golov <evgeni at debian.org>
-Build-Depends: debhelper (>= 7), libxfcegui4-dev, xfce4-panel-dev, libindicator-dev (>=0.2.0)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7), libxfcegui4-dev, xfce4-panel-dev, libindicator-dev (>=0.3.0),
+ intltool
+Standards-Version: 3.8.4
Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/
Added: goodies/trunk/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch (rev 0)
+++ goodies/trunk/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch 2010-05-31 11:39:42 UTC (rev 4121)
@@ -0,0 +1,112 @@
+#diff -r e02fa5b5ff30 configure.in.in
+#--- a/configure.in.in Fri Oct 23 15:03:46 2009 +0200
+#+++ b/configure.in.in Mon May 31 13:11:30 2010 +0200
+#@@ -65,7 +65,7 @@
+# XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2])
+# XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2])
+# XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.2])
+#-XDT_CHECK_PACKAGE([INDICATOR], [indicator], [0.2.0])
+#+XDT_CHECK_PACKAGE([INDICATOR], [indicator], [0.3.0])
+#
+# dnl ***********************************
+# dnl *** Check for debugging support ***
+diff -r e02fa5b5ff30 panel-plugin/indicator.c
+--- a/panel-plugin/indicator.c Fri Oct 23 15:03:46 2009 +0200
++++ b/panel-plugin/indicator.c Mon May 31 13:11:30 2010 +0200
+@@ -26,7 +26,7 @@
+ #include <libxfce4util/libxfce4util.h>
+ #include <libxfce4panel/xfce-panel-plugin.h>
+ #include <libxfce4panel/xfce-hvbox.h>
+-#include <libindicator/indicator.h>
++#include <libindicator/indicator-object.h>
+
+ #include "indicator.h"
+
+@@ -318,57 +318,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;
++ 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);
+ }
+
+- 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);
++ g_list_free(entries);
+
+ return TRUE;
+ }
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/po/POTFILES.skip Mon May 31 13:17:51 2010 +0200
+@@ -0,0 +1,1 @@
++.pc/01_libindicator0.3.0_compat.patch/panel-plugin/indicator.c
+
Added: goodies/trunk/xfce4-indicator-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/patches/series (rev 0)
+++ goodies/trunk/xfce4-indicator-plugin/debian/patches/series 2010-05-31 11:39:42 UTC (rev 4121)
@@ -0,0 +1 @@
+01_libindicator0.3.0_compat.patch
Added: goodies/trunk/xfce4-indicator-plugin/debian/source/format
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/source/format (rev 0)
+++ goodies/trunk/xfce4-indicator-plugin/debian/source/format 2010-05-31 11:39:42 UTC (rev 4121)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-xfce-commits
mailing list