pidgin: e9dfd965: Stop Groupwise from showing two windows ...

rekkanoryo at pidgin.im rekkanoryo at pidgin.im
Sun Jan 9 22:35:51 EST 2011


----------------------------------------------------------------------
Revision: e9dfd9657a9fbe200eb4d55b32789089fc1afc9b
Parent:   342a95ba56375edcb99f196a32acfdb530660c2a
Author:   gabriel.burt at gmail.com
Date:     01/09/11 22:22:30
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e9dfd9657a9fbe200eb4d55b32789089fc1afc9b

Changelog: 

Stop Groupwise from showing two windows for Get Info.  Fixes #13108.

Changes against parent 342a95ba56375edcb99f196a32acfdb530660c2a

  patched  libpurple/protocols/novell/novell.c

-------------- next part --------------
============================================================
--- libpurple/protocols/novell/novell.c	46b975252b9b401ffc2ef95d123fc95b3a60f448
+++ libpurple/protocols/novell/novell.c	f093bd6d9d7432f4976a37ce66b8c2f7fb0663fd
@@ -74,7 +74,7 @@ static void
 _sync_privacy_lists(NMUser *user);
 
 static void
-_show_info(PurpleConnection * gc, NMUserRecord * user_record);
+_show_info(PurpleConnection * gc, NMUserRecord * user_record, char * name);
 
 const char *
 _get_conference_name(int id);
@@ -705,7 +705,7 @@ _get_details_resp_show_info(NMUser * use
 		user_record = (NMUserRecord *) resp_data;
 		if (user_record) {
 			_show_info(purple_account_get_connection(user->client_data),
-					   user_record);
+					   user_record, g_strdup(name));
 		}
 	} else {
 		gc = purple_account_get_connection(user->client_data);
@@ -1505,7 +1505,7 @@ static void
 
 /* Display a dialog box showing the properties for the given user record */
 static void
-_show_info(PurpleConnection * gc, NMUserRecord * user_record)
+_show_info(PurpleConnection * gc, NMUserRecord * user_record, char * name)
 {
 	PurpleNotifyUserInfo *user_info =	purple_notify_user_info_new();
 	int count, i;
@@ -1544,9 +1544,10 @@ _show_info(PurpleConnection * gc, NMUser
 		}
 	}
 
-	purple_notify_userinfo(gc, nm_user_record_get_userid(user_record),
-						 user_info, NULL, NULL);
+	purple_notify_userinfo(gc, name, user_info, NULL, NULL);
 	purple_notify_user_info_destroy(user_info);
+
+	g_free(name);
 }
 
 /* Send a join conference, the first item in the parms list is the
@@ -2912,11 +2913,9 @@ novell_get_info(PurpleConnection * gc, c
 
 		user_record = nm_find_user_record(user, name);
 		if (user_record) {
+			_show_info(gc, user_record, g_strdup(name));
 
-			_show_info(gc, user_record);
-
 		} else {
-
 			rc = nm_send_get_details(user, name,
 									 _get_details_resp_show_info, g_strdup(name));
 


More information about the Commits mailing list