]> spindle.queued.net Git - midori/commitdiff
No "New Tab" in toolbar editor with Granite
authorChristian Dywan <christian@twotoasts.de>
Sat, 28 Jul 2012 08:27:59 +0000 (10:27 +0200)
committerChristian Dywan <christian@twotoasts.de>
Sat, 28 Jul 2012 08:46:04 +0000 (10:46 +0200)
Fixes: https://bugs.launchpad.net/midori/+bug/1029616
extensions/toolbar-editor.c

index f330aa9d859be18fc74415dfddd172f7a1a6521a..934866828015bf1adde9789ac5ad602a6b7472b2 100644 (file)
@@ -104,7 +104,12 @@ static GSList *tb_editor_array_to_list(const gchar **items)
        name = items;
        while (*name != NULL)
        {
+               #ifdef HAVE_GRANITE
+               /* A "new tab" button is already part of the notebook */
+               if (*name[0] != '\0' && strcmp (*name, "TabNew"))
+               #else
                if (*name[0] != '\0')
+               #endif
                        list = g_slist_append(list, g_strdup(*name));
                name++;
        }