diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | data/epiphany.schemas.in | 9 | ||||
| -rw-r--r-- | lib/ephy-prefs.h | 1 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 32 |
4 files changed, 11 insertions, 42 deletions
@@ -1,3 +1,12 @@ +2003-06-12 Xan Lopez <xan@masilla.org> + + * data/epiphany.schemas.in: + * lib/ephy-prefs.h: + * src/bookmarks/ephy-bookmarks-editor.c: + (ephy_bookmarks_editor_dispose), (ephy_bookmarks_editor_construct): + + Do not persist node selection in BME between sessions. + 2003-06-12 Christian Persch <chpe@cvs.gnome.org> * embed/ephy-embed-popup.c: (embed_popup_open_frame_cmd): @@ -61,7 +70,7 @@ * lib/widgets/ephy-node-view.c: (ephy_node_view_select_node): Use gtk_tree_selection_select_iter to make selection, fixes #114965. -<F6> + 2003-06-11 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-bookmark-toolitem.h: diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in index a59acd6ea..bd59ac934 100644 --- a/data/epiphany.schemas.in +++ b/data/epiphany.schemas.in @@ -421,15 +421,6 @@ </locale> </schema> <schema> - <key>/schemas/apps/epiphany/interface/bookmark_keyword_selected_node</key> - <applyto>/apps/epiphany/interface/bookmark_keyword_selected_node</applyto> - <owner>epiphany</owner> - <type>string</type> - <default>0</default> - <locale name="C"> - </locale> - </schema> - <schema> <key>/schemas/apps/epiphany/security/cookie_accept</key> <applyto>/apps/epiphany/security/cookie_accept</applyto> <owner>epiphany</owner> diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h index c4fde28da..6e16f4359 100644 --- a/lib/ephy-prefs.h +++ b/lib/ephy-prefs.h @@ -29,7 +29,6 @@ G_BEGIN_DECLS #define CONF_WINDOWS_SHOW_TOOLBARS "/apps/epiphany/interface/show_toolbars" #define CONF_WINDOWS_SHOW_BOOKMARKS_BAR "/apps/epiphany/interface/show_bookmarks_bar" #define CONF_WINDOWS_SHOW_STATUSBAR "/apps/epiphany/interface/show_statusbar" -#define CONF_BOOKMARKS_SELECTED_NODE "/apps/epiphany/interface/bookmark_keyword_selected_node" #define CONF_INTERFACE_MIDDLE_CLICK_OPEN_URL "/apps/epiphany/interface/middle_click_open_url" #define CONF_ASK_DOWNLOAD_DEST "/apps/epiphany/interface/ask_download_dest" diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 7a5b087df..56d3ef1a9 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -15,6 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * $Id$ */ #ifdef HAVE_CONFIG_H @@ -42,7 +43,6 @@ #include "ephy-dnd.h" #include "ephy-prefs.h" #include "ephy-shell.h" -#include "eel-gconf-extensions.h" #include "ephy-file-helpers.h" #include "egg-action-group.h" #include "egg-toggle-action.h" @@ -964,8 +964,6 @@ static void ephy_bookmarks_editor_dispose (GObject *object) { EphyBookmarksEditor *editor; - long selected_id; - char *selected_id_str; GList *selection; g_return_if_fail (object != NULL); @@ -989,15 +987,6 @@ ephy_bookmarks_editor_dispose (GObject *object) return; } - selected_id = ephy_node_get_id (selection->data); - if (selected_id >= 0) - { - selected_id_str = g_strdup_printf ("%ld", selected_id); - eel_gconf_set_string (CONF_BOOKMARKS_SELECTED_NODE, - selected_id_str); - g_free (selected_id_str); - } - g_list_free (selection); editor->priv->key_view = NULL; @@ -1207,9 +1196,6 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor) GtkWidget *bm_view, *key_view; GtkWidget *scrolled_window; EphyNode *node; - long selected_id; - EphyNode *selected_node; - char *selected_id_str; EggMenuMerge *ui_merge; EggActionGroup *action_group; EggAction *action; @@ -1379,22 +1365,6 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor) ephy_state_add_paned (GTK_WIDGET (hpaned), "bookmarks_paned", 130); - - selected_id_str = eel_gconf_get_string (CONF_BOOKMARKS_SELECTED_NODE); - selected_id = g_ascii_strtoull (selected_id_str, NULL, 10); - if (selected_id <= 0) - { - g_free (selected_id_str); - return; - } - - selected_node = ephy_bookmarks_get_from_id (editor->priv->bookmarks, selected_id); - if (selected_node != NULL) - { - ephy_node_view_select_node (EPHY_NODE_VIEW (key_view), selected_node); - } - - g_free (selected_id_str); } void |