merge of 'fa9915cd51dd246df4da0b69b8800a11a8bc0281'

Mon, 26 Mar 2007 03:58:42 +0000

author
Sadrul Habib Chowdhury <sadrul@pidgin.im>
date
Mon, 26 Mar 2007 03:58:42 +0000
changeset 15989
2023148e9514
parent 15988
fa9915cd51dd (current diff)
parent 15987
71d668c3d56d (diff)
child 15990
8f3cecb0bf47

merge of 'fa9915cd51dd246df4da0b69b8800a11a8bc0281'
and '71d668c3d56df7b83a6788dfc76dfb100cd3aeac'

finch/libgnt/gntfilesel.c file | annotate | diff | comparison | revisions
finch/libgnt/gntfilesel.h file | annotate | diff | comparison | revisions
pidgin/pixmaps/Makefile.am file | annotate | diff | comparison | revisions
--- a/finch/libgnt/gntfilesel.c	Mon Mar 26 02:48:09 2007 +0000
+++ b/finch/libgnt/gntfilesel.c	Mon Mar 26 03:58:42 2007 +0000
@@ -492,3 +492,27 @@
 	return list;
 }
 
+void gnt_file_sel_set_multi_select(GntFileSel *sel, gboolean set)
+{
+	sel->multiselect = set;
+}
+
+GList *gnt_file_sel_get_selected_multi_files(GntFileSel *sel)
+{
+	GList *list = NULL, *iter;
+	char *str = gnt_file_sel_get_selected_file(sel);
+
+	for (iter = sel->tags; iter; iter = iter->next) {
+		list = g_list_prepend(list, g_strdup(iter->data));
+		if (g_utf8_collate(str, iter->data)) {
+			g_free(str);
+			str = NULL;
+		}
+	}
+	if (str)
+		list = g_list_prepend(list, str);
+	list = g_list_reverse(list);
+	return list;
+}
+
+
--- a/finch/libgnt/gntfilesel.h	Mon Mar 26 02:48:09 2007 +0000
+++ b/finch/libgnt/gntfilesel.h	Mon Mar 26 03:58:42 2007 +0000
@@ -76,3 +76,4 @@
 G_END_DECLS
 
 #endif /* GNT_FILE_SEL_H */
+
--- a/pidgin/pixmaps/Makefile.am	Mon Mar 26 02:48:09 2007 +0000
+++ b/pidgin/pixmaps/Makefile.am	Mon Mar 26 03:58:42 2007 +0000
@@ -62,4 +62,8 @@
 
 
 distpixmapdir = $(datadir)/pixmaps
-distpixmap_DATA = pidgin.png pidgin.svg
\ No newline at end of file
+distpixmap_DATA = pidgin.png pidgin.svg
+
+
+
+

mercurial