Updating branch refs/heads/master to 2fe50cc3131476118c58fd7affb1431ddf5e3524 (commit) from d74bee7bc88f9b36488a63a216f82b26ca4d953d (commit)
commit 2fe50cc3131476118c58fd7affb1431ddf5e3524 Author: Christian Dywan <christ...@twotoasts.de> Date: Sat Apr 20 02:19:37 2013 +0200 Fix feed panel default value crash extensions/feed-panel/main.c | 17 ++++------------- midori/midori-extension.c | 3 +++ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/extensions/feed-panel/main.c b/extensions/feed-panel/main.c index 7d8b89e..a578419 100644 --- a/extensions/feed-panel/main.c +++ b/extensions/feed-panel/main.c @@ -105,12 +105,6 @@ static KatzeArray* feed_add_item (KatzeArray* feeds, const gchar* uri) { - KatzeArray* feed; - - feed = NULL; - - if (uri) - { if (katze_array_find_token (feeds, uri)) { GtkWidget* dialog; @@ -124,22 +118,21 @@ feed_add_item (KatzeArray* feeds, gtk_widget_show (dialog); g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog); - + return NULL; } else { KatzeArray* child; - feed = katze_array_new (KATZE_TYPE_ARRAY); + KatzeArray* feed = katze_array_new (KATZE_TYPE_ARRAY); child = katze_array_new (KATZE_TYPE_ITEM); katze_item_set_uri (KATZE_ITEM (feed), uri); katze_item_set_token (KATZE_ITEM (feed), uri); katze_item_set_uri (KATZE_ITEM (child), uri); katze_array_add_item (feeds, feed); katze_array_add_item (feed, child); + return feed; } - } - return feed; } static void @@ -503,7 +496,6 @@ MidoriExtension* extension_init (void) { MidoriExtension* extension; - gchar* sfeed[2]; extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", _("Feed Panel"), @@ -512,8 +504,7 @@ extension_init (void) "authors", "Dale Whittaker <da...@users.sf.net>", NULL); - sfeed[0] = NULL; - midori_extension_install_string_list (extension, "feeds", sfeed, 1); + midori_extension_install_string_list (extension, "feeds", NULL, 0); g_signal_connect (extension, "activate", G_CALLBACK (feed_activate_cb), NULL); diff --git a/midori/midori-extension.c b/midori/midori-extension.c index b712c80..4d5d63d 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -389,7 +389,10 @@ midori_extension_activate_cb (MidoriExtension* extension, setting_->value = g_key_file_get_string_list (extension->priv->key_file, "settings", setting->name, &setting_->length, NULL); if (setting_->value == NULL) + { setting_->value = g_strdupv (setting_->default_value); + setting_->length = setting_->default_length; + } } else setting_->value = g_strdupv (setting_->default_value); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits