Mercurial > pidgin3 / changeset

--- a/libpurple/plugin.c	Tue Feb 26 18:28:49 2013 -0500
+++ b/libpurple/plugin.c	Tue Feb 26 18:57:41 2013 -0500
@@ -1375,7 +1375,7 @@
 				path = g_build_filename(search_path, file, NULL);
 
 				if (ext == NULL || has_file_extension(file, ext))
-					plugin = purple_plugin_probe(path);
+					purple_plugin_probe(path);
 
 				g_free(path);
 			}

--- a/libpurple/pounce.c	Tue Feb 26 18:28:49 2013 -0500
+++ b/libpurple/pounce.c	Tue Feb 26 18:57:41 2013 -0500
@@ -220,7 +220,7 @@
 	g_hash_table_foreach(pounce->actions, action_parameter_list_to_xmlnode, child);
 
 	if (purple_pounce_get_save(pounce))
-		child = xmlnode_new_child(node, "save");
+		xmlnode_new_child(node, "save");
 
 	return node;
 }

--- a/libpurple/protocols/jabber/google/google_session.c	Tue Feb 26 18:28:49 2013 -0500
+++ b/libpurple/protocols/jabber/google/google_session.c	Tue Feb 26 18:57:41 2013 -0500
@@ -501,8 +501,7 @@
 
 	for (codec_element = xmlnode_get_child(session->description, "payload-type");
 	     codec_element; codec_element = codec_element->next) {
-		const char *id, *encoding_name,  *clock_rate,
-				*width, *height, *framerate;
+		const char *id, *encoding_name,  *clock_rate;
 		gboolean video;
 		if (codec_element->name &&
 				strcmp(codec_element->name, "payload-type"))
@@ -518,10 +517,10 @@
 					codec_element, "clockrate");
 			video = FALSE;
 		} else {
-			width = xmlnode_get_attrib(codec_element, "width");
+			/*width = xmlnode_get_attrib(codec_element, "width");
 			height = xmlnode_get_attrib(codec_element, "height");
 			framerate = xmlnode_get_attrib(
-					codec_element, "framerate");
+					codec_element, "framerate");*/
 			clock_rate = "90000";
 			video = TRUE;
 		}
@@ -716,7 +715,7 @@
 
 	for (; codec_element; codec_element = codec_element->next) {
 		const gchar *xmlns, *encoding_name, *id,
-				*clock_rate, *width, *height, *framerate;
+				*clock_rate;
 		gboolean video_codec = FALSE;
 
 		if (!purple_strequal(codec_element->name, "payload-type"))
@@ -731,10 +730,10 @@
 					codec_element, "clockrate");
 		else {
 			clock_rate = "90000";
-			width = xmlnode_get_attrib(codec_element, "width");
+			/*width = xmlnode_get_attrib(codec_element, "width");
 			height = xmlnode_get_attrib(codec_element, "height");
 			framerate = xmlnode_get_attrib(
-					codec_element, "framerate");
+					codec_element, "framerate");*/
 			video_codec = TRUE;
 		}
 

--- a/libpurple/protocols/novell/nmrtf.c	Tue Feb 26 18:28:49 2013 -0500
+++ b/libpurple/protocols/novell/nmrtf.c	Tue Feb 26 18:57:41 2013 -0500
@@ -315,7 +315,6 @@
 			purple_debug_info("novell", "Unhandled font charset %d\n", font->charset);
 			return "CP1252";
 	}
-	return "CP1252";
 }
 
 

--- a/pidgin/gtkmain.c	Tue Feb 26 18:28:49 2013 -0500
+++ b/pidgin/gtkmain.c	Tue Feb 26 18:57:41 2013 -0500
@@ -485,7 +485,6 @@
 #ifdef HAVE_SIGNAL_H
 	int sig_indx;	/* for setting up signal catching */
 	sigset_t sigset;
-	RETSIGTYPE (*prev_sig_disp)(int);
 	char errmsg[BUFSIZ];
 	GIOChannel *signal_channel;
 	GIOStatus signal_status;
@@ -618,7 +617,7 @@
 		perror(errmsg);
 	}
 	for(sig_indx = 0; catch_sig_list[sig_indx] != -1; ++sig_indx) {
-		if((prev_sig_disp = signal(catch_sig_list[sig_indx], sighandler)) == SIG_ERR) {
+		if(signal(catch_sig_list[sig_indx], sighandler) == SIG_ERR) {
 			snprintf(errmsg, sizeof(errmsg), "Warning: couldn't set signal %d for catching",
 				catch_sig_list[sig_indx]);
 			perror(errmsg);
@@ -630,7 +629,7 @@
 		}
 	}
 	for(sig_indx = 0; ignore_sig_list[sig_indx] != -1; ++sig_indx) {
-		if((prev_sig_disp = signal(ignore_sig_list[sig_indx], SIG_IGN)) == SIG_ERR) {
+		if(signal(ignore_sig_list[sig_indx], SIG_IGN) == SIG_ERR) {
 			snprintf(errmsg, sizeof(errmsg), "Warning: couldn't set signal %d to ignore",
 				ignore_sig_list[sig_indx]);
 			perror(errmsg);

--- a/pidgin/gtkpounce.c	Tue Feb 26 18:28:49 2013 -0500
+++ b/pidgin/gtkpounce.c	Tue Feb 26 18:57:41 2013 -0500
@@ -1410,10 +1410,8 @@
 
 	if (purple_pounce_action_is_enabled(pounce, "open-window"))
 	{
-		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, pouncee, account);
-
-		if (conv == NULL)
-			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, pouncee);
+		if (!purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, pouncee, account))
+			purple_conversation_new(PURPLE_CONV_TYPE_IM, account, pouncee);
 	}
 
 	if (purple_pounce_action_is_enabled(pounce, "popup-notify"))

--- a/pidgin/gtkutils.c	Tue Feb 26 18:28:49 2013 -0500
+++ b/pidgin/gtkutils.c	Tue Feb 26 18:57:41 2013 -0500
@@ -1661,12 +1661,10 @@
 			const char *itemname = NULL;
 
 			const char * const *langs;
-			int i;
 			langs = g_get_language_names();
-			for (i = 0; langs[i]; i++) {
-				g_snprintf(key, sizeof(key), "Name[%s]", langs[i]);
+			if (langs[0]) {
+				g_snprintf(key, sizeof(key), "Name[%s]", langs[0]);
 				itemname = purple_desktop_item_get_string(item, key);
-				break;
 			}
 
 			if (!itemname)