im.pidgin.pidgin.2.2.2: 16d41f5173adb77fade74bfb21aad4271285f5e3

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: 16d41f5173adb77fade74bfb21aad4271285f5e3
Ancestor: 3868e72051e17cc0d6f1d1172fee9109b6e4296f
Author: lschiere at pidgin.im
Date: 2007-10-21T04:49:28
Branch: im.pidgin.pidgin.2.2.2

Modified files:
        libpurple/plugins/log_reader.c libpurple/prefs.c
        libpurple/protocols/oscar/oscar.c pidgin/gtkutils.c

ChangeLog: 

applied changes from 29b2fc4762e2c5d03a7100c78f2a7b49237c5e80
             through f4cb0b01008f7485ff8e336ba2be02072dfef04e

-------------- next part --------------
============================================================
--- libpurple/plugins/log_reader.c	fd1d15603831b28da7384369eeb4959d0b7be10c
+++ libpurple/plugins/log_reader.c	879925ba9e7b906f09345aa73f82564a14d6d5f1
@@ -2453,14 +2453,16 @@ init_plugin(PurplePlugin *plugin)
 static void
 init_plugin(PurplePlugin *plugin)
 {
+
+}
+
+static void log_reader_init_prefs() {
 	char *path;
 #ifdef _WIN32
 	char *folder;
 	gboolean found = FALSE;
 #endif
 
-	g_return_if_fail(plugin != NULL);
-
 	purple_prefs_add_none("/plugins/core/log_reader");
 
 
@@ -2719,6 +2721,8 @@ plugin_load(PurplePlugin *plugin)
 {
 	g_return_val_if_fail(plugin != NULL, FALSE);
 
+	log_reader_init_prefs();
+
 	/* The names of IM clients are marked for translation at the request of
 	   translators who wanted to transliterate them.  Many translators
 	   choose to leave them alone.  Choose what's best for your language. */
============================================================
--- libpurple/prefs.c	d9cb5cacd5a22cf75996e0eb7bfac0c7b887e63f
+++ libpurple/prefs.c	616d5c77c84b471c716ade5f430cf1d590326c88
@@ -297,6 +297,7 @@ prefs_start_element_handler (GMarkupPars
 						g_filename_from_utf8(pref_value, -1, NULL, NULL, NULL));
 			}
 		}
+		g_string_free(pref_name_full, TRUE);
 	} else {
 		char *decoded;
 
============================================================
--- libpurple/protocols/oscar/oscar.c	379e968b0d240132dea236869db9d3b74f33045c
+++ libpurple/protocols/oscar/oscar.c	6f7b169436ff9d9d351d75c4fade61a6e2958902
@@ -5006,6 +5006,7 @@ static int purple_ssi_parselist(OscarDat
 					g = purple_group_new(gname_utf8);
 					purple_blist_add_group(g, NULL);
 				}
+				g_free(gname_utf8);
 			} break;
 
 			case 0x0002: { /* Permit buddy */
============================================================
--- pidgin/gtkutils.c	04771b82cd667c74ccf31f582e6de3502242f5d3
+++ pidgin/gtkutils.c	bb6fdf091be3c1589f637f07959bfa346078712a
@@ -850,16 +850,14 @@ pidgin_check_if_dir(const char *path, Gt
 gboolean
 pidgin_check_if_dir(const char *path, GtkFileSelection *filesel)
 {
-	char *dirname;
+	char *dirname = NULL;
 
 	if (g_file_test(path, G_FILE_TEST_IS_DIR)) {
 		/* append a / if needed */
 		if (path[strlen(path) - 1] != G_DIR_SEPARATOR) {
 			dirname = g_strconcat(path, G_DIR_SEPARATOR_S, NULL);
-		} else {
-			dirname = g_strdup(path);
 		}
-		gtk_file_selection_set_filename(filesel, dirname);
+		gtk_file_selection_set_filename(filesel, (dirname != NULL) ? dirname : path);
 		g_free(dirname);
 		return TRUE;
 	}
@@ -1178,14 +1176,15 @@ pidgin_set_accessible_relations (GtkWidg
 	label = gtk_widget_get_accessible (l);
 
 	/* Make sure mnemonics work */
-        gtk_label_set_mnemonic_widget(GTK_LABEL(l), w);
-	
+	gtk_label_set_mnemonic_widget(GTK_LABEL(l), w);
+
 	/* Create the labeled-by relation */
 	set = atk_object_ref_relation_set (acc);
 	rel_obj[0] = label;
 	relation = atk_relation_new (rel_obj, 1, ATK_RELATION_LABELLED_BY);
 	atk_relation_set_add (set, relation);
 	g_object_unref (relation);
+	g_object_unref(set);
 
 	/* Create the label-for relation */
 	set = atk_object_ref_relation_set (label);
@@ -1193,6 +1192,7 @@ pidgin_set_accessible_relations (GtkWidg
 	relation = atk_relation_new (rel_obj, 1, ATK_RELATION_LABEL_FOR);
 	atk_relation_set_add (set, relation);
 	g_object_unref (relation);
+	g_object_unref(set);
 }
 
 void