Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.1:kernel-2.6.32
gnome-applets
gnome-applets-in-proc.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File gnome-applets-in-proc.patch of Package gnome-applets
# # 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 @@ # <oaf_info> # # <oaf_server iid="OAFIID:GNOME_MixerApplet_Factory" #- type="exe" #- location="@LIBEXECDIR@/mixer_applet2"> #+ type="shlib" #+ location="@PKGLIBDIR@/libmixer_applet2.so"> # # <oaf_attribute name="repo_ids" type="stringv"> # <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 #+pkglib_LTLIBRARIES = libmixer_applet2.la # #-mixer_applet2_SOURCES = \ #+libmixer_applet2_la_SOURCES = \ # applet.c \ # dock.c \ # load.c \ #@@ -22,17 +22,19 @@ # keys.h \ # preferences.h # #-mixer_applet2_LDADD = \ #+libmixer_applet2_la_LIBADD = \ # $(MIXER_LIBS) \ # $(GNOME_APPLETS_LIBS) \ # $(GNOMEDESKTOP_LIBS) # #+libmixer_applet2_la_LDFLAGS = -module -avoid-version #+ # serverdir = $(libdir)/bonobo/servers # server_in_files = GNOME_MixerApplet.server.in # 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|\@PKGLIBDIR\@|$(pkglibdir)|" $< > $@ # # @INTLTOOL_SERVER_RULE@ # #--- mixer/applet.c #+++ mixer/applet.c #@@ -50,6 +50,8 @@ # #include "keys.h" # #include "preferences.h" # #+#include <glib/gi18n-lib.h> #+ # #define IS_PANEL_HORIZONTAL(o) \ # (o == PANEL_APPLET_ORIENT_UP || o == PANEL_APPLET_ORIENT_DOWN) # #@@ -213,7 +215,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; #@@ -392,6 +393,7 @@ # gchar *key; # gchar *active_element_name; # gchar *active_track_name; #+ char *oldtextdomain; # GstMixerTrack *first_track; # gboolean res; # #@@ -429,10 +431,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 <glib/gi18n-lib.h> #+ # 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 <glib/gi18n-lib.h> #+ #+ # #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 <glib/gi18n-lib.h> #+ # enum { # COL_LABEL, # COL_TRACK, --- multiload/GNOME_MultiLoadApplet_Factory.server.in.in +++ multiload/GNOME_MultiLoadApplet_Factory.server.in.in @@ -2,8 +2,8 @@ <oaf_info> <oaf_server iid="OAFIID:GNOME_MultiLoadApplet_Factory" - type="exe" - location="@LIBEXECDIR@/multiload-applet-2"> + type="shlib" + location="@PKGLIBDIR@/libmultiload-applet-2.so"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:Bonobo/GenericFactory:1.0"/> --- multiload/Makefile.am +++ multiload/Makefile.am @@ -1,3 +1,4 @@ + SUBDIRS = docs INCLUDES = \ @@ -7,9 +8,9 @@ $(GNOMEDESKTOP_CFLAGS) \ $(GNOME_LIBS2_CFLAGS) -libexec_PROGRAMS = multiload-applet-2 +pkglib_LTLIBRARIES = libmultiload-applet-2.la -multiload_applet_2_SOURCES = \ +libmultiload_applet_2_la_SOURCES = \ global.h \ linux-proc.h \ load-graph.h \ @@ -20,12 +21,14 @@ autoscaler.c \ autoscaler.h -multiload_applet_2_LDADD = \ +libmultiload_applet_2_la_LIBADD = \ $(GNOME_APPLETS_LIBS) \ $(GTOP_APPLETS_LIBS) \ $(GNOMEDESKTOP_LIBS) \ $(GNOME_LIBS2_LIBS) +libmultiload_applet_2_la_LDFLAGS = -module -avoid-version + schemasdir = @GCONF_SCHEMA_FILE_DIR@ schemas_in_files = multiload.schemas.in schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) @@ -45,7 +48,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|\@PKGLIBDIR\@|$(pkglibdir)|" $< > $@ CLEANFILES = $(server_in_files) $(server_DATA) $(schemas_DATA) --- multiload/main.c +++ multiload/main.c @@ -31,6 +31,8 @@ #include "global.h" +#include <glib/gi18n-lib.h> + static void about_cb (BonoboUIComponent *uic, MultiloadApplet *ma, @@ -332,7 +334,7 @@ percent = 100.0f * total_used / g->draw_height; percent = MIN(percent, 100); - msg = ngettext("%s:\n" + msg = dngettext(GETTEXT_PACKAGE, "%s:\n" "%u%% in use", "%s:\n" "%u%% in use", @@ -463,6 +465,7 @@ MultiloadApplet *ma; GConfClient *client; BonoboUIComponent *popup_component; + char *oldtextdomain; ma = g_new0(MultiloadApplet, 1); @@ -472,12 +475,13 @@ ma->prop_dialog = NULL; ma->last_clicked = 0; - gtk_window_set_default_icon_name ("utilities-system-monitor"); panel_applet_set_background_widget (applet, GTK_WIDGET(applet)); panel_applet_add_preferences (applet, "/schemas/apps/multiload/prefs", NULL); panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR); + oldtextdomain = strdup (textdomain (NULL)); + textdomain (GETTEXT_PACKAGE); panel_applet_setup_menu_from_file (applet, DATADIR, "GNOME_MultiloadApplet.xml", @@ -485,6 +489,8 @@ multiload_menu_verbs, ma); + textdomain (oldtextdomain); + free (oldtextdomain); popup_component = panel_applet_get_popup_component (applet); if (panel_applet_get_locked_down (applet)) { @@ -541,9 +547,8 @@ return retval; } -PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_MultiLoadApplet_Factory", +PANEL_APPLET_BONOBO_SHLIB_FACTORY ("OAFIID:GNOME_MultiLoadApplet_Factory", PANEL_TYPE_APPLET, "multiload", - "0", multiload_factory, NULL) --- multiload/properties.c +++ multiload/properties.c @@ -31,6 +31,8 @@ #include "global.h" +#include <glib/gi18n-lib.h> + #define PROP_CPU 0 #define PROP_MEM 1 #define PROP_NET 2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
