# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1294630205 0
# Node ID d5b710c91104939544f69f935604914bf4473309
# Parent  38cd00d46b4dc30aaefc8dde8ebdec84197068d2# Parent  601820fe2acccf50a631c6e9e7b6f8c4586d7926
merge of 'bdb9e04ffa44988c3cb76672342070f9e798772a'
     and 'e97fa87108d60ea0e2ce4aaeaee31e5967e0b6db'

diff -r 38cd00d46b4d -r d5b710c91104 COPYRIGHT
--- a/COPYRIGHT	Mon Jan 10 01:17:34 2011 +0000
+++ b/COPYRIGHT	Mon Jan 10 03:30:05 2011 +0000
@@ -81,6 +81,7 @@
 Norbert Buchmuller
 Johannes Buchner
 Sean Burke
+Gabriel Burt
 Thomas Butter
 Trevor Caira
 Andrea Canciani
diff -r 38cd00d46b4d -r d5b710c91104 ChangeLog
--- a/ChangeLog	Mon Jan 10 01:17:34 2011 +0000
+++ b/ChangeLog	Mon Jan 10 03:30:05 2011 +0000
@@ -10,6 +10,10 @@
 	* Perl bindings now respect LDFLAGS. (Peter Volkov, Markos Chandras)
 	  (#12638)
 
+	Groupwise:
+	* Don't show two windows when using "Get Info" on a buddy. (Gabriel Burt;
+	  Novell, Inc.) (#13108)
+
 	IRC:
 	* Don't send ISON messages longer than 512 bytes. (Jeffrey Honig) (#9692)
 
diff -r 38cd00d46b4d -r d5b710c91104 libpurple/protocols/novell/novell.c
--- a/libpurple/protocols/novell/novell.c	Mon Jan 10 01:17:34 2011 +0000
+++ b/libpurple/protocols/novell/novell.c	Mon Jan 10 03:30:05 2011 +0000
@@ -74,7 +74,7 @@
 _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 @@
 		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 @@
 
 /* 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 @@
 		}
 	}
 
-	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 @@
 
 		user_record = nm_find_user_record(user, name);
 		if (user_record) {
-
-			_show_info(gc, user_record);
+			_show_info(gc, user_record, g_strdup(name));
 
 		} else {
-
 			rc = nm_send_get_details(user, name,
 									 _get_details_resp_show_info, g_strdup(name));