rpms/gnome-applets/FC-6 gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch, NONE, 1.1 gnome-applets.spec, 1.191, 1.192

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gnome-applets/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv14971

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch 
Log Message:
- fix mixer applet error on login for new users (bug 217919)


gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch:
 load.c |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 deletions(-)

--- NEW FILE gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch ---
--- 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;
 }
 


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/FC-6/gnome-applets.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- gnome-applets.spec	6 Nov 2006 21:05:41 -0000	1.191
+++ gnome-applets.spec	12 Dec 2006 20:34:34 -0000	1.192
@@ -33,7 +33,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.16.0.1
-Release:  	11%{?dist}
+Release:  	12%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -71,6 +71,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=356536
 Patch25: gnome-applets-2.16.0.1-keyboard-indicator-segfault.patch
 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217919
+Patch26: gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch
+
 URL:		http://www.gnome.org/
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -165,6 +168,7 @@
 %patch23 -p1 -b .desktop-clicks
 %patch24 -p1 -b .trash-icon-size
 %patch25 -p1 -b .keyboard-indicator-segfault
+%patch26 -p1 -b .delay-gstreamer-initialization
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -353,6 +357,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Tue Dec 12 2006 Ray Strode <rstrode at redhat.com> - 1:2.16.0.1-12
+- fix mixer applet error on login for new users (bug 217919)
+
 * Mon Nov  6 2006 Ray Strode <rstrode at redhat.com> - 1:2.16.0.1-11
 - s/verion/version/ in dbus-glib-devel build requires