[Pkg-xfce-commits] r870 - in desktop/trunk/xfce4-mixer/debian: . patches

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2006-09-09 22:17:41 +0000 (Sat, 09 Sep 2006)
New Revision: 870

Added:
   desktop/trunk/xfce4-mixer/debian/patches/
   desktop/trunk/xfce4-mixer/debian/patches/01_xfce4-mixer-panel-plugin_border.patch
   desktop/trunk/xfce4-mixer/debian/patches/series
Modified:
   desktop/trunk/xfce4-mixer/debian/changelog
   desktop/trunk/xfce4-mixer/debian/control
   desktop/trunk/xfce4-mixer/debian/rules
Log:
use a correct width in the panel plugin


Modified: desktop/trunk/xfce4-mixer/debian/changelog
===================================================================
--- desktop/trunk/xfce4-mixer/debian/changelog	2006-09-09 13:12:06 UTC (rev 869)
+++ desktop/trunk/xfce4-mixer/debian/changelog	2006-09-09 22:17:41 UTC (rev 870)
@@ -2,8 +2,9 @@
 
   * New upstream release.
   * debian/control: updated build-dep against Xfce 4.4RC1 (4.3.99.1).
+  * Add a patch to use correct panel width. 
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Mon,  4 Sep 2006 17:57:25 +0200
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 10 Sep 2006 00:17:01 +0200
 
 xfce4-mixer (4.3.90.2-4) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-mixer/debian/control
===================================================================
--- desktop/trunk/xfce4-mixer/debian/control	2006-09-09 13:12:06 UTC (rev 869)
+++ desktop/trunk/xfce4-mixer/debian/control	2006-09-09 22:17:41 UTC (rev 870)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at corsac.net>
-Build-Depends: debhelper (>= 4.2.1-1), libgtk2.0-dev, libxft-dev, xfce4-panel-dev (>= 4.3.99.1), libasound2-dev (>= 0.9.0), libxml-parser-perl, chrpath
+Build-Depends: debhelper (>= 4.2.1-1), libgtk2.0-dev, libxft-dev, xfce4-panel-dev (>= 4.3.99.1), libasound2-dev (>= 0.9.0), libxml-parser-perl, chrpath, quilt
 Standards-Version: 3.7.2
 
 Package: xfce4-mixer

Added: desktop/trunk/xfce4-mixer/debian/patches/01_xfce4-mixer-panel-plugin_border.patch
===================================================================
--- desktop/trunk/xfce4-mixer/debian/patches/01_xfce4-mixer-panel-plugin_border.patch	                        (rev 0)
+++ desktop/trunk/xfce4-mixer/debian/patches/01_xfce4-mixer-panel-plugin_border.patch	2006-09-09 22:17:41 UTC (rev 870)
@@ -0,0 +1,57 @@
+Index: plugin.c
+===================================================================
+--- xfce4-mixer/panel-plugin/plugin.c	(révision 23116)
++++ xfce4-mixer/panel-plugin/plugin.c	(copie de travail)
+@@ -23,6 +23,7 @@
+ 
+ #define PLUGIN_NAME "xfce4-mixer-plugin"
+ #define MIXER_RC_GROUP "mixer-plugin"
++#define BORDER 8
+ 
+ /* Panel Plugin Interface */
+ static void mixer_construct (XfcePanelPlugin *plugin);
+@@ -65,11 +66,11 @@
+ 	if (orientation == GTK_ORIENTATION_VERTICAL) {
+ 		gtk_widget_set_size_request (GTK_WIDGET(plugin), size, size);
+ 		gtk_widget_set_size_request (GTK_WIDGET(mixer->ib), -1, -1);
+-		gtk_widget_set_size_request (GTK_WIDGET(mixer->slider), slider_width, -1);
++		gtk_widget_set_size_request (GTK_WIDGET(mixer->slider), BORDER, size - BORDER);
+ 	} else {
+ 		gtk_widget_set_size_request (GTK_WIDGET(plugin), -1, size);
+ 		gtk_widget_set_size_request (GTK_WIDGET(mixer->ib), size, -1);
+-		gtk_widget_set_size_request (GTK_WIDGET(mixer->slider), slider_width, -1);
++		gtk_widget_set_size_request (GTK_WIDGET(mixer->slider), BORDER, size - BORDER);
+ 	}
+ }
+ 
+@@ -438,6 +439,7 @@
+ 	t_mixer *mixer;
+ 	GdkPixbuf *pb;
+ 	GtkWidget *align;
++    static GtkWidget *box;
+ 	
+ 	mixer = g_new0 (t_mixer, 1);
+ 
+@@ -463,6 +465,12 @@
+ 
+ 	gtk_box_pack_start (GTK_BOX (mixer->box), GTK_WIDGET (mixer->ib), TRUE, TRUE, 0);
+ 
++    if (GTK_IS_WIDGET (box))
++        gtk_widget_destroy (box);
++    box = gtk_hbox_new (FALSE, 0);
++    gtk_container_set_border_width (GTK_CONTAINER (box), BORDER / 2);
++    gtk_widget_show (box);
++
+ 	mixer->slider = XFCE_MIXER_CONTROL (xfce_mixer_slider_tiny_new ());
+ 	g_signal_connect (
+ 		G_OBJECT (mixer->slider), "notify::value", 
+@@ -470,7 +478,8 @@
+ 	);
+ 	
+ 	gtk_widget_show (GTK_WIDGET (mixer->slider));
+-	gtk_box_pack_start (GTK_BOX (mixer->box), GTK_WIDGET (mixer->slider), FALSE, TRUE, 0);
++	gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (mixer->slider), FALSE, FALSE, 0);
++	gtk_box_pack_start (GTK_BOX (mixer->box), GTK_WIDGET (box), FALSE, FALSE, 0);
+ 		
+ 	g_signal_connect_swapped (
+ 		G_OBJECT (mixer->ib), "scroll-event", 

Added: desktop/trunk/xfce4-mixer/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-mixer/debian/patches/series	                        (rev 0)
+++ desktop/trunk/xfce4-mixer/debian/patches/series	2006-09-09 22:17:41 UTC (rev 870)
@@ -0,0 +1 @@
+01_xfce4-mixer-panel-plugin_border.patch

Modified: desktop/trunk/xfce4-mixer/debian/rules
===================================================================
--- desktop/trunk/xfce4-mixer/debian/rules	2006-09-09 13:12:06 UTC (rev 869)
+++ desktop/trunk/xfce4-mixer/debian/rules	2006-09-09 22:17:41 UTC (rev 870)
@@ -11,7 +11,18 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure
+patch: patch-stamp
+patch-stamp:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	touch patch-stamp
+
+unpatch:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -rf .pc patch-stamp
+
+config.status: configure patch-stamp
 	
 	dh_testdir
 
@@ -39,7 +50,7 @@
 	
 	touch build-stamp
 
-clean:
+clean: unpatch
 	
 	dh_testdir
 	dh_testroot
@@ -58,7 +69,7 @@
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
-	dh_clean
+	dh_clean $(CURDIR)/patch-stamp
 
 install: build