diff --git a/nm09-more.patch b/nm09-more.patch new file mode 100644 index 0000000..aa645ce --- /dev/null +++ b/nm09-more.patch @@ -0,0 +1,37 @@ +diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c +--- pidgin-2.7.11/libpurple/network.c.nm09more 2011-04-26 11:54:40.894171020 -0500 ++++ pidgin-2.7.11/libpurple/network.c 2011-04-26 12:00:55.533487383 -0500 +@@ -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; + +@@ -1170,8 +1182,8 @@ purple_network_init(void) + NM_DBUS_SERVICE, + NM_DBUS_PATH, + NM_DBUS_INTERFACE); +- dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID); +- dbus_g_proxy_connect_signal(nm_proxy, "StateChange", ++ 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, diff --git a/pidgin.spec b/pidgin.spec index 28be8ca..3f9c48a 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -98,7 +98,7 @@ Name: pidgin Version: 2.7.11 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls # GPLv2 - silc & novell prpls @@ -135,6 +135,7 @@ Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch ## Patches 100+: To be Included in Future Upstream Patch100: pidgin-2.7.7-msn-disable-msnp16.patch Patch101: nm09-pidgin.patch +Patch102: nm09-more.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Summary: A Gtk+ based multiprotocol instant messaging client @@ -418,6 +419,8 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}" # http://developer.pidgin.im/ticket/13505 %patch101 -p1 -b .nm09 +# http://developer.pidgin.im/ticket/13859 +%patch102 -p1 -b .nm09more # Our preferences cp %{SOURCE1} prefs.xml @@ -680,6 +683,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Apr 26 2011 Dan Williams 2.7.11-3 +- A few more NetworkManager 0.9 fixes + * Fri Mar 25 2011 Dan Williams 2.7.11-2 - Rebuild for NetworkManager 0.9