~ubuntu-branches/ubuntu/raring/pidgin/raring

Description: Update deprecated Network Manager signal name

Bug: http://developer.pidgin.im/ticket/13859

Bug-Debian: http://bugs.debian.org/642117

Index: pidgin/libpurple/network.c

===================================================================

--- pidgin.orig/libpurple/network.c

+++ pidgin/libpurple/network.c

@@ -833,8 +833,20 @@ purple_network_is_available(void)

                        purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n");

        }

 

-       if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED)

-               return TRUE;

+       switch (nm_state)

+       {

+               case NM_STATE_UNKNOWN:

+#if NM_CHECK_VERSION(0,8,992)

+               case NM_STATE_CONNECTED_LOCAL:

+               case NM_STATE_CONNECTED_SITE:

+               case NM_STATE_CONNECTED_GLOBAL:

+#else

+               case NM_STATE_CONNECTED:

+#endif

+                       return TRUE;

+               default:

+                       break;

+       }

 

        return FALSE;

 

@@ -1171,9 +1183,14 @@ purple_network_init(void)

                                                     NM_DBUS_SERVICE,

                                                     NM_DBUS_PATH,

                                                     NM_DBUS_INTERFACE);

+               /* NM 0.6 signal */

                dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);

                dbus_g_proxy_connect_signal(nm_proxy, "StateChange",

                                            G_CALLBACK(nm_state_change_cb), NULL, NULL);

+               /* NM 0.7 and later signal */

+               dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);

+               dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",

+                                           G_CALLBACK(nm_state_change_cb), NULL, NULL);

 

                dbus_proxy = dbus_g_proxy_new_for_name(nm_conn,

                                                       DBUS_SERVICE_DBUS,

@@ -1208,6 +1225,7 @@ purple_network_uninit(void)

 #ifdef HAVE_NETWORKMANAGER

        if (nm_proxy) {

                dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL);

+               dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL);

                g_object_unref(G_OBJECT(nm_proxy));

        }

        if (dbus_proxy) {