[Xfce4-commits] <midori:master> Always initialize variables in speeddial_new_from_file

[Christian Dywan]

Updating branch refs/heads/master
         to 648610ef661c058fba1aa58a2295d291ef04e318 (commit)
       from a8ce104d86c46ae23dfbfb4af298d4b168d4bf56 (commit)

commit 648610ef661c058fba1aa58a2295d291ef04e318
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Mar 22 22:50:08 2011 +0100

    Always initialize variables in speeddial_new_from_file

 midori/main.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 7d16874..32fc74e 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1494,8 +1494,8 @@ speeddial_new_from_file (const gchar* config,
     {
         gchar* key;
         gchar* val;
-        gchar* slot;
-        gchar* dial_id;
+        gchar* slot = NULL;
+        gchar* dial_id = NULL;
         gchar* uri;
         gchar** values = g_strsplit (parts[i], "\"", -1);
 
@@ -1568,10 +1568,10 @@ speeddial_new_from_file (const gchar* config,
                 thumb_size = atoi (g_strndup (val + 1, strlen (val) - 3));
                 if (thumb_size == 80)
                     thumb_size_type = g_strdup ("SMALL");
-                else if (thumb_size == 160)
-                    thumb_size_type = g_strdup ("MEDIUM");
                 else if (thumb_size == 240)
                     thumb_size_type = g_strdup ("BIG");
+                else /* if (thumb_size == 160) */
+                    thumb_size_type = g_strdup ("MEDIUM");
                 g_key_file_set_value (key_file, "settings", "size", thumb_size_type);
 
                 g_free (thumb_size_type);