gnome-session r4889 - in branches/dbus_based: . gnome-session

[matthiasc svn gnome org]

Author: matthiasc
Date: Wed Jul 30 00:17:56 2008
New Revision: 4889
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4889&view=rev

Log:
Rename some files to gsm-


Added:
   branches/dbus_based/gnome-session/gsm-gconf.c   (contents, props changed)
      - copied, changed from r4887, /branches/dbus_based/gnome-session/gconf.c
   branches/dbus_based/gnome-session/gsm-gconf.h   (contents, props changed)
      - copied, changed from r4887, /branches/dbus_based/gnome-session/gconf.h
   branches/dbus_based/gnome-session/gsm-util.c   (contents, props changed)
      - copied, changed from r4887, /branches/dbus_based/gnome-session/util.c
   branches/dbus_based/gnome-session/gsm-util.h   (contents, props changed)
      - copied, changed from r4887, /branches/dbus_based/gnome-session/util.h
Removed:
   branches/dbus_based/gnome-session/gconf.c
   branches/dbus_based/gnome-session/gconf.h
   branches/dbus_based/gnome-session/util.c
   branches/dbus_based/gnome-session/util.h
Modified:
   branches/dbus_based/ChangeLog
   branches/dbus_based/gnome-session/Makefile.am
   branches/dbus_based/gnome-session/gsm-autostart-app.c
   branches/dbus_based/gnome-session/gsm-inhibit-dialog.c
   branches/dbus_based/gnome-session/gsm-manager.c
   branches/dbus_based/gnome-session/gsm-xsmp-server.c
   branches/dbus_based/gnome-session/main.c

Modified: branches/dbus_based/gnome-session/Makefile.am
==============================================================================
--- branches/dbus_based/gnome-session/Makefile.am	(original)
+++ branches/dbus_based/gnome-session/Makefile.am	Wed Jul 30 00:17:56 2008
@@ -78,8 +78,8 @@
 	gsm-inhibit-dialog.c			\
 	gsm-power-manager.h			\
 	gsm-power-manager.c			\
-	gconf.c					\
-	gconf.h					\
+	gsm-gconf.c				\
+	gsm-gconf.h				\
 	gdm.h					\
 	gdm.c					\
 	main.c					\
@@ -97,8 +97,8 @@
 	$(GNOME_SESSION_LIBS)
 
 libgsmutil_la_SOURCES =				\
-	util.c					\
-	util.h
+	gsm-util.c				\
+	gsm-util.h
 
 gsm-marshal.c: gsm-marshal.list
 	echo "#include \"gsm-marshal.h\"" > $@ && \

Modified: branches/dbus_based/gnome-session/gsm-autostart-app.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-autostart-app.c	(original)
+++ branches/dbus_based/gnome-session/gsm-autostart-app.c	Wed Jul 30 00:17:56 2008
@@ -32,7 +32,7 @@
 #include <gconf/gconf-client.h>
 
 #include "gsm-autostart-app.h"
