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

[corsac-guest at alioth.debian.org]

Author: corsac-guest
Date: 2007-12-05 23:29:55 +0000 (Wed, 05 Dec 2007)
New Revision: 1461

Modified:
   desktop/trunk/xfce4-mixer/debian/control
   desktop/trunk/xfce4-mixer/debian/patches/02_mixer-block-menu.patch
Log:
use correct patch, update my email


Modified: desktop/trunk/xfce4-mixer/debian/control
===================================================================
--- desktop/trunk/xfce4-mixer/debian/control	2007-12-05 22:59:07 UTC (rev 1460)
+++ desktop/trunk/xfce4-mixer/debian/control	2007-12-05 23:29:55 UTC (rev 1461)
@@ -2,7 +2,7 @@
 Section: x11
 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>
+Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: debhelper (>= 4.2.1-1), libgtk2.0-dev (>= 2.10.1-1), libxft-dev, xfce4-panel-dev (>= 4.4.2), libasound2-dev (>= 0.9.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml-parser-perl, chrpath, quilt, dpkg-dev (>= 1.14.4)
 Standards-Version: 3.7.3
 Homepage: http://www.xfce.org/

Modified: desktop/trunk/xfce4-mixer/debian/patches/02_mixer-block-menu.patch
===================================================================
--- desktop/trunk/xfce4-mixer/debian/patches/02_mixer-block-menu.patch	2007-12-05 22:59:07 UTC (rev 1460)
+++ desktop/trunk/xfce4-mixer/debian/patches/02_mixer-block-menu.patch	2007-12-05 23:29:55 UTC (rev 1461)
@@ -1,7 +1,7 @@
 Index: panel-plugin/plugin.c
 ===================================================================
---- panel-plugin/plugin.c	(révision 26127)
-+++ panel-plugin/plugin.c	(copie de travail)
+--- xfce4-mixer/panel-plugin/plugin.c	(révision 26127)
++++ xfce4-mixer/panel-plugin/plugin.c	(copie de travail)
 @@ -127,6 +127,8 @@
  {
      t_mixer *mixer = (t_mixer *) user_data;
@@ -26,34 +26,3 @@
                                            GTK_DIALOG_DESTROY_WITH_PARENT,
                                            GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, 
                                            NULL));
-@@ -438,6 +442,7 @@
- 	t_mixer *mixer;
- 	GdkPixbuf *pb;
- 	GtkWidget *align;
-+	static GtkWidget *box;
- 	
- 	mixer = g_new0 (t_mixer, 1);
- 
-@@ -463,6 +468,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), 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 +481,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",