changeset
merge of '3edf77c86d982862cc79028648480233a46e5f05'
Wed, 27 Oct 2010 18:26:14 +0000
- author
- Ivan Komarov <ivan.komarov@pidgin.im>
- date
- Wed, 27 Oct 2010 18:26:14 +0000
- changeset 30879
- 15db5d302664
- parent 30878
- 3edf77c86d98 (diff)
- parent 30874
- f04d2d1937e6 (current diff)
- child 30880
- 7edf413efe1c
merge of '3edf77c86d982862cc79028648480233a46e5f05'
and 'f04d2d1937e6c62c578786b3405b07c04c2a4e96'
--- a/libpurple/protocols/bonjour/bonjour.c Wed Oct 27 18:24:12 2010 +0000 +++ b/libpurple/protocols/bonjour/bonjour.c Wed Oct 27 18:26:14 2010 +0000 @@ -189,7 +189,8 @@ purple_xfer_cancel_local(bd->xfer_lists->data); } - g_free(bd->jid); + if (bd != NULL) + g_free(bd->jid); g_free(bd); connection->proto_data = NULL; }
--- a/pidgin/minidialog.c Wed Oct 27 18:24:12 2010 +0000 +++ b/pidgin/minidialog.c Wed Oct 27 18:26:14 2010 +0000 @@ -332,6 +332,7 @@ break; case PROP_CUSTOM_ICON: gtk_image_set_from_pixbuf(priv->icon, g_value_get_object(value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); }
--- a/pidgin/plugins/win32/winprefs/winprefs.c Wed Oct 27 18:24:12 2010 +0000 +++ b/pidgin/plugins/win32/winprefs/winprefs.c Wed Oct 27 18:26:14 2010 +0000 @@ -193,7 +193,7 @@ char *runval = NULL; if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) - runval = g_strdup_printf("%s" G_DIR_SEPARATOR_S "pidgin.exe", wpurple_install_dir()); + runval = g_strdup_printf("\"%s" G_DIR_SEPARATOR_S "pidgin.exe\"", wpurple_install_dir()); if(!wpurple_write_reg_string(HKEY_CURRENT_USER, RUNKEY, "Pidgin", runval) /* For Win98 */
