diff options
| -rw-r--r-- | data/GNOME_FastUserSwitchApplet.server.in.in (renamed from data/GNOME_IndicatorAppletSUS.server.in.in) | 0 | ||||
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/indicator-applet-sus.install | 2 | ||||
| -rw-r--r-- | src-sus/applet-main.c | 10 |
5 files changed, 15 insertions, 8 deletions
diff --git a/data/GNOME_IndicatorAppletSUS.server.in.in b/data/GNOME_FastUserSwitchApplet.server.in.in index 388713b..388713b 100644 --- a/data/GNOME_IndicatorAppletSUS.server.in.in +++ b/data/GNOME_FastUserSwitchApplet.server.in.in diff --git a/data/Makefile.am b/data/Makefile.am index c94932d..0908bb0 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -8,7 +8,7 @@ serverdir = \ $(libdir)/bonobo/servers server_in_files = \ GNOME_IndicatorApplet.server.in \ - GNOME_IndicatorAppletSUS.server.in + GNOME_FastUserSwitchApplet.server.in server_DATA = \ $(server_in_files:.server.in=.server) @@ -68,7 +68,7 @@ CLEANFILES = \ EXTRA_DIST = \ $(icons_DATA) \ GNOME_IndicatorApplet.server.in.in \ - GNOME_IndicatorAppletSUS.server.in.in \ + GNOME_FastUserSwitchApplet.server.in.in \ $(schema_in_files) MAINTAINERCLEANFILES = \ diff --git a/debian/changelog b/debian/changelog index b43ca4c..c3d7cf1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-applet (0.2.0~bzr319-0ubuntu5~ppa3) UNRELEASED; urgency=low + + * Renaming the second Bonobo server description file to match that + of the FastUserSwitchApplet. + + -- Ted Gould <ted@ubuntu.com> Fri, 07 Aug 2009 18:50:02 +0100 + indicator-applet (0.2.0~bzr319-0ubuntu5~ppa2) karmic; urgency=low * Upstream merge for better naming of the applet. diff --git a/debian/indicator-applet-sus.install b/debian/indicator-applet-sus.install index 6bb7e07..3a016e0 100644 --- a/debian/indicator-applet-sus.install +++ b/debian/indicator-applet-sus.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/bonobo/servers/GNOME_IndicatorAppletSUS.server +debian/tmp/usr/lib/bonobo/servers/GNOME_FastUserSwitchApplet.server debian/tmp/usr/lib/indicator-applet/indicator-applet-sus diff --git a/src-sus/applet-main.c b/src-sus/applet-main.c index 34440d8..0e43923 100644 --- a/src-sus/applet-main.c +++ b/src-sus/applet-main.c @@ -48,9 +48,9 @@ static GnomeProgram *program = NULL; * main * ***********/ -PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_IndicatorApplet_Factory", +PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory", PANEL_TYPE_APPLET, - "indicator-applet", "0", + "indicator-applet-sus", "0", applet_fill_cb, NULL); /************* @@ -219,10 +219,10 @@ applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data) if (!first_time) { gint argc = 1; - gchar *argv[2] = { "indicator-applet", NULL}; + gchar *argv[2] = { "indicator-applet-sus", NULL}; first_time = TRUE; - program = gnome_program_init ("indicator-applet", "0.1", + program = gnome_program_init ("indicator-applet-sus", "0.1", LIBGNOMEUI_MODULE, argc, argv, GNOME_PROGRAM_STANDARD_PROPERTIES, NULL); @@ -233,7 +233,7 @@ applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data) panel_applet_set_flags(applet, PANEL_APPLET_EXPAND_MINOR); panel_applet_setup_menu(applet, menu_xml, menu_verbs, NULL); atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)), - "indicator-applet"); + "indicator-applet-sus"); /* Init some theme/icon stuff */ gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), |