summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@fedoraproject.org>2008-08-08 17:53:54 +0000
committerMatthias Clasen <mclasen@fedoraproject.org>2008-08-08 17:53:54 +0000
commit26a2bf3d95098c3711d7368c06bb954f2c32ad6d (patch)
tree867566d5c1bde0ee7dcc0972932ec48cc8d53965
parentc67f1bc70f165286dbe067c5483b393440e5cb7f (diff)
downloadgnome-applets-26a2bf3d95098c3711d7368c06bb954f2c32ad6d.tar.gz
gnome-applets-26a2bf3d95098c3711d7368c06bb954f2c32ad6d.tar.xz
gnome-applets-26a2bf3d95098c3711d7368c06bb954f2c32ad6d.zip
fix the mixer popup a bitgnome-applets-2_23_4-2_fc10
-rw-r--r--gnome-applets.spec9
-rw-r--r--undecorate-mixer.patch22
2 files changed, 30 insertions, 1 deletions
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3e93860..712343d 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
Version: 2.23.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -64,6 +64,9 @@ Patch39: gweather-network.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
+# backport from upstream svn
+Patch46: undecorate-mixer.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -149,6 +152,7 @@ small utilities for the GNOME panel.
%patch33 -p1 -b .node-leak
%patch39 -p1 -b .gweather-network
%patch40 -p1 -b .battstat-null
+%patch46 -p1 -b .undecorate-mixer
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -308,6 +312,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Fri Aug 8 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.23.4-2
+- Undecorate the mixer popup
+
* Mon Aug 4 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.23.4-1
- Update to 2.23.4
diff --git a/undecorate-mixer.patch b/undecorate-mixer.patch
new file mode 100644
index 0000000..d503531
--- /dev/null
+++ b/undecorate-mixer.patch
@@ -0,0 +1,22 @@
+diff -up gnome-applets-2.23.4/mixer/dock.c.undecorate-mixer gnome-applets-2.23.4/mixer/dock.c
+--- gnome-applets-2.23.4/mixer/dock.c.undecorate-mixer 2008-08-08 13:29:10.000000000 -0400
++++ gnome-applets-2.23.4/mixer/dock.c 2008-08-08 13:29:19.000000000 -0400
+@@ -68,11 +68,16 @@ gnome_volume_applet_dock_init (GnomeVolu
+ dock->timeout = 0;
+
+ /* We can't use a simple GDK_WINDOW_TYPE_HINT_DOCK here since
+- * the dock windows don't accept input by default. Instead we use the
+- * popup-menu type as a base. */
++ * the dock windows don't accept input by default. Instead we use
++ * the popup menu type. In the end we set everything by hand anyway
++ * since what happens depends very heavily on the window manager. */
+ gtk_window_set_type_hint (GTK_WINDOW (dock),
+ GDK_WINDOW_TYPE_HINT_POPUP_MENU);
+ gtk_window_set_keep_above (GTK_WINDOW (dock), TRUE);
++ gtk_window_set_decorated (GTK_WINDOW (dock), FALSE);
++ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dock), TRUE);
++ gtk_window_set_skip_pager_hint (GTK_WINDOW (dock), TRUE);
++ gtk_window_set_resizable (GTK_WINDOW (dock), FALSE);
+ gtk_window_stick (GTK_WINDOW (dock));
+ }
+