# HG changeset patch # User Richard Laager # Date 1185062890 0 # Node ID 9aaa71430d7e7e5383c70d90e2be722735208877 # Parent 5b087dd2ad14ae483becbbbee252a8aa52b25533# Parent 3d47d8b63f6add164d6c122d2eb1c0f954bbec72 merge of '5b087dd2ad14ae483becbbbee252a8aa52b25533' and '3d47d8b63f6add164d6c122d2eb1c0f954bbec72' diff -r 5b087dd2ad14 -r 9aaa71430d7e configure.ac --- a/configure.ac Sat Jul 21 23:08:15 2007 +0000 +++ b/configure.ac Sun Jul 22 00:08:10 2007 +0000 @@ -2069,6 +2069,8 @@ pidgin/pixmaps/icons/Makefile pidgin/pixmaps/icons/16/Makefile pidgin/pixmaps/icons/16/scalable/Makefile + pidgin/pixmaps/icons/22/Makefile + pidgin/pixmaps/icons/22/scalable/Makefile pidgin/pixmaps/icons/24/Makefile pidgin/pixmaps/icons/24/scalable/Makefile pidgin/pixmaps/icons/32/Makefile diff -r 5b087dd2ad14 -r 9aaa71430d7e pidgin/pixmaps/icons/22/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/22/Makefile.am Sun Jul 22 00:08:10 2007 +0000 @@ -0,0 +1,8 @@ +SUBDIRS = scalable + +EXTRA_DIST = pidgin.png + +pidginiconspixdir = $(datadir)/icons/hicolor/24x24/apps + +pidginiconspix_DATA = $(EXTRA_DIST) + diff -r 5b087dd2ad14 -r 9aaa71430d7e pidgin/pixmaps/icons/22/pidgin.png Binary file pidgin/pixmaps/icons/22/pidgin.png has changed diff -r 5b087dd2ad14 -r 9aaa71430d7e pidgin/pixmaps/icons/22/scalable/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/22/scalable/Makefile.am Sun Jul 22 00:08:10 2007 +0000 @@ -0,0 +1,1 @@ +EXTRA_DIST = pidgin.svg diff -r 5b087dd2ad14 -r 9aaa71430d7e pidgin/pixmaps/icons/22/scalable/pidgin.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/22/scalable/pidgin.svg Sun Jul 22 00:08:10 2007 +0000 @@ -0,0 +1,591 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff -r 5b087dd2ad14 -r 9aaa71430d7e pidgin/plugins/gevolution/gevolution.c --- a/pidgin/plugins/gevolution/gevolution.c Sat Jul 21 23:08:15 2007 +0000 +++ b/pidgin/plugins/gevolution/gevolution.c Sun Jul 22 00:08:10 2007 +0000 @@ -227,11 +227,13 @@ if (app != NULL) { char *command_line = g_strdup_printf("%s mailto:%s", app, mail); + char *quoted = g_shell_quote(command_line); g_free(app); g_free(mail); - g_spawn_command_line_async(command_line, NULL); + g_spawn_command_line_async(quoted, NULL); g_free(command_line); + g_free(quoted); } else {