diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-01-17 21:58:21 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-01-17 21:58:21 +0800 |
| commit | f220f9282e63ca352def47b86ec5f9c5c5c57696 (patch) | |
| tree | 131d1dff90041138a058eaa8e3844f19f5293f3e /src/bookmarks | |
| parent | b89fb9d5a5860e5349115717d48b240cf9715f4b (diff) | |
| download | gsoc2013-epiphany-f220f9282e63ca352def47b86ec5f9c5c5c57696.tar gsoc2013-epiphany-f220f9282e63ca352def47b86ec5f9c5c5c57696.tar.gz gsoc2013-epiphany-f220f9282e63ca352def47b86ec5f9c5c5c57696.tar.bz2 gsoc2013-epiphany-f220f9282e63ca352def47b86ec5f9c5c5c57696.tar.lz gsoc2013-epiphany-f220f9282e63ca352def47b86ec5f9c5c5c57696.tar.xz gsoc2013-epiphany-f220f9282e63ca352def47b86ec5f9c5c5c57696.tar.zst gsoc2013-epiphany-f220f9282e63ca352def47b86ec5f9c5c5c57696.zip | |
Add event type to the callback.
2006-01-17 Christian Persch <chpe@cvs.gnome.org>
* lib/ephy-file-helpers.c: (ephy_file_monitor_timeout_cb),
(ephy_file_monitor_cb):
* lib/ephy-file-helpers.h:
Add event type to the callback.
* embed/mozilla/EphyUtils.cpp:
* embed/mozilla/EphyUtils.h:
New function, like NS_NewFileURI (which we can't use since
nsNetUtil.h conflicts with embed strings).
* embed/mozilla/mozilla-embed-single.cpp:
* embed/mozilla/mozilla-notifiers.cpp:
Check that the user CSS file exists before registering it.
Also handle file-deleted events.
* src/bookmarks/ephy-bookmarks-menu.c: (ephy_bookmarks_menu_build):
* src/bookmarks/ephy-topics-palette.c:
(ephy_topics_palette_constructor),
(ephy_topics_palette_class_init):
Build fixes.
Diffstat (limited to 'src/bookmarks')
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-menu.c | 4 | ||||
| -rw-r--r-- | src/bookmarks/ephy-topics-palette.c | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c index 15126fd11..71f7ba3b4 100644 --- a/src/bookmarks/ephy-bookmarks-menu.c +++ b/src/bookmarks/ephy-bookmarks-menu.c @@ -252,10 +252,12 @@ ephy_bookmarks_menu_build (GString *string, EphyNode *parent) /* Otherwise, build the menu with "Open in tabs". */ else { + char *name; + append_menu (string, topics, children, flags); g_ptr_array_free (topics, TRUE); - char *name = ephy_open_tabs_action_name (node); + name = ephy_open_tabs_action_name (node); g_string_append_printf (string, "<separator/><menuitem action=\"%s\" name=\"OpenTabs\"/>", name); g_free (name); diff --git a/src/bookmarks/ephy-topics-palette.c b/src/bookmarks/ephy-topics-palette.c index ad2731dec..6c6f643aa 100644 --- a/src/bookmarks/ephy-topics-palette.c +++ b/src/bookmarks/ephy-topics-palette.c @@ -430,6 +430,7 @@ ephy_topics_palette_constructor (GType type, priv->store = gtk_list_store_new (COLUMNS, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); gtk_tree_view_set_model (GTK_TREE_VIEW (object), GTK_TREE_MODEL (priv->store)); + g_object_unref (priv->store); column = gtk_tree_view_column_new (); @@ -464,14 +465,6 @@ ephy_topics_palette_init (EphyTopicsPalette *palette) palette->priv = EPHY_TOPICS_PALETTE_GET_PRIVATE (palette); } -static void -ephy_topics_palette_finalize (GObject *object) -{ - EphyTopicsPalette *palette = EPHY_TOPICS_PALETTE (object); - - parent_class->finalize (object); -} - GtkWidget * ephy_topics_palette_new (EphyBookmarks *bookmarks, EphyNode *bookmark) @@ -498,7 +491,6 @@ ephy_topics_palette_class_init (EphyTopicsPaletteClass *klass) object_class->set_property = ephy_topics_palette_set_property; object_class->constructor = ephy_topics_palette_constructor; - object_class->finalize = ephy_topics_palette_finalize; g_object_class_install_property (object_class, PROP_BOOKMARKS, |