rpms/gaim/devel gaim-2.0.0-beta3-silc-realname.patch, NONE, 1.1 gaim.spec, 1.126, 1.127

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25977

Modified Files:
	gaim.spec 
Added Files:
	gaim-2.0.0-beta3-silc-realname.patch 
Log Message:
SILC blank realname failure fix (#173076)


gaim-2.0.0-beta3-silc-realname.patch:
 silc.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE gaim-2.0.0-beta3-silc-realname.patch ---
--- branches/v2_0_0/src/protocols/silc/silc.c	2006/07/01 15:20:58	16384
+++ branches/v2_0_0/src/protocols/silc/silc.c	2006/07/01 15:33:43	16385
@@ -268,6 +268,7 @@
 	GaimConnection *gc;
 	char pkd[256], prd[256];
 	const char *cipher, *hmac;
+	char *realname;
 	int i;
 
 	gc = account->gc;
@@ -298,11 +299,16 @@
 		client->username = silc_get_username();
 		gaim_account_set_username(account, client->username);
 	}
+	realname = silc_get_real_name();
 	if (gaim_account_get_user_info(account)) {
 		client->realname = strdup(gaim_account_get_user_info(account));
-	} else {
-		client->realname = silc_get_real_name();
+		free(realname);
+	} else if ((silc_get_real_name() != NULL) && (*realname != '\0')) {
+		client->realname = realname;
 		gaim_account_set_user_info(account, client->realname);
+	} else {
+		free(realname);
+		client->realname = strdup(_("Gaim User"));
 	}
 	client->hostname = silc_net_localhost();
 


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- gaim.spec	29 Jun 2006 17:29:03 -0000	1.126
+++ gaim.spec	5 Jul 2006 23:09:58 -0000	1.127
@@ -27,7 +27,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.5.%{betaver}%{?dist}
+Release:	0.6.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -48,10 +48,13 @@
 # - Smiley Theme "Default"
 Source1:	gaim-fedora-prefs.xml
 
+
 ## Patches 0-99: Fedora specific or upstream wont accept
-# to be replaced by upstream fix
 Patch5:		gaim2-PIE.patch
 
+## Patches 100+: To be Included in Future Upstream
+Patch181: gaim-2.0.0-beta3-silc-realname.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
 
@@ -145,7 +148,10 @@
 
 %prep
 %setup -q -n gaim-%{version}%{betaver}
+## Patches 0-99: Fedora specific or upstream wont accept
 %patch5 -p1
+## Patches 100+: To be Included in Future Upstream
+%patch181 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -283,6 +289,9 @@
 %{_libdir}/libgaim-client.so
 
 %changelog
+* Wed Jul 05 2006 Warren Togami <wtogami at redhat.com> 2.0.0-0.6.beta3
+- SILC blank realname failure fix (#173076)
+
 * Thu Jun 29 2006 Warren Togami <wtogami at redhat.com> 2.0.0-0.5.beta3
 - buildreq libSM-devel (#197241)