aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <descalante@igalia.com>2010-12-08 23:32:25 +0800
committerDiego Escalante Urrelo <descalante@igalia.com>2010-12-09 06:43:12 +0800
commit9176664b703913181c002bbbdde575675bfd8559 (patch)
treea3dcd6bce397410ef8681ee42e0b9058963b92bf
parent62f2c31cefbd94e993584736fc82e33d4c62060b (diff)
downloadgsoc2013-epiphany-9176664b703913181c002bbbdde575675bfd8559.tar.gz
gsoc2013-epiphany-9176664b703913181c002bbbdde575675bfd8559.tar.zst
gsoc2013-epiphany-9176664b703913181c002bbbdde575675bfd8559.zip
ephy-web-view: make defines friendlier with introspection
Non prefixed names trigger lots of warnings, avoid them. Bug #636790
-rw-r--r--embed/ephy-web-view.c2
-rw-r--r--embed/ephy-web-view.h4
-rw-r--r--src/ephy-window.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 9a46a228c..4335f5995 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2159,7 +2159,7 @@ ephy_web_view_init (EphyWebView *web_view)
priv->monitor_directory = FALSE;
priv->seq_context_id = 1;
priv->seq_message_id = 1;
- priv->tab_message_id = ephy_web_view_statusbar_get_context_id (web_view, TAB_MESSAGE_CONTEXT_DESCRIPTION);
+ priv->tab_message_id = ephy_web_view_statusbar_get_context_id (web_view, EPHY_WEB_VIEW_STATUSBAR_TAB_MESSAGE_CONTEXT_DESCRIPTION);
priv->non_search_regex = g_regex_new ("(^localhost(\\.[^[:space:]]+)?(:\\d+)?(/.*)?$|"
"^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]$|"
diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h
index e37d0e2db..f4e18a582 100644
--- a/embed/ephy-web-view.h
+++ b/embed/ephy-web-view.h
@@ -45,8 +45,8 @@ typedef struct _EphyWebViewClass EphyWebViewClass;
typedef struct _EphyWebView EphyWebView;
typedef struct _EphyWebViewPrivate EphyWebViewPrivate;
-#define TAB_MESSAGE_CONTEXT_DESCRIPTION "tab_message"
-#define HELP_MESSAGE_CONTEXT_DESCRIPTION "help_message"
+#define EPHY_WEB_VIEW_STATUSBAR_TAB_MESSAGE_CONTEXT_DESCRIPTION "tab_message"
+#define EPHY_WEB_VIEW_STATUSBAR_HELP_MESSAGE_CONTEXT_DESCRIPTION "help_message"
typedef enum
{
diff --git a/src/ephy-window.c b/src/ephy-window.c
index c64373378..806eda086 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -491,9 +491,9 @@ impl_add_child (EphyEmbedContainer *container,
view = ephy_embed_get_web_view (child);
window->priv->tab_message_cid = ephy_web_view_statusbar_get_context_id
- (view, TAB_MESSAGE_CONTEXT_DESCRIPTION);
+ (view, EPHY_WEB_VIEW_STATUSBAR_TAB_MESSAGE_CONTEXT_DESCRIPTION);
window->priv->help_message_cid = ephy_web_view_statusbar_get_context_id
- (view, HELP_MESSAGE_CONTEXT_DESCRIPTION);
+ (view, EPHY_WEB_VIEW_STATUSBAR_HELP_MESSAGE_CONTEXT_DESCRIPTION);
return ephy_notebook_add_tab (EPHY_NOTEBOOK (window->priv->notebook),
child, position, jump_to);