Hello community,
here is the log from the commit of package gnome-applets
checked in at Wed Nov 15 00:46:44 CET 2006.
--------
--- GNOME/gnome-applets/gnome-applets.changes 2006-10-31 19:08:38.000000000 +0100
+++ /mounts/work_src_done/STABLE/gnome-applets/gnome-applets.changes 2006-11-14 19:08:59.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Nov 14 19:04:18 CET 2006 - jhargadon@suse.de
+
+- commented out the section in patch gnome-applets-in-proc.patch
+ that deals with mixer. This was done so that the mixer is not
+ inproc. This is a temporary fix for bug #218285.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-applets.spec ++++++
--- /var/tmp/diff_new_pack.U9rRec/_old 2006-11-15 00:45:20.000000000 +0100
+++ /var/tmp/diff_new_pack.U9rRec/_new 2006-11-15 00:45:20.000000000 +0100
@@ -17,7 +17,7 @@
%endif
%define prefix /opt/gnome
%define sysconfdir /etc%{prefix}
-License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/GUI/GNOME
Provides: gnome-applets2 gswitchit
Obsoletes: gnome-applets2 gswitchit
@@ -27,7 +27,7 @@
%endif
Autoreqprov: on
Version: 2.16.1
-Release: 18
+Release: 26
Summary: A Collection of Useful Programs for the GNOME 2.x Desktop Panel
Source: %{name}-%{version}.tar.bz2
Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2
@@ -236,7 +236,7 @@
%{prefix}/share/xmodmap
%{prefix}/%{_lib}/libgweather.so
%{prefix}/%{_lib}/*.so.*
-%{prefix}/%{_lib}/libmixer_applet2.so
+#%{prefix}/%{_lib}/libmixer_applet2.so
%{prefix}/%{_lib}/libmultiload-applet-2.so
%{prefix}/share/applications/gswitchit-plugins.desktop
%dir %{prefix}/share/locale/es_CL
@@ -256,6 +256,10 @@
%{prefix}/%_lib/pkgconfig/*.pc
%changelog -n gnome-applets
+* Tue Nov 14 2006 - jhargadon@suse.de
+- commented out the section in patch gnome-applets-in-proc.patch
+ that deals with mixer. This was done so that the mixer is not
+ inproc. This is a temporary fix for bug #218285.
* Tue Oct 31 2006 - jhargadon@suse.de
- added --enable-mini-commander as a configure option in the
specfile to add the mini-commandline applet (#216537)
++++++ gnome-applets-in-proc.patch ++++++
--- /var/tmp/diff_new_pack.U9rRec/_old 2006-11-15 00:45:20.000000000 +0100
+++ /var/tmp/diff_new_pack.U9rRec/_new 2006-11-15 00:45:20.000000000 +0100
@@ -1,137 +1,142 @@
---- mixer/GNOME_MixerApplet.server.in.in
-+++ mixer/GNOME_MixerApplet.server.in.in
-@@ -1,8 +1,8 @@
-
-
-
-+ type="shlib"
-+ location="@LIBDIR@/libmixer_applet2.so">
-
-
- <item value="IDL:Bonobo/GenericFactory:1.0"/>
---- mixer/Makefile.am
-+++ mixer/Makefile.am
-@@ -8,9 +8,9 @@
- $(GNOME_APPLETS_CFLAGS) \
- $(GNOMEDESKTOP_CFLAGS)
-
--libexec_PROGRAMS = mixer_applet2
-+lib_LTLIBRARIES = libmixer_applet2.la
-
--mixer_applet2_SOURCES = \
-+libmixer_applet2_la_SOURCES = \
- applet.c \
- dock.c \
- load.c \
-@@ -22,7 +22,7 @@
- keys.h \
- preferences.h
-
--mixer_applet2_LDADD = \
-+libmixer_applet2_la_LIBADD = \
- $(MIXER_LIBS) \
- $(GNOME_APPLETS_LIBS) \
- $(GNOMEDESKTOP_LIBS)
-@@ -32,7 +32,7 @@
- server_DATA = $(server_in_files:.server.in=.server)
-
- $(server_in_files): $(server_in_files:.server.in=.server.in.in)
-- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-+ sed -e "s|\@LIBDIR\@|$(libdir)|" $< > $@
-
- @INTLTOOL_SERVER_RULE@
-
---- mixer/applet.c
-+++ mixer/applet.c
-@@ -50,6 +50,8 @@
- #include "keys.h"
- #include "preferences.h"
-
-+#include
-+
- #define IS_PANEL_HORIZONTAL(o) \
- (o == PANEL_APPLET_ORIENT_UP || o == PANEL_APPLET_ORIENT_DOWN)
-
-@@ -214,7 +216,6 @@
- applet->image = GTK_IMAGE (image);
- gtk_container_add (GTK_CONTAINER (applet), image);
- gtk_widget_show (image);
-- gtk_window_set_default_icon_name ("multimedia-volume-control");
-
- /* dock window (expanded UI) */
- applet->pop = FALSE;
-@@ -393,6 +394,7 @@
- gchar *key;
- gchar *active_element_name;
- gchar *active_track_name;
-+ char *oldtextdomain;
- GstMixerTrack *first_track;
- gboolean res;
-
-@@ -430,10 +432,14 @@
- }
-
- /* menu - done here because bonobo is intialized now */
-+ oldtextdomain = strdup (textdomain (NULL));
-+ textdomain (GETTEXT_PACKAGE);
- panel_applet_setup_menu_from_file (PANEL_APPLET (applet),
- DATADIR,
- "GNOME_MixerApplet.xml",
- NULL, verbs, applet);
-+ textdomain (oldtextdomain);
-+ free (oldtextdomain);
- component = panel_applet_get_popup_component (PANEL_APPLET (applet));
- g_signal_connect (component, "ui-event", G_CALLBACK (cb_ui_event), applet);
-
---- mixer/dock.c
-+++ mixer/dock.c
-@@ -36,6 +36,8 @@
-
- #include "dock.h"
-
-+#include
-+
- static void gnome_volume_applet_dock_class_init (GnomeVolumeAppletDockClass *klass);
- static void gnome_volume_applet_dock_init (GnomeVolumeAppletDock *applet);
- static void gnome_volume_applet_dock_dispose (GObject *object);
---- mixer/load.c
-+++ mixer/load.c
-@@ -34,6 +34,9 @@
-
- #include "applet.h"
-
-+#include
-+
-+
- #ifdef HAVE_GST10
- typedef struct _FilterHelper {
- GList *names_list;
-@@ -311,11 +314,10 @@
- return TRUE;
- }
-
--PANEL_APPLET_BONOBO_FACTORY (
-+PANEL_APPLET_BONOBO_SHLIB_FACTORY (
- "OAFIID:GNOME_MixerApplet_Factory",
- GNOME_TYPE_VOLUME_APPLET,
- "mixer_applet2",
-- "0",
- gnome_volume_applet_factory,
- NULL
- )
---- mixer/preferences.c
-+++ mixer/preferences.c
-@@ -51,6 +51,8 @@
- #include "preferences.h"
- #include "keys.h"
-
-+#include
-+
- enum {
- COL_LABEL,
- COL_TRACK,
+#
+# Commenting out mixer/* portion of the patch as a temporary
+# fix for bug #21885 so that the mixer will not crash the
+# whole gnome-panel.
+#
+#--- mixer/GNOME_MixerApplet.server.in.in
+#+++ mixer/GNOME_MixerApplet.server.in.in
+#@@ -1,8 +1,8 @@
+#
+#
+#
+#+ type="shlib"
+#+ location="@LIBDIR@/libmixer_applet2.so">
+#
+#
+# <item value="IDL:Bonobo/GenericFactory:1.0"/>
+#--- mixer/Makefile.am
+#+++ mixer/Makefile.am
+#@@ -8,9 +8,9 @@
+# $(GNOME_APPLETS_CFLAGS) \
+# $(GNOMEDESKTOP_CFLAGS)
+#
+#-libexec_PROGRAMS = mixer_applet2
+#+lib_LTLIBRARIES = libmixer_applet2.la
+#
+#-mixer_applet2_SOURCES = \
+#+libmixer_applet2_la_SOURCES = \
+# applet.c \
+# dock.c \
+# load.c \
+#@@ -22,7 +22,7 @@
+# keys.h \
+# preferences.h
+#
+#-mixer_applet2_LDADD = \
+#+libmixer_applet2_la_LIBADD = \
+# $(MIXER_LIBS) \
+# $(GNOME_APPLETS_LIBS) \
+# $(GNOMEDESKTOP_LIBS)
+#@@ -32,7 +32,7 @@
+# server_DATA = $(server_in_files:.server.in=.server)
+#
+# $(server_in_files): $(server_in_files:.server.in=.server.in.in)
+#- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+#+ sed -e "s|\@LIBDIR\@|$(libdir)|" $< > $@
+#
+# @INTLTOOL_SERVER_RULE@
+#
+#--- mixer/applet.c
+#+++ mixer/applet.c
+#@@ -50,6 +50,8 @@
+# #include "keys.h"
+# #include "preferences.h"
+#
+#+#include
+#+
+# #define IS_PANEL_HORIZONTAL(o) \
+# (o == PANEL_APPLET_ORIENT_UP || o == PANEL_APPLET_ORIENT_DOWN)
+#
+#@@ -214,7 +216,6 @@
+# applet->image = GTK_IMAGE (image);
+# gtk_container_add (GTK_CONTAINER (applet), image);
+# gtk_widget_show (image);
+#- gtk_window_set_default_icon_name ("multimedia-volume-control");
+#
+# /* dock window (expanded UI) */
+# applet->pop = FALSE;
+#@@ -393,6 +394,7 @@
+# gchar *key;
+# gchar *active_element_name;
+# gchar *active_track_name;
+#+ char *oldtextdomain;
+# GstMixerTrack *first_track;
+# gboolean res;
+#
+#@@ -430,10 +432,14 @@
+# }
+#
+# /* menu - done here because bonobo is intialized now */
+#+ oldtextdomain = strdup (textdomain (NULL));
+#+ textdomain (GETTEXT_PACKAGE);
+# panel_applet_setup_menu_from_file (PANEL_APPLET (applet),
+# DATADIR,
+# "GNOME_MixerApplet.xml",
+# NULL, verbs, applet);
+#+ textdomain (oldtextdomain);
+#+ free (oldtextdomain);
+# component = panel_applet_get_popup_component (PANEL_APPLET (applet));
+# g_signal_connect (component, "ui-event", G_CALLBACK (cb_ui_event), applet);
+#
+#--- mixer/dock.c
+#+++ mixer/dock.c
+#@@ -36,6 +36,8 @@
+#
+# #include "dock.h"
+#
+#+#include
+#+
+# static void gnome_volume_applet_dock_class_init (GnomeVolumeAppletDockClass *klass);
+# static void gnome_volume_applet_dock_init (GnomeVolumeAppletDock *applet);
+## static void gnome_volume_applet_dock_dispose (GObject *object);
+##--- mixer/load.c
+#+++ mixer/load.c
+#@@ -34,6 +34,9 @@
+#
+# #include "applet.h"
+#
+#+#include
+#+
+#+
+# #ifdef HAVE_GST10
+# typedef struct _FilterHelper {
+# GList *names_list;
+#@@ -311,11 +314,10 @@
+# return TRUE;
+# }
+#
+#-PANEL_APPLET_BONOBO_FACTORY (
+#+PANEL_APPLET_BONOBO_SHLIB_FACTORY (
+# "OAFIID:GNOME_MixerApplet_Factory",
+# GNOME_TYPE_VOLUME_APPLET,
+# "mixer_applet2",
+#- "0",
+# gnome_volume_applet_factory,
+# NULL
+# )
+#--- mixer/preferences.c
+#+++ mixer/preferences.c
+#@@ -51,6 +51,8 @@
+# #include "preferences.h"
+# #include "keys.h"
+#
+#+#include
+#+
+# enum {
+# COL_LABEL,
+# COL_TRACK,
--- multiload/GNOME_MultiLoadApplet_Factory.server.in.in
+++ multiload/GNOME_MultiLoadApplet_Factory.server.in.in
@@ -2,8 +2,8 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org