rpms/gnome-applets/devel gnome-applets-2.13.90-mixer-crash.patch, 1.1, 1.2 gnome-applets.spec, 1.121, 1.122
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Mar 8 16:27:23 UTC 2006
Author: rstrode
Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15736
Modified Files:
gnome-applets-2.13.90-mixer-crash.patch gnome-applets.spec
Log Message:
- update mclasen's patch to add set_data_full in a few places
gnome-applets-2.13.90-mixer-crash.patch:
load.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
Index: gnome-applets-2.13.90-mixer-crash.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets-2.13.90-mixer-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-applets-2.13.90-mixer-crash.patch 8 Mar 2006 15:43:25 -0000 1.1
+++ gnome-applets-2.13.90-mixer-crash.patch 8 Mar 2006 16:27:21 -0000 1.2
@@ -1,13 +1,25 @@
---- gnome-applets-2.13.90/mixer/applet.c.mixer-crash 2006-03-08 10:20:20.000000000 -0500
-+++ gnome-applets-2.13.90/mixer/applet.c 2006-03-08 10:21:24.000000000 -0500
-@@ -471,8 +471,8 @@
- GstElement *element = GST_ELEMENT (item->data);
+--- gnome-applets-2.13.90/mixer/load.c.mixer-crash 2006-03-08 11:00:49.000000000 -0500
++++ gnome-applets-2.13.90/mixer/load.c 2006-03-08 11:05:45.000000000 -0500
+@@ -247,16 +246,16 @@ create_mixer_collection (void)
+ /* name already exists, so append a number to make it unique */
+ tname = g_strdup_printf ("%s #%d", name, samenamenr + 1);
+- g_object_set_data (G_OBJECT (element), "gnome-volume-applet-origname",
+- name);
++ g_object_set_data_full (G_OBJECT (element), "gnome-volume-applet-origname",
++ name, (GDestroyNotify) g_free);
+ name = tname;
+ } else {
+- g_object_set_data (G_OBJECT (element), "gnome-volume-applet-origname",
+- name);
++ g_object_set_data_full (G_OBJECT (element), "gnome-volume-applet-origname",
++ name, (GDestroyNotify) g_free);
+ }
+
+- g_object_set_data (G_OBJECT (element), "gnome-volume-applet-name",
+- name);
++ g_object_set_data_full (G_OBJECT (element), "gnome-volume-applet-name",
++ name, (GDestroyNotify) g_free);
+
+ /* add to list */
gst_element_set_state (element, GST_STATE_NULL);
-- g_free (g_object_get_data (G_OBJECT (element),
-- "gnome-volume-applet-name"));
-+ g_object_set_data (G_OBJECT (element),
-+ "gnome-volume-applet-name", NULL);
- gst_object_unref (GST_OBJECT (element));
- }
- g_list_free (applet->elements);
Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- gnome-applets.spec 8 Mar 2006 15:43:25 -0000 1.121
+++ gnome-applets.spec 8 Mar 2006 16:27:21 -0000 1.122
@@ -30,7 +30,6 @@
Patch4: gnome-applets-2.11.1-cpufreq.patch
Patch5: gnome-applets-2.13.4-warning.patch
Patch6: gnome-applets-2.13.90-stock-ticker.patch
-Patch7: gnome-applets-2.13.90-ref-mixer-elements.patch
Patch8: gnome-applets-2.13.90-mixer-crash.patch
URL: http://www.gnome.org/
@@ -88,7 +87,6 @@
%patch4 -p1 -b .cpufreq
%patch5 -p1 -b .warning
%patch6 -p1 -b .stock-ticker
-%patch7 -p1 -b .ref-mixer-elements
%patch8 -p1 -b .mixer-crash
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
More information about the fedora-cvs-commits
mailing list