s/__attribute__((unused))/G_GNUC_UNUSED/

And rewrap lines.

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

7 files changed, 81 insertions, 102 deletions

diff --git a/src/about/version.c b/src/about/version.c
index 538c04f..90be0aa 100644
--- a/src/about/version.c
+++ b/src/about/version.c
@@ -40,8 +40,8 @@ static gchar *authors[] = {
 };
 
 void
-mq_about_version_response(MqApplication __attribute__((unused)) *application,
-	GHashTable __attribute__((unused)) *query,
+mq_about_version_response(MqApplication G_GNUC_UNUSED *application,
+	GHashTable G_GNUC_UNUSED *query,
 	WebKitURISchemeRequest *request)
 {
 	gchar *title;
diff --git a/src/application.c b/src/application.c
index 17c98c5..c553bc1 100644
--- a/src/application.c
+++ b/src/application.c
@@ -50,8 +50,7 @@ set_webkit_settings(MqApplication *application)
 }
 
 MqApplication *
-mq_application_new(gchar __attribute__((unused)) *profile,
-	gboolean __attribute__((unused)) private)
+mq_application_new(gchar G_GNUC_UNUSED *profile, gboolean G_GNUC_UNUSED private)
 {
 	MqApplication    *application;
 
@@ -67,7 +66,7 @@ mq_application_new(gchar __attribute__((unused)) *profile,
 }
 
 int
-mq_application_main(MqApplication __attribute__((unused)) *application)
+mq_application_main(MqApplication G_GNUC_UNUSED *application)
 {
 	gtk_main();
 
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;
diff --git a/src/tab-chrome.c b/src/tab-chrome.c
index 5eb913f..9dd376a 100644
--- a/src/tab-chrome.c
+++ b/src/tab-chrome.c
@@ -29,15 +29,13 @@
 #include "tab.h"
 
 static void
-back_clicked_cb(GtkButton __attribute__((unused)) *toolbutton,
-	MqTabChrome *chrome)
+back_clicked_cb(GtkButton G_GNUC_UNUSED *toolbutton, MqTabChrome *chrome)
 {
 	webkit_web_view_go_back(chrome->web_view);
 }
 
 static void
-forward_clicked_cb(GtkButton __attribute__((unused)) *toolbutton,
-	MqTabChrome *chrome)
+forward_clicked_cb(GtkButton G_GNUC_UNUSED *toolbutton, MqTabChrome *chrome)
 {
 	webkit_web_view_go_forward(chrome->web_view);
 }
@@ -92,7 +90,7 @@ back_forward_list_item_new(WebKitBackForwardListItem *list_item,
 }
 
 static void
-back_forward_list_box_row_activated_cb(GtkListBox __attribute__((unused)) *box,
+back_forward_list_box_row_activated_cb(GtkListBox G_GNUC_UNUSED *box,
 	GtkListBoxRow *row, MqTabChrome *chrome)
 {
 	webkit_web_view_go_to_back_forward_list_item(chrome->web_view,
@@ -286,7 +284,7 @@ back_forward_box_button_press_cb(GtkWidget *widget, GdkEvent *event,
 }
 
 static void
-stop_reload_clicked_cb(GtkToolButton __attribute__((unused)) *toolbutton,
+stop_reload_clicked_cb(GtkToolButton G_GNUC_UNUSED *toolbutton,
 	MqTabChrome *chrome)
 {
 	if (webkit_web_view_is_loading(chrome->web_view)) {
@@ -314,32 +312,28 @@ uri_activate_cb(GtkEntry *entry, MqTabChrome *chrome)
 }
 
 static void
-zoom_out_clicked_cb(GtkButton __attribute__((unused)) *button,
-	MqTabChrome *chrome)
+zoom_out_clicked_cb(GtkButton G_GNUC_UNUSED *button, MqTabChrome *chrome)
 {
 	webkit_web_view_set_zoom_level(chrome->web_view,
 		webkit_web_view_get_zoom_level(chrome->web_view) - 0.1);
 }
 
 static void
-zoom_reset_clicked_cb(GtkButton __attribute__((unused)) *button,
-	MqTabChrome *chrome)
+zoom_reset_clicked_cb(GtkButton G_GNUC_UNUSED *button, MqTabChrome *chrome)
 {
 	webkit_web_view_set_zoom_level(chrome->web_view,
 		mq_config_get_double(chrome->config, "zoom.default"));
 }
 
 static void
-zoom_in_clicked_cb(GtkButton __attribute__((unused)) *button,
-	MqTabChrome *chrome)
+zoom_in_clicked_cb(GtkButton G_GNUC_UNUSED *button, MqTabChrome *chrome)
 {
 	webkit_web_view_set_zoom_level(chrome->web_view,
 		webkit_web_view_get_zoom_level(chrome->web_view) + 0.1);
 }
 
 static void
-developer_tools_clicked_cb(GtkButton __attribute__((unused)) *button,
-	MqTabChrome *chrome)
+developer_tools_clicked_cb(GtkButton G_GNUC_UNUSED *button, MqTabChrome *chrome)
 {
 	webkit_web_inspector_show(webkit_web_view_get_inspector(
 			chrome->web_view));
@@ -347,8 +341,7 @@ developer_tools_clicked_cb(GtkButton __attribute__((unused)) *button,
 }
 
 static void
-preferences_clicked_cb(GtkButton __attribute__((unused)) *button,
-	MqTabChrome *chrome)
+preferences_clicked_cb(GtkButton G_GNUC_UNUSED *button, MqTabChrome *chrome)
 {
 	mq_tab_new("about:preferences", chrome->tab);
 	gtk_widget_hide(chrome->menu_popover);
@@ -357,7 +350,7 @@ preferences_clicked_cb(GtkButton __attribute__((unused)) *button,
 }
 
 static void
-about_clicked_cb(GtkButton __attribute__((unused)) *button, MqTabChrome *chrome)
+about_clicked_cb(GtkButton G_GNUC_UNUSED *button, MqTabChrome *chrome)
 {
 	mq_tab_new("about:", chrome->tab);
 	gtk_widget_hide(chrome->menu_popover);
@@ -366,8 +359,8 @@ about_clicked_cb(GtkButton __attribute__((unused)) *button, MqTabChrome *chrome)
 }
 
 static void
-quit_clicked_cb(GtkButton __attribute__((unused)) *button,
-	MqTabChrome __attribute__((unused)) *chrome)
+quit_clicked_cb(GtkButton G_GNUC_UNUSED *button,
+	MqTabChrome G_GNUC_UNUSED *chrome)
 {
 	/* TODO: Make a function mq_application_quit() that shows a confirmation
 	 * dialog. */
@@ -391,7 +384,7 @@ quit_clicked_cb(GtkButton __attribute__((unused)) *button,
 
 static void
 menu_button_clicked_cb(GtkToolButton *tool_button,
-	MqTabChrome __attribute__((unused)) *chrome)
+	MqTabChrome G_GNUC_UNUSED *chrome)
 {
 	GtkWidget *grid;
 	GtkWidget *buttons[BUTTON_ROWS * BUTTON_COLS];
@@ -600,10 +593,10 @@ load_changed_cb(WebKitWebView *web_view, WebKitLoadEvent load_event,
 }
 
 static gboolean
-load_failed_cb(WebKitWebView __attribute__((unused)) *web_view,
-	WebKitLoadEvent __attribute__((unused)) load_event,
-	gchar __attribute__((unused)) *failing_uri,
-	GError __attribute__((unused)) *error, MqTabChrome *chrome)
+load_failed_cb(WebKitWebView G_GNUC_UNUSED *web_view,
+	WebKitLoadEvent G_GNUC_UNUSED load_event,
+	gchar G_GNUC_UNUSED *failing_uri, GError G_GNUC_UNUSED *error,
+	MqTabChrome *chrome)
 {
 	chrome->load_failed = TRUE;
 	return FALSE;
@@ -612,9 +605,8 @@ load_failed_cb(WebKitWebView __attribute__((unused)) *web_view,
 /* TODO: <Esc> key in URI bar should reset to URI of current hovered link, if
  * any, even if different from chrome->hovered_link_uri. */
 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,
 	MqTabChrome *chrome)
 {
 	gchar *uri;
@@ -672,8 +664,8 @@ mouse_target_changed_cb(WebKitWebView __attribute__((unused)) *web_view,
 }
 
 static void
-load_progress_cb(WebKitWebView *web_view,
-	GParamSpec __attribute__((unused)) *paramspec, MqTabChrome *chrome)
+load_progress_cb(WebKitWebView *web_view, GParamSpec G_GNUC_UNUSED *paramspec,
+	MqTabChrome *chrome)
 {
 	/*
 	 * If loading fails, the WebKitWebView's "estimated-load-progress" is
@@ -691,7 +683,7 @@ load_progress_cb(WebKitWebView *web_view,
 }
 
 static void
-uri_cb(WebKitWebView *web_view, GParamSpec __attribute__((unused)) *paramspec,
+uri_cb(WebKitWebView *web_view, GParamSpec G_GNUC_UNUSED *paramspec,
 	MqTabChrome *chrome)
 {
 	gchar *uri;
@@ -703,8 +695,8 @@ uri_cb(WebKitWebView *web_view, GParamSpec __attribute__((unused)) *paramspec,
 }
 
 static void
-loading_cb(WebKitWebView *web_view,
-	GParamSpec __attribute__((unused)) *paramspec, MqTabChrome *chrome)
+loading_cb(WebKitWebView *web_view, GParamSpec G_GNUC_UNUSED *paramspec,
+	MqTabChrome *chrome)
 {
 	if (webkit_web_view_is_loading(web_view)) {
 		gtk_tool_button_set_icon_widget(
@@ -730,9 +722,9 @@ loading_cb(WebKitWebView *web_view,
 
 static void
 back_forward_list_changed_cb(
-	WebKitBackForwardList __attribute__((unused)) *back_forward_list,
-	WebKitBackForwardListItem __attribute__((unused)) *item_added,
-	gpointer __attribute__((unused)) items_removed, MqTabChrome *chrome)
+	WebKitBackForwardList G_GNUC_UNUSED *back_forward_list,
+	WebKitBackForwardListItem G_GNUC_UNUSED *item_added,
+	gpointer G_GNUC_UNUSED items_removed, MqTabChrome *chrome)
 {
 	gtk_widget_set_sensitive(GTK_WIDGET(chrome->back_button),
 		webkit_web_view_can_go_back(chrome->web_view));
diff --git a/src/tab.c b/src/tab.c
index 0c77425..fc6d414 100644
--- a/src/tab.c
+++ b/src/tab.c
@@ -123,21 +123,21 @@ append_sibling(MqTab *new_node, MqTab *prev_sibling)
 }
 
 static void
-reload_tab_clicked_cb(GtkWidget __attribute__((unused)) *button, MqTab *tab)
+reload_tab_clicked_cb(GtkWidget G_GNUC_UNUSED *button, MqTab *tab)
 {
 	webkit_web_view_reload(tab->web_view);
 	gtk_widget_hide(tab->popover);
 }
 
 static void
-new_tab_clicked_cb(GtkWidget __attribute__((unused)) *button, MqTab *tab)
+new_tab_clicked_cb(GtkWidget G_GNUC_UNUSED *button, MqTab *tab)
 {
 	mq_tab_new(NULL, tab);
 	gtk_widget_hide(tab->popover);
 }
 
 static void
-new_window_clicked_cb(GtkWidget __attribute__((unused)) *button, MqTab *tab)
+new_window_clicked_cb(GtkWidget G_GNUC_UNUSED *button, MqTab *tab)
 {
 	mq_application_add_window(tab->application, NULL);
 	gtk_widget_hide(tab->popover);
@@ -180,10 +180,8 @@ create_tree_model(MqTab *tab)
 }
 
 static void
-row_activated_cb(GtkTreeView __attribute__((unused)) *tree_view,
-	GtkTreePath *tree_path,
-	GtkTreeViewColumn __attribute__((unused)) *tree_view_column,
-	MqTab *tab)
+row_activated_cb(GtkTreeView G_GNUC_UNUSED *tree_view, GtkTreePath *tree_path,
+	GtkTreeViewColumn G_GNUC_UNUSED *tree_view_column, MqTab *tab)
 {
 	gint *indices;
 	gint  depth;
@@ -386,8 +384,8 @@ mq_tab_populate_tab(MqTab *tab)
 }
 
 static void
-favicon_cb(WebKitWebView __attribute__((unused)) *web_view,
-	GParamSpec __attribute__((unused)) *paramspec, MqTab *tab)
+favicon_cb(WebKitWebView G_GNUC_UNUSED *web_view,
+	GParamSpec G_GNUC_UNUSED *paramspec, MqTab *tab)
 {
 	cairo_surface_t *surface;
 	GdkPixbuf       *pixbuf;
@@ -410,8 +408,8 @@ favicon_cb(WebKitWebView __attribute__((unused)) *web_view,
 }
 
 static void
-title_cb(WebKitWebView __attribute__((unused)) *web_view,
-	GParamSpec __attribute__((unused)) *paramspec, MqTab *tab)
+title_cb(WebKitWebView G_GNUC_UNUSED *web_view,
+	GParamSpec G_GNUC_UNUSED *paramspec, MqTab *tab)
 {
 	tab->title = webkit_web_view_get_title(tab->web_view);
 	if (tab->scrolling) {
diff --git a/src/web-settings.c b/src/web-settings.c
index 7e3c713..e8ed669 100644
--- a/src/web-settings.c
+++ b/src/web-settings.c
@@ -153,7 +153,7 @@ static struct mapping mappings[] = {
 static GHashTable *mappings_table = NULL;
 
 static void
-wks_bool_cb(MqConfig __attribute__((unused)) *config, const gchar *name,
+wks_bool_cb(MqConfig G_GNUC_UNUSED *config, const gchar *name,
 	const gboolean value, WebKitSettings *wk_settings)
 {
 	GValue g_value = G_VALUE_INIT;
@@ -165,7 +165,7 @@ wks_bool_cb(MqConfig __attribute__((unused)) *config, const gchar *name,
 }
 
 static void
-wks_bool_n_cb(MqConfig __attribute__((unused)) *config, const gchar *name,
+wks_bool_n_cb(MqConfig G_GNUC_UNUSED *config, const gchar *name,
 	const gboolean value, WebKitSettings *wk_settings)
 {
 	GValue g_value = G_VALUE_INIT;
@@ -177,7 +177,7 @@ wks_bool_n_cb(MqConfig __attribute__((unused)) *config, const gchar *name,
 }
 
 static void
-wks_int_cb(MqConfig __attribute__((unused)) *config, const gchar *name,
+wks_int_cb(MqConfig G_GNUC_UNUSED *config, const gchar *name,
 	const gint value, WebKitSettings *wk_settings)
 {
 	GValue g_value = G_VALUE_INIT;
@@ -189,7 +189,7 @@ wks_int_cb(MqConfig __attribute__((unused)) *config, const gchar *name,
 }
 
 static void
-wks_str_cb(MqConfig __attribute__((unused)) *config, const gchar *name,
+wks_str_cb(MqConfig G_GNUC_UNUSED *config, const gchar *name,
 	const gchar *value, WebKitSettings *wk_settings)
 {
 	GValue g_value = G_VALUE_INIT;
@@ -201,8 +201,8 @@ wks_str_cb(MqConfig __attribute__((unused)) *config, const gchar *name,
 }
 
 static void
-wkwc_spell_checking_enabled_cb(MqConfig __attribute__((unused)) *config,
-	const gchar __attribute__((unused)) *name, const gboolean value,
+wkwc_spell_checking_enabled_cb(MqConfig G_GNUC_UNUSED *config,
+	const gchar G_GNUC_UNUSED *name, const gboolean value,
 	WebKitWebContext *wk_web_context)
 {
 	webkit_web_context_set_spell_checking_enabled(wk_web_context, value);
@@ -210,8 +210,7 @@ wkwc_spell_checking_enabled_cb(MqConfig __attribute__((unused)) *config,
 
 static void
 wkwc_spell_checking_languages_cb(MqConfig *config, const gchar *name,
-	const gchar __attribute__((unused)) *value,
-	WebKitWebContext *wk_web_context)
+	const gchar G_GNUC_UNUSED *value, WebKitWebContext *wk_web_context)
 {
 	webkit_web_context_set_spell_checking_languages(wk_web_context,
 		(const gchar * const *) mq_config_get_string_list(config,
@@ -220,8 +219,7 @@ wkwc_spell_checking_languages_cb(MqConfig *config, const gchar *name,
 
 static void
 wkwc_preferred_languages_cb(MqConfig *config, const gchar *name,
-	const gchar __attribute__((unused)) *value,
-	WebKitWebContext *wk_web_context)
+	const gchar G_GNUC_UNUSED *value, WebKitWebContext *wk_web_context)
 {
 	webkit_web_context_set_preferred_languages(wk_web_context,
 		(const gchar * const *) mq_config_get_string_list(config,
@@ -229,8 +227,8 @@ wkwc_preferred_languages_cb(MqConfig *config, const gchar *name,
 }
 
 static void
-wkcm_accept_policy_cb(MqConfig __attribute__((unused)) *config,
-	const gchar __attribute__((unused)) *name, const gchar *value,
+wkcm_accept_policy_cb(MqConfig G_GNUC_UNUSED *config,
+	const gchar G_GNUC_UNUSED *name, const gchar *value,
 	WebKitCookieManager *wk_cookie_manager)
 {
 	if (g_strcmp0(value, "always") == 0) {
diff --git a/src/window.c b/src/window.c
index 8c756e9..65d2dc1 100644
--- a/src/window.c
+++ b/src/window.c
@@ -28,8 +28,8 @@
 #include "tab.h"
 
 static void
-is_maximized_cb(GtkWindow *window,
-	GParamSpec __attribute__((unused)) *paramspec, MqConfig *config)
+is_maximized_cb(GtkWindow *window, GParamSpec G_GNUC_UNUSED *paramspec,
+	MqConfig *config)
 {
 	mq_config_set_boolean(config, "window.maximized",
 		gtk_window_is_maximized(window));
@@ -37,8 +37,8 @@ is_maximized_cb(GtkWindow *window,
 }
 
 static void
-configure_event_cb(GtkWindow __attribute__((unused)) *window,
-	GdkEventConfigure *event, MqConfig *config)
+configure_event_cb(GtkWindow G_GNUC_UNUSED *window, GdkEventConfigure *event,
+	MqConfig *config)
 {
 	mq_config_set_integer(config, "window.width", event->width);
 	mq_config_set_integer(config, "window.height", event->height);
@@ -46,7 +46,7 @@ configure_event_cb(GtkWindow __attribute__((unused)) *window,
 }
 
 static void
-destroy_cb(GtkWidget __attribute__((unused)) *widget, MqWindow *window)
+destroy_cb(GtkWidget G_GNUC_UNUSED *widget, MqWindow *window)
 {
 	mq_application_delete_window(window->application, window);
 }
@@ -62,9 +62,8 @@ set_title(MqWindow *window, const gchar *title)
 }
 
 static void
-switch_page_cb(GtkNotebook __attribute__((unused)) *notebook,
-	GtkWidget __attribute__((unused)) *page, guint page_num,
-	MqWindow *window)
+switch_page_cb(GtkNotebook G_GNUC_UNUSED *notebook,
+	GtkWidget G_GNUC_UNUSED *page, guint page_num, MqWindow *window)
 {
 	window->current_tab = ++page_num;
 	
@@ -73,9 +72,9 @@ switch_page_cb(GtkNotebook __attribute__((unused)) *notebook,
 }
 
 static void
-update_positions(GtkNotebook __attribute__((unused)) *notebook,
-	GtkWidget __attribute__((unused)) *child,
-	guint __attribute__((unused)) page_num, MqWindow *window)
+update_positions(GtkNotebook G_GNUC_UNUSED *notebook,
+	GtkWidget G_GNUC_UNUSED *child, guint G_GNUC_UNUSED page_num,
+	MqWindow *window)
 {
 	/* TODO: Once MqWindow has a data structure for tabs, loop through them
 	 * all and call mq_tab_update_position(). */