Hello community,
here is the log from the commit of package gnome-applets
checked in at Mon Apr 24 16:01:06 CEST 2006.
--------
--- GNOME/gnome-applets/gnome-applets.changes 2006-04-10 13:57:07.000000000 +0200
+++ STABLE/gnome-applets/gnome-applets.changes 2006-04-24 14:36:38.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 24 14:15:56 CEST 2006 - jpr@suse.de
+
+- Don't have battstat be inproc, we rarely use it now
+- Fix missing symbol in battstat (the root cause of #165471)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-applets.spec ++++++
--- /var/tmp/diff_new_pack.Zw8ir3/_old 2006-04-24 15:57:58.000000000 +0200
+++ /var/tmp/diff_new_pack.Zw8ir3/_new 2006-04-24 15:57:58.000000000 +0200
@@ -27,7 +27,7 @@
%endif
Autoreqprov: on
Version: 2.12.2
-Release: 40
+Release: 46
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
@@ -252,7 +252,6 @@
%{prefix}/share/icons/hicolor/48x48/apps/*.png
%{prefix}/share/xmodmap
%{prefix}/%{_lib}/*.so.*
-%{prefix}/%{_lib}/libbattstat-applet-2.so
%{prefix}/%{_lib}/libmixer_applet2.so
%{prefix}/%{_lib}/libmultiload-applet-2.so
@@ -262,6 +261,9 @@
%{prefix}/%_lib/pkgconfig/*.pc
%changelog -n gnome-applets
+* Mon Apr 24 2006 - jpr@suse.de
+- Don't have battstat be inproc, we rarely use it now
+- Fix missing symbol in battstat (the root cause of #165471)
* Mon Apr 10 2006 - ihno@suse.de
- remove gnome-media dependency for s390x
* Sat Apr 08 2006 - aj@suse.de
++++++ gnome-applets-battstat_applet.patch ++++++
--- /var/tmp/diff_new_pack.Zw8ir3/_old 2006-04-24 15:57:59.000000000 +0200
+++ /var/tmp/diff_new_pack.Zw8ir3/_new 2006-04-24 15:57:59.000000000 +0200
@@ -1,28 +1,31 @@
--- battstat/battstat_applet.c
+++ battstat/battstat_applet.c
-@@ -512,13 +512,18 @@
+@@ -512,14 +512,20 @@
gtk_widget_set_size_request( GTK_WIDGET( battstat->battery_low_label ),
size.width, size.height );
-- remaining = g_strdup_printf( dngettext(GETTEXT_PACKAGE,
+- remaining = g_strdup_printf( ngettext(
- "You have %d minute of battery power "
- "remaining (%d%% of the total capacity).",
- "You have %d minutes of battery power "
- "remaining (%d%% of the total capacity).",
- info->minutes ),
- info->minutes,info->percent );
+-
+ if( info->minutes >= 0 )
-+ remaining = g_strdup_printf( dngettext(GETTEXT_PACKAGE,
-+ "You have %d minute of battery power "
++ remaining = g_strdup_printf( dngettext(GETTEXT_PACKAGE,
++ "You have %d minute of battery power "
+ "remaining (%d%% of the total capacity).",
-+ "You have %d minutes of battery power "
++ "You have %d minutes of battery power "
+ "remaining (%d%% of the total capacity).",
-+ info->minutes ),
-+ info->minutes,info->percent );
++ info->minutes ),
++ info->minutes, info->percent );
++
+ else
-+ remaining = g_strdup_printf( _("You have an unknown amount of battery power "
-+ "remaining (%d%% of the total capacity)."),
-+ info->percent );
-
++ remaining = g_strdup_printf( _("You have an unknown amount of battery power "
++ "remaining (%d%% of the total capacity)."),
++ info->percent );
++
new_label = g_strdup_printf (
"%s</span>\n\n%s\n\n%s",
+ _("Your battery is running low"),
++++++ gnome-applets-in-proc.patch ++++++
--- /var/tmp/diff_new_pack.Zw8ir3/_old 2006-04-24 15:57:59.000000000 +0200
+++ /var/tmp/diff_new_pack.Zw8ir3/_new 2006-04-24 15:57:59.000000000 +0200
@@ -1,194 +1,3 @@
---- battstat/GNOME_BattstatApplet.server.in.in
-+++ battstat/GNOME_BattstatApplet.server.in.in
-@@ -1,8 +1,8 @@
-
-
-
-+ type="shlib"
-+ location="@LIBDIR@/libbattstat-applet-2.so">
-
-
- <item value="IDL:Bonobo/GenericFactory:1.0"/>
---- battstat/Makefile.am
-+++ battstat/Makefile.am
-@@ -33,10 +33,10 @@
- -DG_LOG_DOMAIN=\"battstat_applet\"
-
-
--libexec_PROGRAMS = battstat-applet-2
-+lib_LTLIBRARIES = libbattstat-applet-2.la
-
-
--battstat_applet_2_SOURCES = \
-+libbattstat_applet_2_la_SOURCES = \
- battstat.h \
- pixmaps.h \
- properties.c \
-@@ -50,7 +50,7 @@
- battstat-hal.h
-
-
--battstat_applet_2_LDADD = \
-+libbattstat_applet_2_la_LIBADD = \
- $(GNOME_APPLETS_LIBS) \
- $(LIBGLADE_LIBS) \
- $(LIBNOTIFY_LIBS) \
-@@ -73,7 +73,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)|" $< > $@
-
- CLEANFILES = $(server_in_files) $(server_DATA) $(schemas_DATA)
-
---- battstat/battstat_applet.c
-+++ battstat/battstat_applet.c
-@@ -49,6 +49,8 @@
- #include "battstat.h"
- #include "pixmaps.h"
-
-+#include
-+
- #ifndef gettext_noop
- #define gettext_noop(String) (String)
- #endif
-@@ -344,23 +346,23 @@
- else
- if (hours == 0)
- if (!info->on_ac_power)
-- return g_strdup_printf (ngettext (
-+ return g_strdup_printf (dngettext (GETTEXT_PACKAGE,
- "%d minute (%d%%) remaining",
- "%d minutes (%d%%) remaining",
- mins), mins, info->percent);
- else
-- return g_strdup_printf (ngettext (
-+ return g_strdup_printf (dngettext (GETTEXT_PACKAGE,
- "%d minute until charged (%d%%)",
- "%d minutes until charged (%d%%)",
- mins), mins, info->percent);
- else if (mins == 0)
- if (!info->on_ac_power)
-- return g_strdup_printf (ngettext (
-+ return g_strdup_printf (dngettext (GETTEXT_PACKAGE,
- "%d hour (%d%%) remaining",
- "%d hours (%d%%) remaining",
- hours), hours, info->percent);
- else
-- return g_strdup_printf (ngettext (
-+ return g_strdup_printf (dngettext (GETTEXT_PACKAGE,
- "%d hour until charged (%d%%)",
- "%d hours until charged (%d%%)",
- hours), hours, info->percent);
-@@ -369,15 +371,15 @@
- /* TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
- * Swap order with "%2$s %2$d %1$s %1$d if needed */
- return g_strdup_printf (_("%d %s %d %s (%d%%) remaining"),
-- hours, ngettext ("hour", "hours", hours),
-- mins, ngettext ("minute", "minutes", mins),
-+ hours, dngettext (GETTEXT_PACKAGE, "hour", "hours", hours),
-+ mins, dngettext (GETTEXT_PACKAGE, "minute", "minutes", mins),
- info->percent);
- else
- /* TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
- * Swap order with "%2$s %2$d %1$s %1$d if needed */
- return g_strdup_printf (_("%d %s %d %s until charged (%d%%)"),
-- hours, ngettext ("hour", "hours", hours),
-- mins, ngettext ("minute", "minutes", mins),
-+ hours, dngettext (GETTEXT_PACKAGE, "hour", "hours", hours),
-+ mins, dngettext (GETTEXT_PACKAGE, "minute", "minutes", mins),
- info->percent);
- }
-
-@@ -512,7 +514,7 @@
- gtk_widget_set_size_request( GTK_WIDGET( battstat->battery_low_label ),
- size.width, size.height );
-
-- remaining = g_strdup_printf( ngettext(
-+ remaining = g_strdup_printf( dngettext(GETTEXT_PACKAGE,
- "You have %d minute of battery power "
- "remaining (%d%% of the total capacity).",
- "You have %d minutes of battery power "
-@@ -1533,6 +1535,7 @@
- AtkObject *atk_widget;
- const char *err;
- int no_hal;
-+ char *oldtextdomain;
-
- if (DEBUG) g_print("main()\n");
-
-@@ -1541,8 +1544,6 @@
- if( (err = static_global_initialisation( no_hal )) )
- battstat_error_dialog( GTK_WIDGET (applet), err );
-
-- gtk_window_set_default_icon_name ("gnome-dev-battery");
--
- panel_applet_add_preferences (applet, "/schemas/apps/battstat-applet/prefs",
- NULL);
- panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
-@@ -1572,12 +1573,16 @@
-
- battstat->pixtimer = gtk_timeout_add (1000, check_for_updates, battstat);
-
-+ oldtextdomain = strdup (textdomain (NULL));
-+ textdomain (GETTEXT_PACKAGE);
- panel_applet_setup_menu_from_file (PANEL_APPLET (battstat->applet),
- DATADIR,
- "GNOME_BattstatApplet.xml",
- NULL,
- battstat_menu_verbs,
- battstat);
-+ textdomain (oldtextdomain);
-+ free (oldtextdomain);
-
- if (panel_applet_get_locked_down (PANEL_APPLET (battstat->applet))) {
- BonoboUIComponent *popup_component;
-@@ -1614,10 +1619,9 @@
- }
-
-
--PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_BattstatApplet_Factory",
-+PANEL_APPLET_BONOBO_SHLIB_FACTORY ("OAFIID:GNOME_BattstatApplet_Factory",
- PANEL_TYPE_APPLET,
- "battstat",
-- "0",
- battstat_applet_factory,
- NULL)
-
---- battstat/power-management.c
-+++ battstat/power-management.c
-@@ -40,6 +40,8 @@
- #include "battstat.h"
- #include "battstat-hal.h"
-
-+#include
-+
- #define ERR_ACPID _("Can't access ACPI events in /var/run/acpid.socket! " \
- "Make sure the ACPI subsystem is working and " \
- "the acpid daemon is running.")
---- battstat/properties.c
-+++ battstat/properties.c
-@@ -53,6 +53,8 @@
-
- #include "battstat.h"
-
-+#include
-+
- #ifndef gettext_noop
- #define gettext_noop(String) (String)
- #endif
-@@ -299,7 +301,7 @@
- }
-
- glade_xml = glade_xml_new (GNOME_GLADEDIR "/battstat_applet.glade",
-- "battstat_properties", NULL);
-+ "battstat_properties", GETTEXT_PACKAGE);
-
- battstat->prop_win = GTK_DIALOG (glade_xml_get_widget (glade_xml,
- "battstat_properties"));
--- mixer/GNOME_MixerApplet.server.in.in
+++ mixer/GNOME_MixerApplet.server.in.in
@@ -1,8 +1,8 @@
++++++ gnome-applets-libnotify.patch ++++++
--- /var/tmp/diff_new_pack.Zw8ir3/_old 2006-04-24 15:57:59.000000000 +0200
+++ /var/tmp/diff_new_pack.Zw8ir3/_new 2006-04-24 15:57:59.000000000 +0200
@@ -49,7 +49,7 @@
- hints, /* hints */
- NULL, /* no user_data */
- 0)) /* no actions */
-+ if (!notify_notification_show_and_forget (n, NULL))
++ if (!notify_notification_show (n, NULL))
return FALSE;
return TRUE;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...