Mercurial > pidgin
changeset 30638:bbf7096ae66c
merge of '598ef461d4de936afef7298e55152cc7ecaa9b70'
and 'b4c65c273f2934560d9e643a124b31ac2d2328f2'
| author | ivan.komarov@soc.pidgin.im |
|---|---|
| date | Wed, 27 Oct 2010 18:26:14 +0000 |
| parents | e7365705f151 (diff) a1964c506f29 (current diff) |
| children | 1d5f8e977b54 |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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 */