aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--src/bookmarks/ephy-new-bookmark.c33
2 files changed, 19 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index b27704dfe..e1ac8029e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-24 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_add),
+ (build_editing_table), (ephy_new_bookmark_construct),
+ (ephy_new_bookmark_set_property), (ephy_new_bookmark_get_property):
+
+ Remove info text referring to the not-committed markers in H18.
+
2005-10-23 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index c1e2f2a83..46c05b216 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -46,9 +46,9 @@ static void ephy_new_bookmark_class_init (EphyNewBookmarkClass *klass);
static void ephy_new_bookmark_init (EphyNewBookmark *editor);
static void ephy_new_bookmark_finalize (GObject *object);
static void ephy_new_bookmark_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
static void ephy_new_bookmark_get_property (GObject *object,
guint prop_id,
GValue *value,
@@ -164,7 +164,7 @@ ephy_new_bookmark_add (EphyNewBookmark *new_bookmark)
title = gtk_editable_get_chars
(GTK_EDITABLE (new_bookmark->priv->title_entry), 0, -1);
node = ephy_bookmarks_add (new_bookmark->priv->bookmarks, title,
- new_bookmark->priv->location);
+ new_bookmark->priv->location);
new_bookmark->priv->id = ephy_node_get_id (node);
ephy_topics_selector_apply (selector, node);
@@ -260,17 +260,6 @@ build_editing_table (EphyNewBookmark *editor)
gtk_table_attach (GTK_TABLE (table), scrolled_window, 1, 2, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
- label = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 0, 0);
-
- label = gtk_label_new (_("Each \xE2\x80\xA2 highlights a topic to consider, derived from your current selections and existing bookmarks."));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, 3, 4, GTK_FILL, GTK_FILL, 0, 0);
-
return table;
}
@@ -279,7 +268,7 @@ ephy_new_bookmark_construct (EphyNewBookmark *editor)
{
ephy_state_add_window (GTK_WIDGET(editor),
"new_bookmark",
- 280, 240, FALSE,
+ 280, 240, FALSE,
EPHY_STATE_WINDOW_SAVE_SIZE);
gtk_window_set_title (GTK_WINDOW (editor),
@@ -425,9 +414,9 @@ ephy_new_bookmark_new (EphyBookmarks *bookmarks,
static void
ephy_new_bookmark_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
EphyNewBookmark *editor = EPHY_NEW_BOOKMARK (object);
@@ -448,9 +437,9 @@ ephy_new_bookmark_set_property (GObject *object,
static void
ephy_new_bookmark_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
EphyNewBookmark *editor = EPHY_NEW_BOOKMARK (object);