Updating branch refs/heads/master
to 92e21d50ad7b5b24bc07e425cb20eccb57e05826 (commit)
from 7f91e0985fd87df4302ae35f3c55763281bacdc9 (commit)
commit 92e21d50ad7b5b24bc07e425cb20eccb57e05826
Author: Christian Dywan <[email protected]>
Date: Sat Jul 28 10:27:59 2012 +0200
No "New Tab" in toolbar editor with Granite
Fixes: https://bugs.launchpad.net/midori/+bug/1029616
extensions/toolbar-editor.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/extensions/toolbar-editor.c b/extensions/toolbar-editor.c
index f330aa9..9348668 100644
--- a/extensions/toolbar-editor.c
+++ b/extensions/toolbar-editor.c
@@ -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++;
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
