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

[corsac-guest at alioth.debian.org]

Author: corsac-guest
Date: 2007-12-05 22:59:07 +0000 (Wed, 05 Dec 2007)
New Revision: 1460

Added:
   desktop/trunk/xfce4-mixer/debian/patches/02_mixer-block-menu.patch
Modified:
   desktop/trunk/xfce4-mixer/debian/changelog
   desktop/trunk/xfce4-mixer/debian/control
   desktop/trunk/xfce4-mixer/debian/patches/series
Log:
block properties menu when first opened


Modified: desktop/trunk/xfce4-mixer/debian/changelog
===================================================================
--- desktop/trunk/xfce4-mixer/debian/changelog	2007-12-05 22:41:28 UTC (rev 1459)
+++ desktop/trunk/xfce4-mixer/debian/changelog	2007-12-05 22:59:07 UTC (rev 1460)
@@ -1,3 +1,11 @@
+xfce4-mixer (4.4.2-2) UNRELEASED; urgency=low
+
+  * debian/control: updated standard versions to 3.7.3.
+  * debian/patches:
+    - 02_mixer-block-menu added, don't fail when opening properties twice.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 05 Dec 2007 23:54:52 +0100
+
 xfce4-mixer (4.4.2-1) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: desktop/trunk/xfce4-mixer/debian/control
===================================================================
--- desktop/trunk/xfce4-mixer/debian/control	2007-12-05 22:41:28 UTC (rev 1459)
+++ desktop/trunk/xfce4-mixer/debian/control	2007-12-05 22:59:07 UTC (rev 1460)
@@ -4,7 +4,7 @@
 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 (>= 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.2
+Standards-Version: 3.7.3
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-mixer/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-mixer/

Added: desktop/trunk/xfce4-mixer/debian/patches/02_mixer-block-menu.patch
===================================================================
--- desktop/trunk/xfce4-mixer/debian/patches/02_mixer-block-menu.patch	                        (rev 0)
+++ desktop/trunk/xfce4-mixer/debian/patches/02_mixer-block-menu.patch	2007-12-05 22:59:07 UTC (rev 1460)
@@ -0,0 +1,59 @@
+Index: panel-plugin/plugin.c
+===================================================================
+--- panel-plugin/plugin.c	(révision 26127)
++++ panel-plugin/plugin.c	(copie de travail)
+@@ -127,6 +127,8 @@
+ {
+     t_mixer *mixer = (t_mixer *) user_data;
+ 
++    xfce_panel_plugin_unblock_menu (mixer->temp_plugin);
++
+     xfce_mixer_prefbox_save_preferences (mixer->prefbox, mixer->prefs);
+  
+     mixer_write_config(mixer->temp_plugin, mixer);
+@@ -149,11 +151,13 @@
+ 
+     mixer = (t_mixer *) user_data;
+     
++    xfce_panel_plugin_block_menu (plugin);
++
+     /* TODO TRANSLATE TITLE OR SOMETHING */
+ 
+     dialog = GTK_DIALOG (
+              gtk_dialog_new_with_buttons (xfce_panel_plugin_get_name (plugin), 
+-                                          GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(plugin))), 
++                                          NULL, 
+                                           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", 

Modified: desktop/trunk/xfce4-mixer/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-mixer/debian/patches/series	2007-12-05 22:41:28 UTC (rev 1459)
+++ desktop/trunk/xfce4-mixer/debian/patches/series	2007-12-05 22:59:07 UTC (rev 1460)
@@ -1 +1,2 @@
 01_xfce4-mixer-panel-plugin_border.patch
+02_mixer-block-menu.patch