[Pkg-xfce-commits] r4129 - goodies/trunk/xfce4-indicator-plugin/debian/patches
Evgeni Golov
evgeni at alioth.debian.org
Sun Jun 13 05:04:44 UTC 2010
Author: evgeni
Date: 2010-06-13 17:04:43 +0000 (Sun, 13 Jun 2010)
New Revision: 4129
Modified:
goodies/trunk/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch
Log:
mess around with the patch so 0.0.1 works, not only hg
Modified: 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 2010-06-13 15:24:46 UTC (rev 4128)
+++ goodies/trunk/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch 2010-06-13 17:04:43 UTC (rev 4129)
@@ -16,9 +16,10 @@
#
# 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
+Index: xfce4-indicator-plugin-0.0.1/panel-plugin/indicator.c
+===================================================================
+--- xfce4-indicator-plugin-0.0.1.orig/panel-plugin/indicator.c 2010-06-13 18:00:28.372224709 +0200
++++ xfce4-indicator-plugin-0.0.1/panel-plugin/indicator.c 2010-06-13 18:57:35.276310144 +0200
@@ -26,7 +26,7 @@
#include <libxfce4util/libxfce4util.h>
#include <libxfce4panel/xfce-panel-plugin.h>
@@ -28,7 +29,16 @@
#include "indicator.h"
-@@ -318,57 +318,35 @@
+@@ -34,7 +34,7 @@
+ #define DEFAULT_SETTING1 NULL
+ #define DEFAULT_SETTING2 1
+ #define DEFAULT_SETTING3 FALSE
+-#define ICONS_DIR (DATADIR G_DIR_SEPARATOR_S "indicator-applet" G_DIR_SEPARATOR_S "icons")
++#define ICONS_DIR "/usr/share/libindicator/icons/"
+
+
+ /* prototypes */
+@@ -320,57 +320,35 @@
g_debug("Loading Module: %s", name);
gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL);
@@ -43,30 +53,9 @@
- 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);
@@ -89,7 +78,9 @@
- g_warning("No label or icon. Odd.");
- return FALSE;
- }
--
++ 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 (icon != NULL) {
@@ -100,19 +91,62 @@
- }
- gtk_container_add(GTK_CONTAINER(menuitem), hbox);
- gtk_widget_show(hbox);
--
++ 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));
++ }
+
- 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);
+ }
+
- 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 @@
+Index: xfce4-indicator-plugin-0.0.1/po/POTFILES.skip
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xfce4-indicator-plugin-0.0.1/po/POTFILES.skip 2010-06-13 18:00:35.548755923 +0200
+@@ -0,0 +1 @@
+.pc/01_libindicator0.3.0_compat.patch/panel-plugin/indicator.c
-
+Index: xfce4-indicator-plugin-0.0.1/panel-plugin/Makefile.am
+===================================================================
+--- xfce4-indicator-plugin-0.0.1.orig/panel-plugin/Makefile.am 2010-06-13 18:01:02.988286674 +0200
++++ xfce4-indicator-plugin-0.0.1/panel-plugin/Makefile.am 2010-06-13 18:56:45.432223655 +0200
+@@ -24,7 +24,7 @@
+ $(INDICATOR_CFLAGS) \
+ $(PLATFORM_CFLAGS) \
+ -DDATADIR=\""$(datadir)"\" \
+- -DINDICATOR_DIR=\""$(libdir)/indicators/2"\"
++ -DINDICATOR_DIR=\""$(libdir)/indicators/3"\"
+
+
+ xfce4_indicator_plugin_LDADD = \
+Index: xfce4-indicator-plugin-0.0.1/panel-plugin/Makefile.in
+===================================================================
+--- xfce4-indicator-plugin-0.0.1.orig/panel-plugin/Makefile.in 2010-06-13 19:01:13.216725094 +0200
++++ xfce4-indicator-plugin-0.0.1/panel-plugin/Makefile.in 2010-06-13 19:01:22.384224345 +0200
+@@ -273,7 +273,7 @@
+ $(INDICATOR_CFLAGS) \
+ $(PLATFORM_CFLAGS) \
+ -DDATADIR=\""$(datadir)"\" \
+- -DINDICATOR_DIR=\""$(libdir)/indicators/2"\"
++ -DINDICATOR_DIR=\""$(libdir)/indicators/3"\"
+
+ xfce4_indicator_plugin_LDADD = \
+ $(LIBXFCE4UTIL_LIBS) \
More information about the Pkg-xfce-commits
mailing list