← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/xfce4-indicator-plugin/oneiric-proposed

« back to all changes in this revision

Viewing changes to debian/patches/0002-set-up-indicators-with-only-one-function-some-set-he.patch

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2011-06-26 01:24:54 UTC
  • mfrom: (3.2.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110626012454-u3ra9bypujkz4qgk
Tags: 0.2.1-1ubuntu1
https://launchpad.net/bugs/787977
* Merge from Debian unstable, remaining Ubuntu changes:
  - debian/patches:
    + 0004-cherry-pick-vertical-panel-fixes.patch: cherry-pick from upstream
      4e55a3d7292bd4f15b1555530f58e559cb99e965
      2c0cc99c948d1b5e1ff5fb11057a6bb549849a2d
      Fixes vertical panel issue with indicators (LP: #787977)
    + xubuntu_exclude-modules.patch: add a blacklist option. Some modules
      are unneeded/redundant/badly work on Xubuntu (e.g. appmenu), so give
      the possibility to ignore them.
    + series: refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0002-set-up-indicators-with-only-one-function-some-set-he.patch
1
 
From 7307f54ea39f376d6938f81ea1712e8ce49f7af9 Mon Sep 17 00:00:00 2001
2
 
From: Lionel Le Folgoc <lionel@lefolgoc.net>
3
 
Date: Thu, 24 Feb 2011 22:03:29 +0100
4
 
Subject: set up indicators with only one function (some set here where missing a few signal handlers)
5
 
 
6
 
Patch slightly modified for Xubuntu to add the po/POTFILES.skip change.
7
 
---
8
 
 panel-plugin/indicator.c |   19 +------------------
9
 
 1 files changed, 1 insertions(+), 18 deletions(-)
10
 
 
11
 
diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
12
 
index 1c66999..52b8ece 100644
13
 
--- a/panel-plugin/indicator.c
14
 
+++ b/panel-plugin/indicator.c
15
 
@@ -377,24 +377,7 @@ load_module (const gchar * name, GtkWidget * menu)
16
 
 
17
 
        for (entry = entries; entry != NULL; entry = g_list_next(entry)) {
18
 
                IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data;
19
 
-
20
 
-               GtkWidget * menuitem = gtk_menu_item_new();
21
 
-               GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
22
 
-               if (entrydata->image != NULL) {
23
 
-                       gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entrydata->image), FALSE, FALSE, 0);
24
 
-               }
25
 
-               if (entrydata->label != NULL) {
26
 
-                       gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entrydata->label), FALSE, FALSE, 0);
27
 
-               }
28
 
-               gtk_container_add(GTK_CONTAINER(menuitem), hbox);
29
 
-               gtk_widget_show(hbox);
30
 
-
31
 
-               if (entrydata->menu != NULL) {
32
 
-                       gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entrydata->menu));
33
 
-               }
34
 
-
35
 
-               gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
36
 
-               gtk_widget_show(menuitem);
37
 
+               entry_added(io, entrydata, menu);
38
 
        }
39
 
 
40
 
        g_list_free(entries);
41
 
--- xfce4-indicator-plugin-0.2.0.orig/po/POTFILES.skip
42
 
+++ xfce4-indicator-plugin-0.2.0/po/POTFILES.skip
43
 
@@ -1 +1,2 @@
44
 
 .pc/0001-Add-entry_-added-removed-signal-handlers.patch/panel-plugin/indicator.c
45
 
+.pc/0002-set-up-indicators-with-only-one-function-some-set-he.patch/panel-plugin/indicator.c