diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-05-03 19:59:29 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-05-03 19:59:29 +0800 |
| commit | 14e235f2eb930212dcdf8eca1dccfdcf56cd933e (patch) | |
| tree | 1c1e1384fb89da0736165309e5f0fb042189fafb /src/bookmarks | |
| parent | 1e88407c82ff067a9db36c532e4fdde521770331 (diff) | |
| download | gsoc2013-epiphany-14e235f2eb930212dcdf8eca1dccfdcf56cd933e.tar.gz gsoc2013-epiphany-14e235f2eb930212dcdf8eca1dccfdcf56cd933e.tar.zst gsoc2013-epiphany-14e235f2eb930212dcdf8eca1dccfdcf56cd933e.zip | |
Do not assert on corrupted xml, just warn. Put back views shadows for now.
2003-05-03 Marco Pesenti Gritti <marco@it.gnome.org>
* embed/ephy-history.c: (ephy_history_load):
* src/bookmarks/ephy-bookmarks-editor.c:
(ephy_bookmarks_editor_construct):
* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_load):
* src/ephy-history-window.c: (ephy_history_window_construct):
Do not assert on corrupted xml, just warn.
Put back views shadows for now.
Diffstat (limited to 'src/bookmarks')
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 2 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 60f67108a..eca629938 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -1163,6 +1163,7 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor) "vadjustment", NULL, "hscrollbar_policy", GTK_POLICY_AUTOMATIC, "vscrollbar_policy", GTK_POLICY_AUTOMATIC, + "shadow_type", GTK_SHADOW_IN, NULL); gtk_paned_pack1 (GTK_PANED (hpaned), GTK_WIDGET (scrolled_window), TRUE, TRUE); gtk_widget_show (scrolled_window); @@ -1224,6 +1225,7 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor) "vadjustment", NULL, "hscrollbar_policy", GTK_POLICY_AUTOMATIC, "vscrollbar_policy", GTK_POLICY_AUTOMATIC, + "shadow_type", GTK_SHADOW_IN, NULL); gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0); gtk_widget_show (scrolled_window); diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index 99e5d5078..9004dd86d 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -246,7 +246,7 @@ ephy_bookmarks_load (EphyBookmarks *eb) return FALSE; doc = xmlParseFile (eb->priv->xml_file); - g_assert (doc != NULL); + g_return_val_if_fail (doc != NULL, FALSE); root = xmlDocGetRootElement (doc); |