[empathy] empathy-webkit-util: coding style fixes
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] empathy-webkit-util: coding style fixes
- Date: Wed, 26 Dec 2012 08:54:49 +0000 (UTC)
commit 8ad4b14d78dc19c513ca82d95390e8adf58b6b1a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Sep 19 11:50:01 2012 +0200
empathy-webkit-util: coding style fixes
https://bugzilla.gnome.org/show_bug.cgi?id=684357
libempathy-gtk/empathy-webkit-utils.c | 22 +++++++++++-----------
libempathy-gtk/empathy-webkit-utils.h | 10 +++++++---
2 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/libempathy-gtk/empathy-webkit-utils.c b/libempathy-gtk/empathy-webkit-utils.c
index c8c585a..1ead8f9 100644
--- a/libempathy-gtk/empathy-webkit-utils.c
+++ b/libempathy-gtk/empathy-webkit-utils.c
@@ -161,6 +161,7 @@ empathy_webkit_bind_font_setting (WebKitWebView *webview,
webkit_get_font_family,
NULL,
NULL, NULL);
+
g_settings_bind_with_mapping (gsettings, key,
settings, "default-font-size",
G_SETTINGS_BIND_GET,
@@ -171,11 +172,11 @@ empathy_webkit_bind_font_setting (WebKitWebView *webview,
static void
empathy_webkit_copy_address_cb (GtkMenuItem *menuitem,
- gpointer user_data)
+ gpointer user_data)
{
- WebKitHitTestResult *hit_test_result = WEBKIT_HIT_TEST_RESULT (user_data);
- gchar *uri;
- GtkClipboard *clipboard;
+ WebKitHitTestResult *hit_test_result = WEBKIT_HIT_TEST_RESULT (user_data);
+ gchar *uri;
+ GtkClipboard *clipboard;
g_object_get (G_OBJECT (hit_test_result),
"link-uri", &uri,
@@ -194,8 +195,8 @@ static void
empathy_webkit_open_address_cb (GtkMenuItem *menuitem,
gpointer user_data)
{
- WebKitHitTestResult *hit_test_result = WEBKIT_HIT_TEST_RESULT (user_data);
- gchar *uri;
+ WebKitHitTestResult *hit_test_result = WEBKIT_HIT_TEST_RESULT (user_data);
+ gchar *uri;
g_object_get (G_OBJECT (hit_test_result),
"link-uri", &uri,
@@ -220,10 +221,10 @@ empathy_webkit_context_menu_for_event (WebKitWebView *view,
GdkEventButton *event,
EmpathyWebKitMenuFlags flags)
{
- WebKitHitTestResult *hit_test_result;
- WebKitHitTestResultContext context;
- GtkWidget *menu;
- GtkWidget *item;
+ WebKitHitTestResult *hit_test_result;
+ WebKitHitTestResultContext context;
+ GtkWidget *menu;
+ GtkWidget *item;
hit_test_result = webkit_web_view_get_hit_test_result (view, event);
g_object_get (G_OBJECT (hit_test_result),
@@ -298,4 +299,3 @@ empathy_webkit_context_menu_for_event (WebKitWebView *view,
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
event->button, event->time);
}
-
diff --git a/libempathy-gtk/empathy-webkit-utils.h b/libempathy-gtk/empathy-webkit-utils.h
index 322f94c..fccdb04 100644
--- a/libempathy-gtk/empathy-webkit-utils.h
+++ b/libempathy-gtk/empathy-webkit-utils.h
@@ -31,11 +31,15 @@ typedef enum {
EMPATHY_WEBKIT_MENU_CLEAR = 1 << 0,
} EmpathyWebKitMenuFlags;
-EmpathyStringParser *empathy_webkit_get_string_parser (gboolean smileys);
+EmpathyStringParser * empathy_webkit_get_string_parser (gboolean smileys);
+
void empathy_webkit_bind_font_setting (WebKitWebView *webview,
- GSettings *gsettings, const char *key);
+ GSettings *gsettings,
+ const char *key);
+
void empathy_webkit_context_menu_for_event (WebKitWebView *view,
- GdkEventButton *event, EmpathyWebKitMenuFlags flags);
+ GdkEventButton *event,
+ EmpathyWebKitMenuFlags flags);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]