r4364 - trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit

[sean_chiang at sita.openmoko.org]

Author: sean_chiang
Date: 2008-04-16 12:48:54 +0200 (Wed, 16 Apr 2008)
New Revision: 4364

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c
Log:
avoid the race

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c	2008-04-15 16:31:30 UTC (rev 4363)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c	2008-04-16 10:48:54 UTC (rev 4364)
@@ -368,7 +368,7 @@
 			moko_sound_profile_set(SOUND_PROFILE_HEADSET);
 			g_debug("SOUND_PROFILE_HEADSET\n");
 		}	
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+		return DBUS_HANDLER_RESULT_HANDLED;
 	}
 	else if ( dbus_message_is_signal( msg,"org.openmoko.PhoneKit.Headset", "HeadsetOut" ) )
 	{
@@ -383,7 +383,7 @@
 			moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
 			g_debug("SOUND_PROFILE_STEREO_OUT\n");
 		}	
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+		return DBUS_HANDLER_RESULT_HANDLED;
 	}
 
 	g_debug( "(unknown dbus message, ignoring)" );
@@ -414,11 +414,7 @@
      return 1;
   }   
 
-  dbus_connection_setup_with_g_main (bus, NULL);
 
-  dbus_bus_add_match (bus, "type='signal'", &err);
-  dbus_connection_add_filter (bus, headset_signal_filter, NULL, NULL);  
-
   /* initialise type system */
   g_type_init ();
 
@@ -486,6 +482,11 @@
                                        SMS_PATH,
                                        G_OBJECT (sms));
 
+  dbus_connection_setup_with_g_main (bus, NULL);
+
+  dbus_bus_add_match (bus, "type='signal',interface='org.openmoko.PhoneKit.Headset'", &err);
+  dbus_connection_add_filter (bus, headset_signal_filter, NULL, NULL);  
+
   /* Sync phonebook */
   /* XXX this is not the right place! */
   pb_sync (pb, network);