-#include "util.h"
+#include "gsm-util.h"
 
 enum {
         AUTOSTART_LAUNCH_SPAWN = 0,

Copied: branches/dbus_based/gnome-session/gsm-gconf.c (from r4887, /branches/dbus_based/gnome-session/gconf.c)
==============================================================================
--- /branches/dbus_based/gnome-session/gconf.c	(original)
+++ branches/dbus_based/gnome-session/gsm-gconf.c	Wed Jul 30 00:17:56 2008
@@ -1,4 +1,4 @@
-/* gconf.c
+/* gsm-gconf.c
  * Copyright (C) 2007 Novell, Inc.
  *
  * FIXME: (C) on gconf-sanity-check call, gsm_get_conf_client,
@@ -28,8 +28,8 @@
 
 #include <sys/wait.h>
 
-#include "gconf.h"
-#include "util.h"
+#include "gsm-gconf.h"
+#include "gsm-util.h"
 
 static pid_t gsc_pid;
 

Copied: branches/dbus_based/gnome-session/gsm-gconf.h (from r4887, /branches/dbus_based/gnome-session/gconf.h)
==============================================================================
--- /branches/dbus_based/gnome-session/gconf.h	(original)
+++ branches/dbus_based/gnome-session/gsm-gconf.h	Wed Jul 30 00:17:56 2008
@@ -1,4 +1,4 @@
-/* gconf.h
+/* gsm-gconf.h
  * Copyright (C) 2007 Novell, Inc.
  *
  * This program is free software; you can redistribute it and/or

Modified: branches/dbus_based/gnome-session/gsm-inhibit-dialog.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-inhibit-dialog.c	(original)
+++ branches/dbus_based/gnome-session/gsm-inhibit-dialog.c	Wed Jul 30 00:17:56 2008
@@ -38,7 +38,7 @@
 #include "gsm-store.h"
 #include "gsm-inhibitor.h"
 #include "eggdesktopfile.h"
-#include "util.h"
+#include "gsm-util.h"
 
 #ifdef HAVE_XRENDER
 #include <X11/extensions/Xrender.h>

Modified: branches/dbus_based/gnome-session/gsm-manager.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-manager.c	(original)
+++ branches/dbus_based/gnome-session/gsm-manager.c	Wed Jul 30 00:17:56 2008
@@ -53,7 +53,7 @@
 #include "gsm-autostart-app.h"
 #include "gsm-resumed-app.h"
 
-#include "util.h"
+#include "gsm-util.h"
 #include "gdm.h"
 #include "gsm-logout-dialog.h"
 #include "gsm-inhibit-dialog.h"

Copied: branches/dbus_based/gnome-session/gsm-util.c (from r4887, /branches/dbus_based/gnome-session/util.c)
==============================================================================
--- /branches/dbus_based/gnome-session/util.c	(original)
+++ branches/dbus_based/gnome-session/gsm-util.c	Wed Jul 30 00:17:56 2008
@@ -1,4 +1,4 @@
-/* util.h
+/* gsm-util.c
  * Copyright (C) 2008 Lucas Rocha.
  *
  * This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@
 
 #include <dbus/dbus-glib.h>
 
-#include "util.h"
+#include "gsm-util.h"
 
 gchar **
 gsm_util_get_autostart_dirs ()

Copied: branches/dbus_based/gnome-session/gsm-util.h (from r4887, /branches/dbus_based/gnome-session/util.h)
==============================================================================
--- /branches/dbus_based/gnome-session/util.h	(original)
+++ branches/dbus_based/gnome-session/gsm-util.h	Wed Jul 30 00:17:56 2008
@@ -1,4 +1,4 @@
-/* util.h
+/* gsm-util.h
  * Copyright (C) 2008 Lucas Rocha.
  *
  * This program is free software; you can redistribute it and/or

Modified: branches/dbus_based/gnome-session/gsm-xsmp-server.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-xsmp-server.c	(original)
+++ branches/dbus_based/gnome-session/gsm-xsmp-server.c	Wed Jul 30 00:17:56 2008
@@ -50,7 +50,7 @@
 
 #include "gsm-xsmp-server.h"
 #include "gsm-xsmp-client.h"
-#include "util.h"
+#include "gsm-util.h"
 
 /* ICEauthority stuff */
 /* Various magic numbers stolen from iceauth.c */

Modified: branches/dbus_based/gnome-session/main.c
==============================================================================
--- branches/dbus_based/gnome-session/main.c	(original)
+++ branches/dbus_based/gnome-session/main.c	Wed Jul 30 00:17:56 2008
@@ -37,8 +37,8 @@
 #include <dbus/dbus-glib-bindings.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "gconf.h"
-#include "util.h"
+#include "gsm-gconf.h"
+#include "gsm-util.h"
 #include "gsm-manager.h"
 #include "gsm-xsmp-server.h"
 #include "gsm-store.h"