Hello community,
here is the log from the commit of package gnome-applets
checked in at Wed Apr 5 17:21:42 CEST 2006.
--------
--- GNOME/gnome-applets/gnome-applets.changes 2006-03-20 17:49:00.000000000 +0100
+++ gnome-applets/gnome-applets.changes 2006-04-05 14:05:34.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Apr 5 14:03:47 CEST 2006 - sbrabec@suse.cz
+
+- Fixed in-process applets I18N (144946#27).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-applets.spec ++++++
--- /var/tmp/diff_new_pack.8VPVql/_old 2006-04-05 17:20:56.000000000 +0200
+++ /var/tmp/diff_new_pack.8VPVql/_new 2006-04-05 17:20:56.000000000 +0200
@@ -27,7 +27,7 @@
%endif
Autoreqprov: on
Version: 2.12.2
-Release: 31
+Release: 36
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
@@ -157,8 +157,8 @@
gnome-patch-translation-update
%build
-rename no nb po/no.*
-sed "s/\(ALL_LINGUAS.*\) no /\1 nb /" configure.in > configure.in.tmp && mv configure.in.tmp configure.in
+rm po/no.*
+sed "s/\(ALL_LINGUAS.*\) no /\1 /" configure.in > configure.in.tmp && mv configure.in.tmp configure.in
autoreconf -f -i
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" \
./configure \
@@ -260,6 +260,8 @@
%{prefix}/%_lib/pkgconfig/*.pc
%changelog -n gnome-applets
+* Wed Apr 05 2006 - sbrabec@suse.cz
+- Fixed in-process applets I18N (144946#27).
* Sun Mar 19 2006 - danw@suse.de
- Apply patch from bgo 316455 to fix bnc 158615
(hang with NFS if disk enabled in system monitor)
++++++ gnome-applets-battstat_applet.patch ++++++
--- /var/tmp/diff_new_pack.8VPVql/_old 2006-04-05 17:20:56.000000000 +0200
+++ /var/tmp/diff_new_pack.8VPVql/_new 2006-04-05 17:20:56.000000000 +0200
@@ -4,7 +4,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 "
@@ -12,7 +12,7 @@
- info->minutes ),
- info->minutes,info->percent );
+ if( info->minutes >= 0 )
-+ 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 "
++++++ gnome-applets-in-proc.patch ++++++
--- /var/tmp/diff_new_pack.8VPVql/_old 2006-04-05 17:20:57.000000000 +0200
+++ /var/tmp/diff_new_pack.8VPVql/_new 2006-04-05 17:20:57.000000000 +0200
@@ -1,5 +1,3 @@
-Index: multiload/GNOME_MultiLoadApplet_Factory.server.in.in
-================================================================================
--- battstat/GNOME_BattstatApplet.server.in.in
+++ battstat/GNOME_BattstatApplet.server.in.in
@@ -1,8 +1,8 @@
@@ -48,7 +46,81 @@
--- battstat/battstat_applet.c
+++ battstat/battstat_applet.c
-@@ -1541,8 +1541,6 @@
+@@ -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 );
@@ -57,7 +129,24 @@
panel_applet_add_preferences (applet, "/schemas/apps/battstat-applet/prefs",
NULL);
panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
-@@ -1614,10 +1612,9 @@
+@@ -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 @@
}
@@ -69,6 +158,37 @@
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 @@
@@ -116,7 +236,16 @@
--- mixer/applet.c
+++ mixer/applet.c
-@@ -210,7 +210,6 @@
+@@ -47,6 +47,8 @@
+ #include "keys.h"
+ #include "preferences.h"
+
++#include
++
+ #define IS_PANEL_HORIZONTAL(o) \
+ (o == PANEL_APPLET_ORIENT_UP || o == PANEL_APPLET_ORIENT_DOWN)
+
+@@ -210,7 +212,6 @@
applet->image = GTK_IMAGE (image);
gtk_container_add (GTK_CONTAINER (applet), image);
gtk_widget_show (image);
@@ -124,9 +253,52 @@
/* dock window (expanded UI) */
applet->pop = FALSE;
+@@ -377,6 +378,7 @@
+ gchar *key;
+ gchar *active_element_name;
+ gchar *active_track_name;
++ char *oldtextdomain;
+ GstMixerTrack *first_track;
+ gboolean res;
+
+@@ -414,10 +416,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
-@@ -172,11 +172,10 @@
+@@ -30,6 +30,8 @@
+
+ #include "applet.h"
+
++#include
++
+ static gint
+ sort_by_rank (GstElement * a, GstElement * b)
+ {
+@@ -172,11 +174,10 @@
return TRUE;
}
@@ -139,6 +311,17 @@
gnome_volume_applet_factory,
NULL
)
+--- mixer/preferences.c
++++ mixer/preferences.c
+@@ -47,6 +47,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
@@ -1,8 +1,8 @@
@@ -191,7 +374,33 @@
--- multiload/main.c
+++ multiload/main.c
-@@ -511,8 +511,6 @@
+@@ -30,6 +30,8 @@
+
+ #include "global.h"
+
++#include
++
+ static void
+ about_cb (BonoboUIComponent *uic,
+ MultiloadApplet *ma,
+@@ -366,7 +368,7 @@
+ } else {
+ const char *msg;
+
+- msg = ngettext("%s:\n"
++ msg = dngettext(GETTEXT_PACKAGE, "%s:\n"
+ "%u%% in use",
+ "%s:\n"
+ "%u%% in use",
+@@ -502,6 +504,7 @@
+ MultiloadApplet *ma;
+ GConfClient *client;
+ BonoboUIComponent *popup_component;
++ char *oldtextdomain;
+
+ ma = g_new0(MultiloadApplet, 1);
+
+@@ -511,17 +514,19 @@
ma->prop_dialog = NULL;
ma->last_clicked = 0;
@@ -200,7 +409,20 @@
panel_applet_add_preferences (applet, "/schemas/apps/multiload/prefs", NULL);
panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
-@@ -577,9 +575,8 @@
++ oldtextdomain = strdup (textdomain (NULL));
++ textdomain (GETTEXT_PACKAGE);
+ panel_applet_setup_menu_from_file (applet,
+ DATADIR,
+ "GNOME_MultiloadApplet.xml",
+ NULL,
+ multiload_menu_verbs,
+ ma);
++ textdomain (oldtextdomain);
++ free (oldtextdomain);
+
+ popup_component = panel_applet_get_popup_component (applet);
+
+@@ -577,9 +582,8 @@
return retval;
}
@@ -211,3 +433,14 @@
- "0",
multiload_factory,
NULL);
+--- multiload/properties.c
++++ multiload/properties.c
+@@ -31,6 +31,8 @@
+
+ #include "global.h"
+
++#include
++
+ #define PROP_CPU 0
+ #define PROP_MEM 1
+ #define PROP_NET 2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...