summaryrefslogtreecommitdiff
path: root/panels
diff options
context:
space:
mode:
authorAndré Auzi <aauzi@free.fr>2014-01-25 00:04:05 +0100
committerAndré Auzi <aauzi@free.fr>2014-01-25 00:04:05 +0100
commitd94ebfc020c02e3314d5d6795128b010ab0cb9fb (patch)
tree466a5d08a54bea6a1b92b852b397d60e76f55be5 /panels
parent7f0e57b539065f6f4c1c8ba159cd846528a7c7b1 (diff)
parentb62a32b5474d0446320fe675d02086bab1462e5a (diff)
downloadmidori-d94ebfc020c02e3314d5d6795128b010ab0cb9fb.tar.gz
merge lp:midori
Diffstat (limited to 'panels')
-rw-r--r--panels/midori-bookmarks.c4
-rw-r--r--panels/midori-history.c1
2 files changed, 0 insertions, 5 deletions
diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index 63c5f79b..91e27e5d 100644
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -366,7 +366,6 @@ static void
midori_bookmarks_add_item (KatzeItem* item,
MidoriBookmarks* bookmarks)
{
- gint64 id = katze_item_get_meta_integer (item, "id");
gint64 parentid = katze_item_get_meta_integer (item, "parentid");
GtkTreeModel* model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview));
GtkTreeIter iter;
@@ -649,9 +648,6 @@ static void
midori_bookmarks_statusbar_update (MidoriBookmarks *bookmarks)
{
gchar* text = NULL;
- GtkTreeModel* model;
- GtkTreeIter iter;
- gboolean selected;
if (bookmarks->hovering_item)
{
diff --git a/panels/midori-history.c b/panels/midori-history.c
index c3f1c340..5d6f2e65 100644
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -662,7 +662,6 @@ midori_history_open_in_tab_activate_cb (GtkWidget* menuitem,
{
KatzeItem* item;
const gchar* uri;
- guint n;
item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
if (KATZE_ITEM_IS_FOLDER (item))