gdm r5884 - in trunk: . gui/user-switch-applet

[mccann svn gnome org]

Author: mccann
Date: Wed Feb 27 05:56:20 2008
New Revision: 5884
URL: http://svn.gnome.org/viewvc/gdm?rev=5884&view=rev

Log:
008-02-27  William Jon McCann  <jmccann redhat com>

	* gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in:
	* gui/user-switch-applet/GNOME_GdmUserSwitchApplet.server.in.in:
	* gui/user-switch-applet/GNOME_GdmUserSwitchApplet.xml:
	* gui/user-switch-applet/Makefile.am:
	* gui/user-switch-applet/applet.c: (about_me_cb), (about_cb),
	(applet_fill_cb):
	Use the same oafiid as FUSA so we can be a drop in replacement.
	Note that we now conflict with FUSA.



Added:
   trunk/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
      - copied, changed from r5883, /trunk/gui/user-switch-applet/GNOME_GdmUserSwitchApplet.server.in.in
   trunk/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
      - copied unchanged from r5883, /trunk/gui/user-switch-applet/GNOME_GdmUserSwitchApplet.xml
Removed:
   trunk/gui/user-switch-applet/GNOME_GdmUserSwitchApplet.server.in.in
   trunk/gui/user-switch-applet/GNOME_GdmUserSwitchApplet.xml
Modified:
   trunk/ChangeLog
   trunk/gui/user-switch-applet/Makefile.am
   trunk/gui/user-switch-applet/applet.c

Copied: trunk/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in (from r5883, /trunk/gui/user-switch-applet/GNOME_GdmUserSwitchApplet.server.in.in)
==============================================================================
--- /trunk/gui/user-switch-applet/GNOME_GdmUserSwitchApplet.server.in.in	(original)
+++ trunk/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in	Wed Feb 27 05:56:20 2008
@@ -1,5 +1,5 @@
 <oaf_info>
-  <oaf_server iid="OAFIID:GNOME_GdmUserSwitchApplet_Factory" type="exe"
+  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe"
               location="@LIBEXECDIR@/gdm-user-switch-applet">
 
     <oaf_attribute name="repo_ids" type="stringv">
@@ -18,8 +18,8 @@
     </oaf_attribute>
   </oaf_server>
 
-  <oaf_server iid="OAFIID:GNOME_GdmUserSwitchApplet" type="factory"
-              location="OAFIID:GNOME_GdmUserSwitchApplet_Factory">
+  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory"
+              location="OAFIID:GNOME_FastUserSwitchApplet_Factory">
 
     <oaf_attribute name="repo_ids" type="stringv">
       <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>

Modified: trunk/gui/user-switch-applet/Makefile.am
==============================================================================
--- trunk/gui/user-switch-applet/Makefile.am	(original)
+++ trunk/gui/user-switch-applet/Makefile.am	Wed Feb 27 05:56:20 2008
@@ -45,13 +45,13 @@
 # Bonobo UI
 uidir =	$(datadir)/gnome-2.0/ui
 ui_DATA =					\
-	GNOME_GdmUserSwitchApplet.xml		\
+	GNOME_FastUserSwitchApplet.xml		\
 	$(NULL)
 
 # Bonobo .server
 serverdir = $(libdir)/bonobo/servers
 server_in_files =				\
-	GNOME_GdmUserSwitchApplet.server.in	\
+	GNOME_FastUserSwitchApplet.server.in	\
 	$(NULL)
 server_DATA = $(server_in_files:.server.in=.server)
 
@@ -64,7 +64,7 @@
 	$(schemas_in_files)	\
 	$(glade_DATA)		\
 	$(ui_DATA)		\
-	GNOME_GdmUserSwitchApplet.server.in.in	\
+	GNOME_FastUserSwitchApplet.server.in.in	\
 	$(NULL)
 
 DISTCLEANFILES =                        \

Modified: trunk/gui/user-switch-applet/applet.c
==============================================================================
--- trunk/gui/user-switch-applet/applet.c	(original)
+++ trunk/gui/user-switch-applet/applet.c	Wed Feb 27 05:56:20 2008
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * Copyright (C) 2004-2005 James M. Cape <jcape ignore-your tv>.
- * Copyright (C) 2008      Red Hat Inc.
+ * Copyright (C) 2008      Red Hat, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -94,7 +94,7 @@
                                 const char    *iid,
                                 GdmAppletData *adata);
 
-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_GdmUserSwitchApplet_Factory",
+PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory",
                              PANEL_TYPE_APPLET,
                              "gdm-user-switch-applet", "0",
                              (PanelAppletFactoryCallback)applet_fill_cb,
@@ -109,7 +109,7 @@
 
         err = NULL;
         if (! g_spawn_command_line_async ("gnome-about-me", &err)) {
-                g_critical ("Could not run `gnome-about-me' to change photo: %s",
+                g_critical ("Could not run `gnome-about-me': %s",
                             err->message);
                 g_error_free (err);
                 bonobo_ui_component_set_prop (ui_container,
@@ -533,7 +533,7 @@
                                "version", VERSION,
                                "copyright", "Copyright \xc2\xa9 2004-2005 James M. Cape.\n"
                                "Copyright \xc2\xa9 2006 Thomas Thurman.\n"
-                               "Copyright \xc2\xa9 2008 Red Hat Inc.",
+                               "Copyright \xc2\xa9 2008 Red Hat, Inc.",
                                "comments", _("A menu to quickly switch between users."),
                                "authors", authors,
                                "license", license_i18n,
@@ -1506,8 +1506,9 @@
         gboolean           active_only;
         BonoboUIComponent *popup_component;
 
-        if (strcmp (iid, "OAFIID:GNOME_GdmUserSwitchApplet") != 0)
+        if (strcmp (iid, "OAFIID:GNOME_FastUserSwitchApplet") != 0) {
                 return FALSE;
+        }
 
         /* Global GdmManager */
         if (!first_time) {
@@ -1563,7 +1564,7 @@
         gtk_widget_set_name (GTK_WIDGET (applet), "gdm-user-switch-applet");
         panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
         panel_applet_setup_menu_from_file (applet, NULL,
-                                           DATADIR "/gnome-2.0/ui/GNOME_GdmUserSwitchApplet.xml",
+                                           DATADIR "/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml",
                                            NULL, menu_verbs, adata);
 
         popup_component = panel_applet_get_popup_component (applet);