[gnome-screensaver] bus: rename bus.h to gs-bus.h

[Saleem Abdulrasool <asaleem src gnome org>]

commit 58c06a4e70dafc800df51826734b2327a1fa1c65
Author: Saleem Abdulrasool <compnerd compnerd org>
Date:   Mon Mar 7 17:28:43 2011 -0800

    bus: rename bus.h to gs-bus.h

 src/Makefile.am                 |    6 +++---
 src/gnome-screensaver-command.c |    2 +-
 src/{bus.h => gs-bus.h}         |    4 ++--
 src/gs-listener-dbus.c          |    3 +--
 src/gs-watcher-x11.c            |    3 +--
 5 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 97ffa07..5a4937c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,8 +53,8 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 gnome_screensaver_command_SOURCES = 	\
-	bus.h				\
 	gnome-screensaver-command.c	\
+	gs-bus.h			\
 	$(NULL)
 
 gnome_screensaver_command_LDADD =	\
@@ -94,8 +94,8 @@ test_passwd_LDADD =			\
 	$(NULL)
 
 test_watcher_SOURCES =			\
-	bus.h				\
 	test-watcher.c			\
+	gs-bus.h			\
 	gs-watcher.h			\
 	gs-watcher-x11.c		\
 	gs-marshal.c 			\
@@ -163,9 +163,9 @@ gs-marshal.h: gs-marshal.list
 	@GLIB_GENMARSHAL@ $< --prefix=gs_marshal --header > $@
 
 gnome_screensaver_SOURCES =	\
-	bus.h			\
 	gnome-screensaver.c	\
 	gnome-screensaver.h	\
+	gs-bus.h		\
 	gs-monitor.c		\
 	gs-monitor.h		\
 	gs-watcher-x11.c	\
diff --git a/src/gnome-screensaver-command.c b/src/gnome-screensaver-command.c
index f8db912..4379a38 100644
--- a/src/gnome-screensaver-command.c
+++ b/src/gnome-screensaver-command.c
@@ -30,7 +30,7 @@
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 
-#include "bus.h"
+#include "gs-bus.h"
 
 static gboolean do_quit       = FALSE;
 static gboolean do_lock       = FALSE;
diff --git a/src/bus.h b/src/gs-bus.h
similarity index 98%
rename from src/bus.h
rename to src/gs-bus.h
index 412d1ef..fea13d3 100644
--- a/src/bus.h
+++ b/src/gs-bus.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef bus_h
-#define bus_h
+#ifndef __GS_BUS_H
+#define __GS_BUS_H
 
 /* systemd logind */
 #define SYSTEMD_LOGIND_SERVICE          "org.freedesktop.login1"
diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
index f3d5b3d..28774a0 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
@@ -40,8 +40,7 @@
 #include "gs-listener-dbus.h"
 #include "gs-marshal.h"
 #include "gs-debug.h"
-
-#include "bus.h"
+#include "gs-bus.h"
 
 /* this is for dbus < 0.3 */
 #if ((DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 30))
diff --git a/src/gs-watcher-x11.c b/src/gs-watcher-x11.c
index 1da5116..f06e697 100644
--- a/src/gs-watcher-x11.c
+++ b/src/gs-watcher-x11.c
@@ -36,8 +36,7 @@
 #include "gs-watcher.h"
 #include "gs-marshal.h"
 #include "gs-debug.h"
-
-#include "bus.h"
+#include "gs-bus.h"
 
 static void     gs_watcher_class_init (GSWatcherClass *klass);
 static void     gs_watcher_init       (GSWatcher      *watcher);