aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-01-09 21:03:55 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-01-09 21:03:55 +0800
commit7d278d4b5910d1adc5e075882aa559e8da407c4a (patch)
tree44d8ca418545e23c408b413548c5f8f710cdd6de /embed
parent05dc477f8e2a3943fd5eea73ae137cbcd544ce31 (diff)
downloadgsoc2013-epiphany-7d278d4b5910d1adc5e075882aa559e8da407c4a.tar
gsoc2013-epiphany-7d278d4b5910d1adc5e075882aa559e8da407c4a.tar.gz
gsoc2013-epiphany-7d278d4b5910d1adc5e075882aa559e8da407c4a.tar.bz2
gsoc2013-epiphany-7d278d4b5910d1adc5e075882aa559e8da407c4a.tar.lz
gsoc2013-epiphany-7d278d4b5910d1adc5e075882aa559e8da407c4a.tar.xz
gsoc2013-epiphany-7d278d4b5910d1adc5e075882aa559e8da407c4a.tar.zst
gsoc2013-epiphany-7d278d4b5910d1adc5e075882aa559e8da407c4a.zip
Extend ephy node to allow some reversed ids. Use it for base
2003-01-09 Marco Pesenti Gritti <marco@it.gnome.org> * TODO: * embed/ephy-history.c: (ephy_history_init): * embed/mozilla/FilePicker.cpp: * lib/ephy-node.c: (ephy_node_new_with_id), (ephy_node_system_init): * lib/ephy-node.h: * src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_init): Extend ephy node to allow some reversed ids. Use it for base bookmarks/history elements, should fix bookmarks lossage. Fix filepicker initialization.
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-history.c12
-rw-r--r--embed/mozilla/FilePicker.cpp2
2 files changed, 10 insertions, 4 deletions
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index 84875f721..db6f885d2 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -57,6 +57,12 @@ enum
LAST_SIGNAL
};
+enum
+{
+ HOSTS_NODE_ID = 5,
+ PAGES_NODE_ID = 6
+};
+
static void
ephy_history_class_init (EphyHistoryClass *klass);
static void
@@ -388,8 +394,8 @@ ephy_history_init (EphyHistory *eb)
eb->priv->hosts_hash_lock = g_new0 (GStaticRWLock, 1);
g_static_rw_lock_init (eb->priv->hosts_hash_lock);
- /* Bookmarks */
- eb->priv->pages = ephy_node_new ();
+ /* Pages */
+ eb->priv->pages = ephy_node_new_with_id (PAGES_NODE_ID);
ephy_node_ref (eb->priv->pages);
g_signal_connect_object (G_OBJECT (eb->priv->pages),
"child_added",
@@ -403,7 +409,7 @@ ephy_history_init (EphyHistory *eb)
0);
/* Hosts */
- eb->priv->hosts = ephy_node_new ();
+ eb->priv->hosts = ephy_node_new_with_id (HOSTS_NODE_ID);
ephy_node_ref (eb->priv->hosts);
g_signal_connect_object (G_OBJECT (eb->priv->hosts),
"child_added",
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index 6ef57d503..144f2e1f2 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -329,7 +329,7 @@ NS_METHOD GFilePicker::InitWithGtkWidget (GtkWidget *aParentWidget,
mTitle = nsDependentCString(aTitle);
- mMode = mMode;
+ mMode = aMode;
mFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID);