s/__attribute__((unused))/G_GNUC_UNUSED/

And rewrap lines.

G_GNUC_UNUSED expands to nothing on compilers other than GCC 2.4+.

1 files changed, 21 insertions, 28 deletions

diff --git a/src/tab-body.c b/src/tab-body.c
index 2646093..475fa2f 100644
--- a/src/tab-body.c
+++ b/src/tab-body.c
@@ -32,15 +32,14 @@
 	WEBKIT_CONTEXT_MENU_ACTION_##ACTION
 
 static void
-menu_open_link_activate_cb(GtkAction __attribute__((unused)) *action,
-	MqTabBody *body)
+menu_open_link_activate_cb(GtkAction G_GNUC_UNUSED *action, MqTabBody *body)
 {
 	webkit_web_view_load_uri(body->web_view,
 		webkit_hit_test_result_get_link_uri(body->hit_test_result));
 }
 
 static void
-menu_open_link_tab_activate_cb(GtkAction __attribute__((unused)) *action,
+menu_open_link_tab_activate_cb(GtkAction G_GNUC_UNUSED *action,
 	MqTabBody *body)
 {
 	mq_tab_new_relative(
@@ -49,8 +48,7 @@ menu_open_link_tab_activate_cb(GtkAction __attribute__((unused)) *action,
 }
 
 static void
-menu_open_link_win_activate_cb(GtkAction __attribute__((unused)) *action,
-	MqTabBody *body)
+menu_open_link_win_activate_cb(GtkAction G_GNUC_UNUSED *action, MqTabBody *body)
 {
 	const gchar *uris[2] = {
 		webkit_hit_test_result_get_link_uri(body->hit_test_result),
@@ -60,15 +58,14 @@ menu_open_link_win_activate_cb(GtkAction __attribute__((unused)) *action,
 }
 
 static void
-menu_open_image_activate_cb(GtkAction __attribute__((unused)) *action,
-	MqTabBody *body)
+menu_open_image_activate_cb(GtkAction G_GNUC_UNUSED *action, MqTabBody *body)
 {
 	webkit_web_view_load_uri(body->web_view,
 		webkit_hit_test_result_get_image_uri(body->hit_test_result));
 }
 
 static void
-menu_open_image_tab_activate_cb(GtkAction __attribute__((unused)) *action,
+menu_open_image_tab_activate_cb(GtkAction G_GNUC_UNUSED *action,
 	MqTabBody *body)
 {
 	mq_tab_new_relative(
@@ -77,7 +74,7 @@ menu_open_image_tab_activate_cb(GtkAction __attribute__((unused)) *action,
 }
 
 static void
-menu_open_image_win_activate_cb(GtkAction __attribute__((unused)) *action,
+menu_open_image_win_activate_cb(GtkAction G_GNUC_UNUSED *action,
 	MqTabBody *body)
 {
 	const gchar *uris[2] = {
@@ -88,15 +85,14 @@ menu_open_image_win_activate_cb(GtkAction __attribute__((unused)) *action,
 }
 
 static void
-menu_open_video_activate_cb(GtkAction __attribute__((unused)) *action,
-	MqTabBody *body)
+menu_open_video_activate_cb(GtkAction G_GNUC_UNUSED *action, MqTabBody *body)
 {
 	webkit_web_view_load_uri(body->web_view,
 		webkit_hit_test_result_get_media_uri(body->hit_test_result));
 }
 
 static void
-menu_open_video_tab_activate_cb(GtkAction __attribute__((unused)) *action,
+menu_open_video_tab_activate_cb(GtkAction G_GNUC_UNUSED *action,
 	MqTabBody *body)
 {
 	mq_tab_new_relative(
@@ -105,7 +101,7 @@ menu_open_video_tab_activate_cb(GtkAction __attribute__((unused)) *action,
 }
 
 static void
-menu_open_video_win_activate_cb(GtkAction __attribute__((unused)) *action,
+menu_open_video_win_activate_cb(GtkAction G_GNUC_UNUSED *action,
 	MqTabBody *body)
 {
 	const gchar *uris[2] = {
@@ -116,15 +112,14 @@ menu_open_video_win_activate_cb(GtkAction __attribute__((unused)) *action,
 }
 
 static void
-menu_open_audio_activate_cb(GtkAction __attribute__((unused)) *action,
-	MqTabBody *body)
+menu_open_audio_activate_cb(GtkAction G_GNUC_UNUSED *action, MqTabBody *body)
 {
 	webkit_web_view_load_uri(body->web_view,
 		webkit_hit_test_result_get_media_uri(body->hit_test_result));
 }
 
 static void
-menu_open_audio_tab_activate_cb(GtkAction __attribute__((unused)) *action,
+menu_open_audio_tab_activate_cb(GtkAction G_GNUC_UNUSED *action,
 	MqTabBody *body)
 {
 	mq_tab_new_relative(
@@ -133,7 +128,7 @@ menu_open_audio_tab_activate_cb(GtkAction __attribute__((unused)) *action,
 }
 
 static void
-menu_open_audio_win_activate_cb(GtkAction __attribute__((unused)) *action,
+menu_open_audio_win_activate_cb(GtkAction G_GNUC_UNUSED *action,
 	MqTabBody *body)
 {
 	const gchar *uris[2] = {
@@ -239,7 +234,7 @@ context_menu_media_cb(WebKitContextMenu *context_menu, GList *media_ctrl_items,
 static void
 context_menu_editable_cb(WebKitContextMenu *context_menu,
 	GList *spell_repl_items, GList *spell_ctrl_items, GList *edit_items,
-	GList *input_items, MqTabBody __attribute__((unused)) *body)
+	GList *input_items, MqTabBody G_GNUC_UNUSED *body)
 {
 	ITEM_DECLS_NO_CUSTOM
 
@@ -255,7 +250,7 @@ context_menu_editable_cb(WebKitContextMenu *context_menu,
 }
 static void
 context_menu_document_cb(WebKitContextMenu *context_menu, GList *nav_items,
-	MqTabBody __attribute__((unused)) *body)
+	MqTabBody G_GNUC_UNUSED *body)
 {
 	ITEM_DECLS_NO_CUSTOM
 
@@ -273,9 +268,8 @@ context_menu_document_cb(WebKitContextMenu *context_menu, GList *nav_items,
 	} while (0)
 
 static gboolean
-context_menu_cb(WebKitWebView __attribute__((unused)) *web_view,
-	WebKitContextMenu *context_menu,
-	GdkEvent __attribute__((unused)) *event,
+context_menu_cb(WebKitWebView G_GNUC_UNUSED *web_view,
+	WebKitContextMenu *context_menu, GdkEvent G_GNUC_UNUSED *event,
 	WebKitHitTestResult *hit_test_result, MqTabBody *body)
 {
 	GList                      *items;
@@ -429,7 +423,7 @@ context_menu_cb(WebKitWebView __attribute__((unused)) *web_view,
 }
 
 static void
-clipboard_text_recv_cb(GtkClipboard __attribute__((unused)) *clipboard,
+clipboard_text_recv_cb(GtkClipboard G_GNUC_UNUSED *clipboard,
 	const gchar *text, MqTabBody *body)
 {
 	webkit_web_view_load_uri(body->web_view, text);
@@ -440,9 +434,8 @@ clipboard_text_recv_cb(GtkClipboard __attribute__((unused)) *clipboard,
  * API provided webkit_web_view_get_hit_test_result() which would have been
  * easier. */
 static void
-mouse_target_changed_cb(WebKitWebView __attribute__((unused)) *web_view,
-	WebKitHitTestResult *hit_test_result,
-	guint __attribute__((unused)) modifiers,
+mouse_target_changed_cb(WebKitWebView G_GNUC_UNUSED *web_view,
+	WebKitHitTestResult *hit_test_result, guint G_GNUC_UNUSED modifiers,
 	MqTabBody *body)
 {
 	body->mouse_target_hit_test_result = hit_test_result;
@@ -450,8 +443,8 @@ mouse_target_changed_cb(WebKitWebView __attribute__((unused)) *web_view,
 }
 
 static gboolean
-button_press_cb(WebKitWebView __attribute__((unused)) *web_view,
-	GdkEvent *event, MqTabBody *body)
+button_press_cb(WebKitWebView G_GNUC_UNUSED *web_view, GdkEvent *event,
+	MqTabBody *body)
 {
 	WebKitHitTestResult *hit_test_result;
 	GtkClipboard        *clipboard;