diff options
| author | Ray Strode <rstrode@fedoraproject.org> | 2006-12-12 20:37:57 +0000 |
|---|---|---|
| committer | Ray Strode <rstrode@fedoraproject.org> | 2006-12-12 20:37:57 +0000 |
| commit | 80e604c56b09c7fd00d0f2c548b7d7020460d8d5 (patch) | |
| tree | c7a17def1c5675010af4e2a17f5c8b0d2c304dce | |
| parent | 7d410b2b957e2488a4329ddc4498df01eca78eac (diff) | |
| download | gnome-applets-80e604c56b09c7fd00d0f2c548b7d7020460d8d5.tar.gz gnome-applets-80e604c56b09c7fd00d0f2c548b7d7020460d8d5.tar.xz gnome-applets-80e604c56b09c7fd00d0f2c548b7d7020460d8d5.zip | |
- fix mixer applet error on login for new users (bug 217919)gnome-applets-2_16_2-5_fc7
| -rw-r--r-- | gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch | 57 | ||||
| -rw-r--r-- | gnome-applets.spec | 8 |
2 files changed, 64 insertions, 1 deletions
diff --git a/gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch b/gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch new file mode 100644 index 0000000..6704320 --- /dev/null +++ b/gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch @@ -0,0 +1,57 @@ +--- gnome-applets-2.16.0.1/mixer/load.c.delay-gstreamer-initialization 2006-12-12 15:20:06.000000000 -0500 ++++ gnome-applets-2.16.0.1/mixer/load.c 2006-12-12 15:29:08.000000000 -0500 +@@ -25,7 +25,7 @@ + + #include <string.h> + +-#include <glib/glist.h> ++#include <glib.h> + #ifdef HAVE_GST10 + #include <gst/audio/mixerutils.h> + #else +@@ -293,21 +293,41 @@ + #endif + + static gboolean +-gnome_volume_applet_factory (PanelApplet *applet, +- const gchar *iid, +- gpointer data) ++gnome_volume_applet_toplevel_configure_handler (GtkWidget *widget, ++ GdkEventConfigure *event, ++ gpointer data) + { + GList *elements; + static gboolean init = FALSE; + ++ g_signal_handlers_disconnect_by_func (widget, ++ gnome_volume_applet_toplevel_configure_handler, ++ data); ++ + if (!init) { + gst_init (NULL, NULL); + init = TRUE; + } + + elements = create_mixer_collection (); +- gnome_volume_applet_setup (GNOME_VOLUME_APPLET (applet), elements); ++ gnome_volume_applet_setup (GNOME_VOLUME_APPLET (data), elements); ++ ++ return FALSE; ++} + ++static gboolean ++gnome_volume_applet_factory (PanelApplet *applet, ++ const gchar *iid, ++ gpointer data) ++{ ++ /* we delay applet specific initialization until the applet ++ * is fully registered with the panel since gst_init() can block ++ * for longer than the service activation timeouts ++ */ ++ g_signal_connect (gtk_widget_get_toplevel (GTK_WIDGET (applet)), ++ "configure-event", ++ G_CALLBACK (gnome_volume_applet_toplevel_configure_handler), ++ applet); + return TRUE; + } + diff --git a/gnome-applets.spec b/gnome-applets.spec index f0dfcb4..3e97e1f 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -33,7 +33,7 @@ Summary: Small applications for the GNOME panel Name: gnome-applets Version: 2.16.2 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 License: GPL Group: User Interface/Desktops @@ -65,6 +65,8 @@ Patch27: gnome-applets-2.16.1-desktop-files.patch # http://bugzilla.gnome.org/show_bug.cgi?id=382774 Patch28: gnome-applets-2.16.2-trash-screen.patch +# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217919 +Patch29: gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} @@ -158,6 +160,7 @@ small utilities for the GNOME panel. %patch27 -p1 -b .desktop-files %patch28 -p1 -b .trash-screen +%patch29 -p1 -b .delay-gstreamer-initialization cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png @@ -344,6 +347,9 @@ fi %{_libdir}/pkgconfig/gweather.pc %changelog +* Tue Dec 12 2006 Ray Strode <rstrode@redhat.com> - 1:2.16.2-5 +- fix mixer applet error on login for new users (bug 217919) + * Sat Dec 9 2006 Matthias Clasen <mclasen@redhat.com> - 1:2.16.2-4 - Small spec file cleanups |