Mercurial > pidgin3 / changeset

--- a/pidgin/gtkdebug.c	Fri Nov 23 17:30:34 2012 +0100
+++ b/pidgin/gtkdebug.c	Sat Nov 24 19:30:32 2012 +0100
@@ -109,7 +109,8 @@
 		text = gtk_entry_get_text(GTK_ENTRY(debug_win->expression));
 		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/debug/regex", text);
 	}
-	g_regex_unref(debug_win->regex);
+	if (debug_win->regex != NULL)
+		g_regex_unref(debug_win->regex);
 
 	/* If the "Save Log" dialog is open then close it */
 	purple_request_close_with_handle(debug_win);

--- a/pidgin/pixmaps/Makefile.am	Fri Nov 23 17:30:34 2012 +0100
+++ b/pidgin/pixmaps/Makefile.am	Sat Nov 24 19:30:32 2012 +0100
@@ -297,6 +297,7 @@
 		protocols/48/bonjour.png \
 		protocols/48/facebook.png \
 		protocols/48/gadu-gadu.png \
+		protocols/48/google-talk.png \
 		protocols/48/novell.png \
 		protocols/48/icq.png \
 		protocols/48/irc.png \

Binary file pidgin/pixmaps/protocols/48/google-talk.png has changed

--- a/pidgin/smileyparser.c	Fri Nov 23 17:30:34 2012 +0100
+++ b/pidgin/smileyparser.c	Sat Nov 24 19:30:32 2012 +0100
@@ -151,7 +151,7 @@
 	}
 
 	/* now for each theme smiley, observe that this does look nasty */
-	if (!current_smiley_theme || !(current_smiley_theme->list)) {
+	if (!current_smiley_theme) {
 		purple_debug_warning("smiley", "theme does not exist\n");
 		return temp;
 	}