summaryrefslogtreecommitdiff
path: root/src/view.c
diff options
context:
space:
mode:
authorportix <none@none>2012-12-06 11:10:23 +0100
committerportix <none@none>2012-12-06 11:10:23 +0100
commitcfe31126f94c76ee9c2f1d5c7bfb13f31b9efcc1 (patch)
treeda5a2e74c2d65b7ffbac09bda9f4837189389297 /src/view.c
parentbe66d769983932d782e669257f95a6a71114c6cf (diff)
downloaddwb-cfe31126f94c76ee9c2f1d5c7bfb13f31b9efcc1.zip
Indentation of adblock.c, renaming static variables
Diffstat (limited to 'src/view.c')
-rw-r--r--src/view.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/view.c b/src/view.c
index 5a47d597..67560899 100644
--- a/src/view.c
+++ b/src/view.c
@@ -34,9 +34,9 @@
#include "scripts.h"
static void view_ssl_state(GList *);
-static unsigned long m_click_time;
-static guint m_sig_caret_button_release;
-static guint m_sig_caret_motion;
+static unsigned long s_click_time;
+static guint s_sig_caret_button_release;
+static guint s_sig_caret_motion;
static const char const* dummy_icon[] = { "1 1 1 1 ", "- c NONE", "", };
@@ -106,15 +106,15 @@ view_document_finished(WebKitWebView *wv, WebKitWebFrame *frame, GList *gl)
static void
view_disconnect_caret(WebKitWebView *web)
{
- if (m_sig_caret_button_release > 0)
+ if (s_sig_caret_button_release > 0)
{
- g_signal_handler_disconnect(web, m_sig_caret_button_release);
- m_sig_caret_button_release = 0;
+ g_signal_handler_disconnect(web, s_sig_caret_button_release);
+ s_sig_caret_button_release = 0;
}
- if (m_sig_caret_motion > 0)
+ if (s_sig_caret_motion > 0)
{
- g_signal_handler_disconnect(web, m_sig_caret_motion);
- m_sig_caret_motion = 0;
+ g_signal_handler_disconnect(web, s_sig_caret_motion);
+ s_sig_caret_motion = 0;
}
}
void
@@ -157,7 +157,7 @@ view_button_press_cb(WebKitWebView *web, GdkEventButton *e, GList *gl)
WebKitHitTestResultContext context;
g_object_get(result, "context", &context, NULL);
gboolean ret = false;
- m_click_time = e->time;
+ s_click_time = e->time;
if (EMIT_SCRIPT(BUTTON_PRESS))
{
char *json = util_create_json(8,
@@ -186,8 +186,8 @@ view_button_press_cb(WebKitWebView *web, GdkEventButton *e, GList *gl)
WebKitDOMDOMSelection *selection = webkit_dom_dom_window_get_selection(webkit_dom_document_get_default_view(doc));
webkit_dom_dom_selection_remove_all_ranges(selection);
webkit_dom_dom_selection_add_range(selection, range);
- m_sig_caret_button_release = g_signal_connect(web, "button-release-event", G_CALLBACK(view_caret_release_cb), range);
- m_sig_caret_motion = g_signal_connect(web, "motion-notify-event", G_CALLBACK(view_caret_motion_cb), range);
+ s_sig_caret_button_release = g_signal_connect(web, "button-release-event", G_CALLBACK(view_caret_release_cb), range);
+ s_sig_caret_motion = g_signal_connect(web, "motion-notify-event", G_CALLBACK(view_caret_motion_cb), range);
return false;
}
else if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION && e->type == GDK_BUTTON_PRESS && e->state & GDK_BUTTON1_MASK)
@@ -252,7 +252,7 @@ view_button_release_cb(WebKitWebView *web, GdkEventButton *e, GList *gl)
if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
{
- if (e->button == 2 || (e->time - m_click_time < 200 && (e->button == 1 && e->state & GDK_CONTROL_MASK)))
+ if (e->button == 2 || (e->time - s_click_time < 200 && (e->button == 1 && e->state & GDK_CONTROL_MASK)))
{
g_object_get(result, "link-uri", &uri, NULL);
view_add(uri, dwb.state.background_tabs);