Mercurial > pidgin.yaz

changeset 12212:c9a943c60c33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 14514] I think this is what was intended here committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Thu, 24 Nov 2005 15:39:34 +0000
parents cc917559894b
children 4e7ba55a1db2
files src/protocols/yahoo/yahoochat.c
diffstat 1 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoochat.c	Thu Nov 24 15:14:00 2005 +0000
+++ b/src/protocols/yahoo/yahoochat.c	Thu Nov 24 15:39:34 2005 +0000
@@ -1344,16 +1344,18 @@
 {
 	struct yahoo_roomlist *yrl;
 	GaimRoomlist *rl;
+	const char *rll;
 	char *url;
 	GList *fields = NULL;
 	GaimRoomlistField *f;
 
-	if (YAHOO_ROOMLIST_LOCALE) {
+	rll = gaim_account_get_string(gaim_connection_get_account(gc),
+								  "room_list_locale", YAHOO_ROOMLIST_LOCALE);
+
+	if (rll != NULL && *rll != '\0') {
 		url = g_strdup_printf("%s?chatcat=0&intl=%s",
 	        gaim_account_get_string(gaim_connection_get_account(gc),
-	        "room_list", YAHOO_ROOMLIST_URL),
-	        gaim_account_get_string(gaim_connection_get_account(gc),
-	        "room_list_locale", YAHOO_ROOMLIST_LOCALE));
+	        "room_list", YAHOO_ROOMLIST_URL), rll);
 	} else {
 		url = g_strdup_printf("%s?chatcat=0",
 	        gaim_account_get_string(gaim_connection_get_account(gc),
@@ -1422,6 +1424,7 @@
 	struct yahoo_roomlist *yrl;
 	char *url;
 	char *id;
+	const char *rll;
 
 	if (category->type != GAIM_ROOMLIST_ROOMTYPE_CATEGORY)
 		return;
@@ -1431,11 +1434,13 @@
 		return;
 	}
 
-	if (YAHOO_ROOMLIST_LOCALE) {
+	rll = gaim_account_get_string(list->account, "room_list_locale",
+								  YAHOO_ROOMLIST_LOCALE);
+
+	if (rll != NULL && *rll != '\0') {
 		url = g_strdup_printf("%s?chatroom_%s=0&intl=%s",
-	       gaim_account_get_string(list->account,"room_list", 
-	       YAHOO_ROOMLIST_URL), id, gaim_account_get_string(list->account,
-	       "room_list_locale", YAHOO_ROOMLIST_LOCALE));
+	       gaim_account_get_string(list->account,"room_list",
+	       YAHOO_ROOMLIST_URL), id, rll);
 	} else {
 		url = g_strdup_printf("%s?chatroom_%s=0",
 	       gaim_account_get_string(list->account,"room_list",