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

[erin_yueh at docs.openmoko.org]

Author: erin_yueh
Date: 2008-11-11 04:43:36 +0100 (Tue, 11 Nov 2008)
New Revision: 4778

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c
Log:
applied patch for bug#1833 


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-11-10 11:05:59 UTC (rev 4777)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c	2008-11-11 03:43:36 UTC (rev 4778)
@@ -349,44 +349,47 @@
 	MokoNetwork *network;
 	MokoDialer *dialer;
 
-	g_debug( "headset signal filter" );
+	if ( !g_strcmp0( dbus_message_get_interface(msg), "org.openmoko.PhoneKit.Headset" ) )
+	{
+		g_debug( "headset signal filter" );
 
-	network = moko_network_get_default ();
-	dialer = moko_dialer_get_default (network);
-	status = moko_dialer_get_status(dialer);  
+		network = moko_network_get_default ();
+		dialer = moko_dialer_get_default (network);
+		status = moko_dialer_get_status(dialer);  
 
-	if ( dbus_message_is_signal( msg, "org.openmoko.PhoneKit.Headset", "HeadsetIn" ) )
-	{
-		moko_headset_status_set(HEADSET_STATUS_IN);
-		g_debug( "Headset In" );
+		if ( dbus_message_is_signal( msg, "org.openmoko.PhoneKit.Headset", "HeadsetIn" ) )
+		{
+			moko_headset_status_set(HEADSET_STATUS_IN);
+			g_debug( "Headset In" );
 
-		if ( PK_DIALER_TALKING == status ) {
-			moko_sound_profile_set(SOUND_PROFILE_GSM_HEADSET);
-			g_debug("SOUND_PROFILE_GSM_HEADSET\n");
-		}	
-		else {
-			moko_sound_profile_set(SOUND_PROFILE_HEADSET);
-			g_debug("SOUND_PROFILE_HEADSET\n");
-		}	
-		return DBUS_HANDLER_RESULT_HANDLED;
-	}
-	else if ( dbus_message_is_signal( msg,"org.openmoko.PhoneKit.Headset", "HeadsetOut" ) )
-	{
-	        moko_headset_status_set(HEADSET_STATUS_OUT);
-		g_debug( "Headset Out" );
+			if ( PK_DIALER_TALKING == status ) {
+				moko_sound_profile_set(SOUND_PROFILE_GSM_HEADSET);
+				g_debug("SOUND_PROFILE_GSM_HEADSET\n");
+			}	
+			else {
+				moko_sound_profile_set(SOUND_PROFILE_HEADSET);
+				g_debug("SOUND_PROFILE_HEADSET\n");
+			}	
+			return DBUS_HANDLER_RESULT_HANDLED;
+		}
+		else if ( dbus_message_is_signal( msg,"org.openmoko.PhoneKit.Headset", "HeadsetOut" ) )
+		{
+			moko_headset_status_set(HEADSET_STATUS_OUT);
+			g_debug( "Headset Out" );
 
-		if ( PK_DIALER_TALKING == status ) {
-			moko_sound_profile_set(SOUND_PROFILE_GSM_HANDSET);
-			g_debug("SOUND_PROFILE_GSM_HANDSET\n");
-		}	
-		else {	
-			moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
-			g_debug("SOUND_PROFILE_STEREO_OUT\n");
-		}	
-		return DBUS_HANDLER_RESULT_HANDLED;
+			if ( PK_DIALER_TALKING == status ) {
+				moko_sound_profile_set(SOUND_PROFILE_GSM_HANDSET);
+				g_debug("SOUND_PROFILE_GSM_HANDSET\n");
+			}	
+			else {	
+				moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
+				g_debug("SOUND_PROFILE_STEREO_OUT\n");
+			}	
+			return DBUS_HANDLER_RESULT_HANDLED;
+		}
+
+		g_debug( "(unknown dbus message, ignoring)" );
 	}
-
-	g_debug( "(unknown dbus message, ignoring)" );
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }