Changeset 4778

Timestamp:

11/11/08 04:43:36 (5 years ago)

Author:

erin_yueh

Message:

applied patch for bug#1833

File:

• trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c (modified) (1 diff)

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c

@@ -350 +350 @@
         MokoDialer *dialer;
 
-        g_debug( "headset signal filter" );
-
-        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" ) )
+        if ( !g_strcmp0( dbus_message_get_interface(msg), "org.openmoko.PhoneKit.Headset" ) )
         {
-                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;
+                g_debug( "headset signal filter" );
+
+                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 ( 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;
+                }
+
+                g_debug( "(unknown dbus message, ignoring)" );
         }
-        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;
-        }
-
-        g_debug( "(unknown dbus message, ignoring)" );
         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }