gnome-bluetooth r432 - in trunk: common properties

[hadess svn gnome org]

Author: hadess
Date: Tue Mar  3 15:15:49 2009
New Revision: 432
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=432&view=rev

Log:
Move killswitch handling

>From the properties to common/



Added:
   trunk/common/bluetooth-killswitch.c
      - copied, changed from r430, /trunk/properties/killswitch.c
   trunk/common/bluetooth-killswitch.h
      - copied unchanged from r426, /trunk/properties/killswitch.h
Removed:
   trunk/properties/killswitch.c
   trunk/properties/killswitch.h
Modified:
   trunk/common/Makefile.am
   trunk/properties/Makefile.am
   trunk/properties/adapter.c

Modified: trunk/common/Makefile.am
==============================================================================
--- trunk/common/Makefile.am	(original)
+++ trunk/common/Makefile.am	Tue Mar  3 15:15:49 2009
@@ -5,6 +5,7 @@
 libcommon_la_SOURCES = helper.h helper.c \
 		bluetooth-client.h bluetooth-client.c \
 		bluetooth-agent.h bluetooth-agent.c \
+		bluetooth-killswitch.h bluetooth-killswitch.c \
 		obex-agent.h obex-agent.c \
 		helper.c helper.h \
 		bluetooth-enums.h

Copied: trunk/common/bluetooth-killswitch.c (from r430, /trunk/properties/killswitch.c)
==============================================================================
--- /trunk/properties/killswitch.c	(original)
+++ trunk/common/bluetooth-killswitch.c	Tue Mar  3 15:15:49 2009
@@ -29,7 +29,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <hal/libhal.h>
 
-#include "killswitch.h"
+#include "bluetooth-killswitch.h"
 
 #define BLUETOOTH_KILLSWITCH_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), \
 				BLUETOOTH_TYPE_KILLSWITCH, BluetoothKillswitchPrivate))

Modified: trunk/properties/Makefile.am
==============================================================================
--- trunk/properties/Makefile.am	(original)
+++ trunk/properties/Makefile.am	Tue Mar  3 15:15:49 2009
@@ -1,8 +1,7 @@
 
 bin_PROGRAMS = bluetooth-properties
 
-bluetooth_properties_SOURCES = main.c general.h general.c \
-				killswitch.h killswitch.c adapter.h adapter.c
+bluetooth_properties_SOURCES = main.c general.h general.c adapter.h adapter.c
 
 bluetooth_properties_LDADD = $(top_builddir)/common/libcommon.la $(PROPS_LIBS)
 

Modified: trunk/properties/adapter.c
==============================================================================
--- trunk/properties/adapter.c	(original)
+++ trunk/properties/adapter.c	Tue Mar  3 15:15:49 2009
@@ -36,7 +36,7 @@
 
 #include "adapter.h"
 #include "general.h"
-#include "killswitch.h"
+#include "bluetooth-killswitch.h"
 
 static BluetoothClient *client;
 static GtkTreeModel *adapter_model;