aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--embed/ephy-history.c2
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c2
-rw-r--r--src/bookmarks/ephy-bookmarks.c2
-rw-r--r--src/ephy-history-window.c2
5 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e29005ac4..09d868142 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
2003-05-03 Xan Lopez <xan@masilla.org>
* NEWS:
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index 4c5cf6cbe..5ea747080 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -202,7 +202,7 @@ ephy_history_load (EphyHistory *eb)
return;
doc = xmlParseFile (eb->priv->xml_file);
- g_assert (doc != NULL);
+ g_return_if_fail (doc != NULL);
root = xmlDocGetRootElement (doc);
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);
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index c69139bb3..71ec221cc 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -860,6 +860,7 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
"vadjustment", NULL,
"hscrollbar_policy", GTK_POLICY_AUTOMATIC,
"vscrollbar_policy", GTK_POLICY_AUTOMATIC,
+ "shadow_type", GTK_SHADOW_IN,
NULL);
gtk_paned_add1 (GTK_PANED (hpaned), scrolled_window);
gtk_widget_show (scrolled_window);
@@ -900,6 +901,7 @@ ephy_history_window_construct (EphyHistoryWindow *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);