diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-09-28 02:13:11 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-09-28 02:13:11 +0800 |
| commit | a913abc0b33ea25f706d5ebf6e98626d31da39d5 (patch) | |
| tree | 9d109345210074d0a83312191a74ff91c1ceca61 /src/bookmarks | |
| parent | 03b4c9bb41fcedda967007ee860d567ecbaed365 (diff) | |
| download | gsoc2013-epiphany-a913abc0b33ea25f706d5ebf6e98626d31da39d5.tar gsoc2013-epiphany-a913abc0b33ea25f706d5ebf6e98626d31da39d5.tar.gz gsoc2013-epiphany-a913abc0b33ea25f706d5ebf6e98626d31da39d5.tar.bz2 gsoc2013-epiphany-a913abc0b33ea25f706d5ebf6e98626d31da39d5.tar.lz gsoc2013-epiphany-a913abc0b33ea25f706d5ebf6e98626d31da39d5.tar.xz gsoc2013-epiphany-a913abc0b33ea25f706d5ebf6e98626d31da39d5.tar.zst gsoc2013-epiphany-a913abc0b33ea25f706d5ebf6e98626d31da39d5.zip | |
Don't reference private objects from public headers. Fixes bug #153766.
2004-09-27 Christian Persch <chpe@cvs.gnome.org>
* lib/egg/Makefile.am:
* src/bookmarks/ephy-bookmark-action.c: (remove_from_model),
(move_in_model):
* src/bookmarks/ephy-bookmarks.c:
(ephy_bookmarks_get_toolbars_model):
* src/bookmarks/ephy-bookmarks.h:
* src/bookmarks/ephy-bookmarksbar.c:
(ephy_bookmarksbar_set_property):
* src/bookmarks/ephy-topic-action.c: (remove_from_model),
(move_in_model):
* src/ephy-shell.c: (ephy_shell_get_toolbars_model):
Don't reference private objects from public headers. Fixes bug #153766.
Diffstat (limited to 'src/bookmarks')
| -rw-r--r-- | src/bookmarks/ephy-bookmark-action.c | 4 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks.c | 4 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks.h | 3 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarksbar.c | 2 | ||||
| -rw-r--r-- | src/bookmarks/ephy-topic-action.c | 4 |
5 files changed, 8 insertions, 9 deletions
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c index 52dad678b..6a3f2dc02 100644 --- a/src/bookmarks/ephy-bookmark-action.c +++ b/src/bookmarks/ephy-bookmark-action.c @@ -433,7 +433,7 @@ remove_from_model (GtkWidget *widget) pos = get_item_position (widget, NULL); bookmarks = ephy_shell_get_bookmarks (ephy_shell); - model = ephy_bookmarks_get_toolbars_model (bookmarks); + model = EGG_TOOLBARS_MODEL (ephy_bookmarks_get_toolbars_model (bookmarks)); egg_toolbars_model_remove_item (model, 0, pos); } @@ -446,7 +446,7 @@ move_in_model (GtkWidget *widget, int direction) int pos, new_pos; bookmarks = ephy_shell_get_bookmarks (ephy_shell); - model = ephy_bookmarks_get_toolbars_model (bookmarks); + model = EGG_TOOLBARS_MODEL (ephy_bookmarks_get_toolbars_model (bookmarks)); pos = get_item_position (widget, NULL); new_pos = MAX (0, pos + direction); diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index 1a371d62b..ff351272d 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -207,7 +207,7 @@ get_item_data_forward_cb (EggToolbarsModel *model, return retval; } -EggToolbarsModel * +GObject * ephy_bookmarks_get_toolbars_model (EphyBookmarks *eb) { g_return_val_if_fail (EPHY_IS_BOOKMARKS (eb), NULL); @@ -240,7 +240,7 @@ ephy_bookmarks_get_toolbars_model (EphyBookmarks *eb) } } - return EGG_TOOLBARS_MODEL (eb->priv->toolbars_model); + return G_OBJECT (eb->priv->toolbars_model); } static void diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h index 78e240c48..5bf2845af 100644 --- a/src/bookmarks/ephy-bookmarks.h +++ b/src/bookmarks/ephy-bookmarks.h @@ -25,7 +25,6 @@ #include <glib-object.h> #include "ephy-node.h" -#include "egg-toolbars-model.h" G_BEGIN_DECLS @@ -74,7 +73,7 @@ EphyBookmarks *ephy_bookmarks_new (void); EphyNode *ephy_bookmarks_get_from_id (EphyBookmarks *eb, long id); -EggToolbarsModel *ephy_bookmarks_get_toolbars_model (EphyBookmarks *eb); +GObject *ephy_bookmarks_get_toolbars_model (EphyBookmarks *eb); /* Bookmarks */ diff --git a/src/bookmarks/ephy-bookmarksbar.c b/src/bookmarks/ephy-bookmarksbar.c index 9e0fecff9..519244ecb 100644 --- a/src/bookmarks/ephy-bookmarksbar.c +++ b/src/bookmarks/ephy-bookmarksbar.c @@ -356,7 +356,7 @@ ephy_bookmarksbar_set_property (GObject *object, case PROP_BOOKMARKS: toolbar->priv->bookmarks = g_value_get_object (value); toolbar->priv->toolbars_model = - ephy_bookmarks_get_toolbars_model (toolbar->priv->bookmarks); + EGG_TOOLBARS_MODEL (ephy_bookmarks_get_toolbars_model (toolbar->priv->bookmarks)); break; case PROP_WINDOW: ephy_bookmarksbar_set_window (toolbar, g_value_get_object (value)); diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c index 4905b39a6..601bd11f8 100644 --- a/src/bookmarks/ephy-topic-action.c +++ b/src/bookmarks/ephy-topic-action.c @@ -397,7 +397,7 @@ remove_from_model (GtkWidget *widget) pos = get_item_position (widget, NULL); bookmarks = ephy_shell_get_bookmarks (ephy_shell); - model = ephy_bookmarks_get_toolbars_model (bookmarks); + model = EGG_TOOLBARS_MODEL (ephy_bookmarks_get_toolbars_model (bookmarks)); egg_toolbars_model_remove_item (model, 0, pos); } @@ -410,7 +410,7 @@ move_in_model (GtkWidget *widget, int direction) int pos, new_pos; bookmarks = ephy_shell_get_bookmarks (ephy_shell); - model = ephy_bookmarks_get_toolbars_model (bookmarks); + model = EGG_TOOLBARS_MODEL (ephy_bookmarks_get_toolbars_model (bookmarks)); pos = get_item_position (widget, NULL); new_pos = MAX (0, pos + direction); |