[epiphany] bookmarks: Remove unneeded resolve-address signal
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] bookmarks: Remove unneeded resolve-address signal
- Date: Sat, 27 Feb 2016 21:28:32 +0000 (UTC)
commit f9f4720ea3690b603eef633e18171aa82f19922b
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Sat Feb 27 15:11:26 2016 -0600
bookmarks: Remove unneeded resolve-address signal
src/bookmarks/ephy-bookmarks.c | 44 ++++++---------------------------------
src/bookmarks/ephy-bookmarks.h | 3 --
2 files changed, 7 insertions(+), 40 deletions(-)
---
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 8a9ec59..2f9ab8b 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -95,14 +95,12 @@ static const char *default_topics [] =
enum
{
TREE_CHANGED,
- RESOLVE_ADDRESS,
LAST_SIGNAL
};
static guint ephy_bookmarks_signals[LAST_SIGNAL];
static void ephy_bookmarks_finalize (GObject *object);
-static char *impl_resolve_address (EphyBookmarks*, const char*, const char*);
static void ephy_local_bookmarks_start_client (EphyBookmarks *bookmarks);
G_DEFINE_TYPE (EphyBookmarks, ephy_bookmarks, G_TYPE_OBJECT)
@@ -127,8 +125,6 @@ ephy_bookmarks_class_init (EphyBookmarksClass *klass)
object_class->finalize = ephy_bookmarks_finalize;
- klass->resolve_address = impl_resolve_address;
-
ephy_bookmarks_signals[TREE_CHANGED] =
g_signal_new ("tree-changed",
G_OBJECT_CLASS_TYPE (object_class),
@@ -139,18 +135,6 @@ ephy_bookmarks_class_init (EphyBookmarksClass *klass)
G_TYPE_NONE,
0);
- ephy_bookmarks_signals[RESOLVE_ADDRESS] =
- g_signal_new ("resolve-address",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (EphyBookmarksClass, resolve_address),
- ephy_signal_accumulator_string, NULL,
- g_cclosure_marshal_generic,
- G_TYPE_STRING,
- 2,
- G_TYPE_STRING,
- G_TYPE_STRING);
-
g_type_class_add_private (object_class, sizeof(EphyBookmarksPrivate));
}
@@ -1358,15 +1342,17 @@ get_option (char *start,
return g_strndup (start, end - start);
}
-static char *
-impl_resolve_address (EphyBookmarks *eb,
- const char *address,
- const char *content)
+char *
+ephy_bookmarks_resolve_address (EphyBookmarks *eb,
+ const char *address,
+ const char *content)
{
GString *result;
char *pos, *oldpos, *arg, *escaped_arg, *encoding, *optionsend;
- if (address == NULL) return NULL;
+ g_return_val_if_fail (EPHY_IS_BOOKMARKS (eb), NULL);
+ g_return_val_if_fail (address != NULL, NULL);
+
if (content == NULL) content = "";
result = g_string_new_len (NULL, strlen (content) + strlen (address));
@@ -1415,22 +1401,6 @@ impl_resolve_address (EphyBookmarks *eb,
return g_string_free (result, FALSE);
}
-char *
-ephy_bookmarks_resolve_address (EphyBookmarks *eb,
- const char *address,
- const char *parameter)
-{
- char *retval = NULL;
-
- g_return_val_if_fail (EPHY_IS_BOOKMARKS (eb), NULL);
- g_return_val_if_fail (address != NULL, NULL);
-
- g_signal_emit (eb, ephy_bookmarks_signals[RESOLVE_ADDRESS], 0,
- address, parameter, &retval);
-
- return retval;
-}
-
guint
ephy_bookmarks_get_smart_bookmark_width (EphyNode *bookmark)
{
diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h
index 396b567..986552c 100644
--- a/src/bookmarks/ephy-bookmarks.h
+++ b/src/bookmarks/ephy-bookmarks.h
@@ -67,9 +67,6 @@ struct _EphyBookmarksClass
GObjectClass parent_class;
void (* tree_changed) (EphyBookmarks *eb);
- char * (* resolve_address) (EphyBookmarks *eb,
- const char *address,
- const char *argument);
};
GType ephy_bookmarks_get_type (void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]