r40885 - in /desktop/unstable/gnome-panel/debian: changelog patches/git_drop_startupnotify.patch patches/git_fix_moving_applets.patch patches/series

[mitya57-guest at users.alioth.debian.org]

Author: mitya57-guest
Date: Fri Mar 14 07:33:13 2014
New Revision: 40885

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40885
Log:
* Backport upstream patches to:
  - Fix moving applets in the panel (git_fix_moving_applets.patch);
  - Fix issues with startup (git_drop_startupnotify.patch).

Added:
    desktop/unstable/gnome-panel/debian/patches/git_drop_startupnotify.patch
Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/patches/git_fix_moving_applets.patch
    desktop/unstable/gnome-panel/debian/patches/series

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=40885&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog	[utf-8] Fri Mar 14 07:33:13 2014
@@ -1,9 +1,10 @@
 gnome-panel (3.8.0-3) UNRELEASED; urgency=low
 
-  * Add a patch (git_fix_moving_applets.patch) to fix moving applets
-    in the panel.
-
- -- Dmitry Shachnev <mitya57 at gmail.com>  Sat, 01 Mar 2014 12:53:17 +0400
+  * Backport upstream patches to:
+    - Fix moving applets in the panel (git_fix_moving_applets.patch);
+    - Fix issues with startup (git_drop_startupnotify.patch).
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Fri, 14 Mar 2014 11:22:44 +0400
 
 gnome-panel (3.8.0-2) unstable; urgency=low
 

Added: desktop/unstable/gnome-panel/debian/patches/git_drop_startupnotify.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/git_drop_startupnotify.patch?rev=40885&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/git_drop_startupnotify.patch	(added)
+++ desktop/unstable/gnome-panel/debian/patches/git_drop_startupnotify.patch	[utf-8] Fri Mar 14 07:33:13 2014
@@ -0,0 +1,24 @@
+Description: drop StartupNotify line to fix startup issues
+Origin: upstream, https://git.gnome.org/browse/gnome-panel/commit/?id=29e71752804d4a
+Last-Update: 2014-03-14
+
+--- a/gnome-panel/gnome-panel.desktop.in
++++ b/gnome-panel/gnome-panel.desktop.in
+@@ -4,7 +4,6 @@
+ _Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
+ Icon=gnome-panel
+ Exec=gnome-panel
+-StartupNotify=true
+ Terminal=false
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-panel
+--- a/gnome-panel/gnome-panel.desktop.in.in
++++ b/gnome-panel/gnome-panel.desktop.in.in
+@@ -4,7 +4,6 @@
+ _Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
+ Icon=gnome-panel
+ Exec=gnome-panel
+-StartupNotify=true
+ Terminal=false
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-panel

Modified: desktop/unstable/gnome-panel/debian/patches/git_fix_moving_applets.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/git_fix_moving_applets.patch?rev=40885&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/git_fix_moving_applets.patch	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/git_fix_moving_applets.patch	[utf-8] Fri Mar 14 07:33:13 2014
@@ -1,6 +1,6 @@
 Description: fix moving applets in panel
 Origin: upstream, https://git.gnome.org/browse/gnome-panel/commit/?id=d7d0efa55a26cc
-Last-Update: 2014-02-24
+Last-Update: 2014-03-14
 
 --- a/gnome-panel/applet.c
 +++ b/gnome-panel/applet.c
@@ -44,7 +44,7 @@
  	case GDK_KEY_Up:
 --- a/gnome-panel/panel-widget.c
 +++ b/gnome-panel/panel-widget.c
-@@ -1509,7 +1509,7 @@
+@@ -1517,7 +1517,7 @@
  {
  	GtkWidget       *widget;
  	GtkAllocation   allocation;
@@ -53,7 +53,7 @@
  	int             x,y;
  	int             w,h;
  
-@@ -1522,7 +1522,8 @@
+@@ -1530,7 +1530,8 @@
  	   !gtk_widget_get_visible(widget))
  		return FALSE;
  
@@ -63,7 +63,7 @@
  
  	gtk_widget_get_allocation (widget, &allocation);
  	w = allocation.width;
-@@ -1895,11 +1896,12 @@
+@@ -1903,11 +1904,12 @@
  {
  	int             x, y;
  	gboolean        rtl;
@@ -78,7 +78,7 @@
  	rtl = gtk_widget_get_direction (GTK_WIDGET (panel)) == GTK_TEXT_DIR_RTL;
  	
  	if (panel->orient == GTK_ORIENTATION_HORIZONTAL)
-@@ -2074,13 +2076,14 @@
+@@ -2082,13 +2084,14 @@
  	if(panel->currently_dragged_applet && repeat_if_outside) {
  		GtkWidget       *widget;
  		GtkAllocation   allocation;

Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=40885&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series	[utf-8] Fri Mar 14 07:33:13 2014
@@ -1,5 +1,6 @@
 git_build_with_gweather_39.patch
 git_fix_moving_applets.patch
+git_drop_startupnotify.patch
 01_gnome-wm.patch
 01_menus_rename.patch
 03_tasklist_orientation.patch