[epiphany] cookies-dialog: remove empty "domain name" column
- From: Claudio Saavedra <csaavedra src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] cookies-dialog: remove empty "domain name" column
- Date: Thu, 12 Dec 2013 16:51:49 +0000 (UTC)
commit 3ab447b7d868bfa621b72398859e70eaeaf0c1d6
Author: Claudio Saavedra <csaavedra igalia com>
Date: Thu Dec 12 17:49:18 2013 +0100
cookies-dialog: remove empty "domain name" column
WK2 doesn't give us access to this, so let's remove it.
https://bugzilla.gnome.org/show_bug.cgi?id=703492
src/cookies-dialog.c | 9 +++------
src/resources/cookies-dialog.ui | 21 ++-------------------
2 files changed, 5 insertions(+), 25 deletions(-)
---
diff --git a/src/cookies-dialog.c b/src/cookies-dialog.c
index cd4f1c2..f0cf1fc 100644
--- a/src/cookies-dialog.c
+++ b/src/cookies-dialog.c
@@ -35,7 +35,6 @@ enum
{
COL_COOKIES_HOST,
COL_COOKIES_HOST_KEY,
- COL_COOKIES_NAME,
COL_COOKIES_DATA,
};
@@ -272,8 +271,8 @@ cookie_add (CookiesDialog *dialog,
char *domain = (char *) data;
GtkListStore *store;
GtkTreeIter iter;
- int column[4] = { COL_COOKIES_HOST, COL_COOKIES_HOST_KEY, COL_COOKIES_NAME, COL_COOKIES_DATA };
- GValue value[4] = { { 0, }, { 0, }, { 0, }, { 0, } };
+ int column[3] = { COL_COOKIES_HOST, COL_COOKIES_HOST_KEY, COL_COOKIES_DATA };
+ GValue value[3] = { { 0, }, { 0, }, { 0, } };
store = GTK_LIST_STORE (dialog->priv->liststore);
@@ -285,8 +284,7 @@ cookie_add (CookiesDialog *dialog,
g_value_init (&value[0], G_TYPE_STRING);
g_value_init (&value[1], G_TYPE_STRING);
- g_value_init (&value[2], G_TYPE_STRING);
- g_value_init (&value[3], SOUP_TYPE_COOKIE);
+ g_value_init (&value[2], SOUP_TYPE_COOKIE);
g_value_set_static_string (&value[0], domain);
g_value_take_string (&value[1], ephy_string_collate_key_for_domain (domain, -1));
@@ -298,7 +296,6 @@ cookie_add (CookiesDialog *dialog,
g_value_unset (&value[0]);
g_value_unset (&value[1]);
g_value_unset (&value[2]);
- g_value_unset (&value[3]);
}
static int
diff --git a/src/resources/cookies-dialog.ui b/src/resources/cookies-dialog.ui
index 1a606f3..eddd6f4 100644
--- a/src/resources/cookies-dialog.ui
+++ b/src/resources/cookies-dialog.ui
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Mon Dec 9 18:02:43 2013 -->
+<!-- Generated with glade 3.16.0 -->
<interface>
- <!-- interface-requires gtk+ 3.10 -->
+ <requires lib="gtk+" version="3.10"/>
<object class="GtkListStore" id="liststore">
<columns>
<!-- column-name HOST -->
<column type="gchararray"/>
<!-- column-name HOST_KEY -->
<column type="gchararray"/>
- <!-- column-name NAME -->
- <column type="gchararray"/>
<!-- column-name DATA -->
<column type="SoupCookie"/>
</columns>
@@ -119,21 +117,6 @@
</child>
</object>
</child>
- <child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn2">
- <property name="resizable">True</property>
- <property name="sizing">autosize</property>
- <property name="title" translatable="yes">Cookie Name</property>
- <property name="reorderable">True</property>
- <property name="sort_column_id">2</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext2"/>
- <attributes>
- <attribute name="text">2</attribute>
- </attributes>
- </child>
- </object>
- </child>
</object>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]