[Pkg-xfce-commits] r5866 - in goodies/trunk/xfce4-indicator-plugin/debian: . patches

[Evgeni Golov]

Author: evgeni
Date: 2011-07-23 17:07:42 +0000 (Sat, 23 Jul 2011)
New Revision: 5866

Added:
   goodies/trunk/xfce4-indicator-plugin/debian/patches/
   goodies/trunk/xfce4-indicator-plugin/debian/patches/attach_button_to_menu_right_at_the_beginning.patch
   goodies/trunk/xfce4-indicator-plugin/debian/patches/fix_menu_position.patch
   goodies/trunk/xfce4-indicator-plugin/debian/patches/potfiles.patch
   goodies/trunk/xfce4-indicator-plugin/debian/patches/series
Modified:
   goodies/trunk/xfce4-indicator-plugin/debian/changelog
Log:
Add two patches from upstream git
as suggested by upstream



Modified: goodies/trunk/xfce4-indicator-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/changelog	2011-07-20 10:12:15 UTC (rev 5865)
+++ goodies/trunk/xfce4-indicator-plugin/debian/changelog	2011-07-23 17:07:42 UTC (rev 5866)
@@ -1,3 +1,11 @@
+xfce4-indicator-plugin (0.3.1-2) unstable; urgency=low
+
+  * Add fix_menu_position.patch and 
+    attach_button_to_menu_right_at_the_beginning.patch
+    as suggested by upstream.
+
+ -- Evgeni Golov <evgeni at debian.org>  Sat, 23 Jul 2011 18:32:04 +0200
+
 xfce4-indicator-plugin (0.3.1-1) unstable; urgency=low
 
   * New upstream release.

Added: goodies/trunk/xfce4-indicator-plugin/debian/patches/attach_button_to_menu_right_at_the_beginning.patch
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/patches/attach_button_to_menu_right_at_the_beginning.patch	                        (rev 0)
+++ goodies/trunk/xfce4-indicator-plugin/debian/patches/attach_button_to_menu_right_at_the_beginning.patch	2011-07-23 17:07:42 UTC (rev 5866)
@@ -0,0 +1,34 @@
+From defca954a995cba535ece42ae2a890ea0fdb3f10 Mon Sep 17 00:00:00 2001
+From: Mark Trompell <mark at foresightlinux.org>
+Date: Tue, 19 Jul 2011 07:00:00 +0000
+Subject: attach button to menu right at the beginning
+
+---
+diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
+index 4468a52..613c1a5 100644
+--- a/panel-plugin/indicator.c
++++ b/panel-plugin/indicator.c
+@@ -163,9 +163,7 @@ on_button_press (GtkWidget *widget, GdkEventButton *event, IndicatorPlugin *indi
+   {
+     if( event->button == 1) /* left click only */
+     {
+-      GtkMenu * menu = GTK_MENU(g_object_get_data (G_OBJECT(widget),"menu"));
+-      gtk_menu_attach_to_widget(menu, widget, NULL);
+-      gtk_menu_popup (menu, NULL, NULL,
++      gtk_menu_popup (GTK_MENU(g_object_get_data (G_OBJECT(widget),"menu")), NULL, NULL,
+                       xfce_panel_plugin_position_menu,
+                       indicator->plugin, 1, gtk_get_current_event_time ());
+       
+@@ -234,7 +232,10 @@ entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_d
+     gtk_button_set_label(GTK_BUTTON(button), gtk_label_get_label (entry->label));
+ 
+   if (entry->menu != NULL)
++  {
+     g_object_set_data(G_OBJECT(button), "menu", entry->menu);
++    gtk_menu_attach_to_widget(entry->menu, button, NULL);
++  }
+ 
+   g_signal_connect(button, "button-press-event", G_CALLBACK(on_button_press),
+                    user_data);
+--
+cgit 

Added: goodies/trunk/xfce4-indicator-plugin/debian/patches/fix_menu_position.patch
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/patches/fix_menu_position.patch	                        (rev 0)
+++ goodies/trunk/xfce4-indicator-plugin/debian/patches/fix_menu_position.patch	2011-07-23 17:07:42 UTC (rev 5866)
@@ -0,0 +1,31 @@
+From 4c410464a89615547e959c0392c69c77add4eaf5 Mon Sep 17 00:00:00 2001
+From: Mark Trompell <mark at foresightlinux.org>
+Date: Tue, 19 Jul 2011 06:47:21 +0000
+Subject: fix menu position
+
+---
+diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
+index 1741a9c..4468a52 100644
+--- a/panel-plugin/indicator.c
++++ b/panel-plugin/indicator.c
+@@ -163,14 +163,12 @@ on_button_press (GtkWidget *widget, GdkEventButton *event, IndicatorPlugin *indi
+   {
+     if( event->button == 1) /* left click only */
+     {
+-      gtk_menu_popup (GTK_MENU(g_object_get_data (G_OBJECT(widget),"menu")), NULL,
+-                      NULL, NULL, NULL, 1, event->time);
+-      /* no approvement to the above */
+-      /*
+-      gtk_menu_popup (GTK_MENU(g_object_get_data (G_OBJECT(widget),"menu")), NULL, NULL,
++      GtkMenu * menu = GTK_MENU(g_object_get_data (G_OBJECT(widget),"menu"));
++      gtk_menu_attach_to_widget(menu, widget, NULL);
++      gtk_menu_popup (menu, NULL, NULL,
+                       xfce_panel_plugin_position_menu,
+                       indicator->plugin, 1, gtk_get_current_event_time ());
+-      */
++      
+       return TRUE;
+     }
+     /* event doesn't make it to the ebox, so I just push it. */
+--
+cgit 

Added: goodies/trunk/xfce4-indicator-plugin/debian/patches/potfiles.patch
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/patches/potfiles.patch	                        (rev 0)
+++ goodies/trunk/xfce4-indicator-plugin/debian/patches/potfiles.patch	2011-07-23 17:07:42 UTC (rev 5866)
@@ -0,0 +1,9 @@
+From: Evgeni Golov <evgeni at debian.org>
+Description: intltool is stupid, our .pc folder is NOT to be translated
+
+--- /dev/null	2011-07-21 17:20:44.495081617 +0200
++++ b/po/POTFILES.skip	2011-07-23 18:56:44.420569137 +0200
+@@ -0,0 +1,2 @@
++.pc/attach_button_to_menu_right_at_the_beginning.patch/panel-plugin/indicator.c
++.pc/fix_menu_position.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	2011-07-23 17:07:42 UTC (rev 5866)
@@ -0,0 +1,3 @@
+fix_menu_position.patch
+attach_button_to_menu_right_at_the_beginning.patch
+potfiles.patch