gnome-session r4890 - in branches/dbus_based: . capplet doc/dbus po

[mccann svn gnome org]

Author: mccann
Date: Wed Jul 30 02:31:40 2008
New Revision: 4890
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4890&view=rev

Log:
2008-07-29  William Jon McCann  <jmccann redhat com>

	* capplet/commands.c:
	* capplet/ui.c:
	* doc/dbus/gnome-session.xml.in:
	Fix build.



Modified:
   branches/dbus_based/ChangeLog
   branches/dbus_based/capplet/commands.c
   branches/dbus_based/capplet/ui.c
   branches/dbus_based/doc/dbus/gnome-session.xml.in
   branches/dbus_based/po/ChangeLog
   branches/dbus_based/po/POTFILES.in

Modified: branches/dbus_based/capplet/commands.c
==============================================================================
--- branches/dbus_based/capplet/commands.c	(original)
+++ branches/dbus_based/capplet/commands.c	Wed Jul 30 02:31:40 2008
@@ -28,7 +28,7 @@
 
 #include "eggdesktopfile.h"
 #include "commands.h"
-#include "util.h"
+#include "gsm-util.h"
 
 #define DESKTOP_ENTRY_GROUP  "Desktop Entry"
 #define STARTUP_APP_ICON     "gnome-run"

Modified: branches/dbus_based/capplet/ui.c
==============================================================================
--- branches/dbus_based/capplet/ui.c	(original)
+++ branches/dbus_based/capplet/ui.c	Wed Jul 30 02:31:40 2008
@@ -28,7 +28,7 @@
 #include <glade/glade.h>
 
 #include "eggdesktopfile.h"
-#include "util.h"
+#include "gsm-util.h"
 #include "ui.h"
 #include "commands.h"
 

Modified: branches/dbus_based/doc/dbus/gnome-session.xml.in
==============================================================================
--- branches/dbus_based/doc/dbus/gnome-session.xml.in	(original)
+++ branches/dbus_based/doc/dbus/gnome-session.xml.in	Wed Jul 30 02:31:40 2008
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
 <!ENTITY dbus-Manager SYSTEM "org.gnome.SessionManager.ref.xml">
 <!ENTITY dbus-Client SYSTEM "org.gnome.SessionManager.Client.ref.xml">
-<!ENTITY dbus-DBusClient SYSTEM "org.gnome.SessionManager.DBusClient.ref.xml">
+<!ENTITY dbus-ClientPrivate SYSTEM "org.gnome.SessionManager.ClientPrivate.ref.xml">
 <!ENTITY dbus-Inhibitor SYSTEM "org.gnome.SessionManager.Inhibitor.ref.xml">
 ]>
 
@@ -37,7 +37,7 @@
 
       &dbus-Manager;
       &dbus-Client;
-      &dbus-DBusClient;
+      &dbus-ClientPrivate;
       &dbus-Inhibitor;
 
     </reference>

Modified: branches/dbus_based/po/POTFILES.in
==============================================================================
--- branches/dbus_based/po/POTFILES.in	(original)
+++ branches/dbus_based/po/POTFILES.in	Wed Jul 30 02:31:40 2008
@@ -8,19 +8,18 @@
 egg/eggdesktopfile.c
 egg/eggsmclient-libgnomeui.c
 egg/eggsmclient.c
-gnome-session/gconf.c
+gnome-session/gsm-gconf.c
 gnome-session/gsm-inhibit-dialog.c
 gnome-session/gsm-inhibit-dialog.glade
 gnome-session/gsm-logout-dialog.c
 gnome-session/gsm-manager.c
 gnome-session/gsm-xsmp-client.c
 gnome-session/gsm-xsmp-server.c
+gnome-session/gsm-util.c
 gnome-session/main.c
-gnome-session/util.c
 capplet/main.c
 capplet/ui.c
 capplet/commands.c
 tools/gnome-session-save.c
 splash/gnome-login-sound.c
 splash/gnome-session-splash.c
-