monkey-bubble r351 - in trunk: data src/ui

[chpe svn gnome org]

Author: chpe
Date: Sat Mar 22 11:57:03 2008
New Revision: 351
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=351&view=rev

Log:
	* data/Makefile.am:
	* data/com.nokia.monkey_bubble.service.in:
	* data/org.gnome.Games.MonkeyBubble.service.in:
	* src/ui/main.c: (osso_init): Don't put the DBUS service in the
	com.nokia namespace. Bug #523722.

Added:
   trunk/data/org.gnome.Games.MonkeyBubble.service.in
      - copied, changed from r350, /trunk/data/com.nokia.monkey_bubble.service.in
Removed:
   trunk/data/com.nokia.monkey_bubble.service.in
Modified:
   trunk/data/Makefile.am
   trunk/src/ui/main.c

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Sat Mar 22 11:57:03 2008
@@ -6,7 +6,7 @@
 level_DATA = \
 	levels
 
-dbus_in_files=com.nokia.monkey_bubble.service.in
+dbus_in_files=org.gnome.Games.MonkeyBubble.service.in
 if MAEMO
 dbusdir=$(datadir)/dbus-1/services
 dbus_DATA=$(dbus_in_files:.service.in=.service)

Copied: trunk/data/org.gnome.Games.MonkeyBubble.service.in (from r350, /trunk/data/com.nokia.monkey_bubble.service.in)
==============================================================================
--- /trunk/data/com.nokia.monkey_bubble.service.in	(original)
+++ trunk/data/org.gnome.Games.MonkeyBubble.service.in	Sat Mar 22 11:57:03 2008
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=com.nokia.monkey_bubble
+Name=org.gnome.Games.MonkeyBubble
 Exec= BINDIR@/monkey-bubble

Modified: trunk/src/ui/main.c
==============================================================================
--- trunk/src/ui/main.c	(original)
+++ trunk/src/ui/main.c	Sat Mar 22 11:57:03 2008
@@ -35,7 +35,7 @@
 
 #define APPNAME "monkey_bubble"
 #define APPVERSION "0.0.1"
-
+#define SERVICENAME "org.gnome.Games.MonkeyBubble"
 
 struct GlobalData global;
 
@@ -55,7 +55,7 @@
 osso_context_t *osso_init(void)
 {
     osso_context_t *osso =
-        osso_initialize(APPNAME, APPVERSION, TRUE, NULL);
+        osso_initialize(SERVICENAME, APPVERSION, TRUE, NULL);
 
     if (OSSO_OK != osso_application_set_top_cb(osso, _top_cb, NULL))
         return NULL;