diff options
-rw-r--r-- | aclocal.m4 | 27 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/main.c | 2 | ||||
-rw-r--r-- | src/requests.c | 4 | ||||
-rw-r--r-- | src/torrent.c | 2 | ||||
-rw-r--r-- | src/trg-cell-renderer-eta.c | 3 | ||||
-rw-r--r-- | src/trg-cell-renderer-priority.c | 3 | ||||
-rw-r--r-- | src/trg-cell-renderer-ratio.c | 3 | ||||
-rw-r--r-- | src/trg-cell-renderer-size.c | 3 | ||||
-rw-r--r-- | src/trg-cell-renderer-speed.c | 3 | ||||
-rw-r--r-- | src/trg-cell-renderer-wanted.c | 3 | ||||
-rw-r--r-- | src/trg-files-model.c | 7 | ||||
-rw-r--r-- | src/trg-files-tree-view.c | 41 | ||||
-rw-r--r-- | src/trg-main-window.c | 86 | ||||
-rw-r--r-- | src/trg-menu-bar.c | 2 | ||||
-rw-r--r-- | src/trg-model.c | 2 | ||||
-rw-r--r-- | src/trg-peers-model.c | 12 | ||||
-rw-r--r-- | src/trg-peers-tree-view.c | 3 | ||||
-rw-r--r-- | src/trg-preferences-dialog.c | 10 | ||||
-rw-r--r-- | src/trg-remote-prefs-dialog.c | 6 | ||||
-rw-r--r-- | src/trg-toolbar.c | 3 | ||||
-rw-r--r-- | src/trg-torrent-model.c | 9 | ||||
-rw-r--r-- | src/trg-torrent-props-dialog.c | 11 | ||||
-rw-r--r-- | src/trg-torrent-tree-view.c | 4 | ||||
-rw-r--r-- | src/trg-trackers-model.c | 5 | ||||
-rw-r--r-- | src/trg-trackers-tree-view.c | 2 | ||||
-rw-r--r-- | src/trg-tree-view.c | 3 |
27 files changed, 167 insertions, 94 deletions
@@ -1057,6 +1057,33 @@ Check your system clock]) fi AC_MSG_RESULT(yes)]) +# Copyright (C) 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 1 + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`yes' being less verbose, `no' or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff --git a/configure.ac b/configure.ac index 0bf9475..28309f7 100644 --- a/configure.ac +++ b/configure.ac @@ -3,6 +3,8 @@ AC_INIT(transmission-remote-gtk, 0.1, alan@eth0.org.uk) AM_INIT_AUTOMAKE(transmission-remote-gtk, 0.1.0) AC_OUTPUT(Makefile src/Makefile) +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_HEADERS([config.h]) @@ -40,7 +40,7 @@ enum { }; static UniqueResponse -message_received_cb(UniqueApp * app, +message_received_cb(UniqueApp * app G_GNUC_UNUSED, gint command, UniqueMessageData * message, guint time_, gpointer user_data) diff --git a/src/requests.c b/src/requests.c index dbb543c..7448e96 100644 --- a/src/requests.c +++ b/src/requests.c @@ -125,7 +125,7 @@ JsonNode *torrent_get() return root; } -JsonNode *torrent_add_url(const gchar * url, gboolean paused) +JsonNode *torrent_add_url(const gchar * url, gboolean paused G_GNUC_UNUSED) { JsonNode *root = base_request(METHOD_TORRENT_ADD); JsonObject *args = node_get_arguments(root); @@ -133,7 +133,7 @@ JsonNode *torrent_add_url(const gchar * url, gboolean paused) return root; } -JsonNode *torrent_add(gchar * filename, gboolean paused) +JsonNode *torrent_add(gchar * filename, gboolean paused G_GNUC_UNUSED) { JsonNode *root = base_request(METHOD_TORRENT_ADD); JsonObject *args = node_get_arguments(root); diff --git a/src/torrent.c b/src/torrent.c index 9cc4d10..e004e4c 100644 --- a/src/torrent.c +++ b/src/torrent.c @@ -152,7 +152,7 @@ gboolean torrent_get_is_finished(JsonObject * t) gdouble torrent_get_percent_done(JsonObject * t) { JsonNode *percentDone = json_object_get_member(t, FIELD_PERCENTDONE); - GValue a = { 0 }; + GValue a; json_node_get_value(percentDone, &a); switch (G_VALUE_TYPE(&a)) { case G_TYPE_INT64: diff --git a/src/trg-cell-renderer-eta.c b/src/trg-cell-renderer-eta.c index cc5b6bb..c4f3556 100644 --- a/src/trg-cell-renderer-eta.c +++ b/src/trg-cell-renderer-eta.c @@ -105,7 +105,8 @@ trg_cell_renderer_eta_class_init(TrgCellRendererEtaClass * klass) g_type_class_add_private(klass, sizeof(TrgCellRendererEtaPrivate)); } -static void trg_cell_renderer_eta_init(TrgCellRendererEta * self) +static void +trg_cell_renderer_eta_init(TrgCellRendererEta * self G_GNUC_UNUSED) { } diff --git a/src/trg-cell-renderer-priority.c b/src/trg-cell-renderer-priority.c index c800284..b1f659c 100644 --- a/src/trg-cell-renderer-priority.c +++ b/src/trg-cell-renderer-priority.c @@ -103,7 +103,8 @@ trg_cell_renderer_priority_class_init(TrgCellRendererPriorityClass * klass) sizeof(TrgCellRendererPriorityPrivate)); } -static void trg_cell_renderer_priority_init(TrgCellRendererPriority * self) +static void +trg_cell_renderer_priority_init(TrgCellRendererPriority * self G_GNUC_UNUSED) { } diff --git a/src/trg-cell-renderer-ratio.c b/src/trg-cell-renderer-ratio.c index 0a3ddb2..2d36a3a 100644 --- a/src/trg-cell-renderer-ratio.c +++ b/src/trg-cell-renderer-ratio.c @@ -101,7 +101,8 @@ trg_cell_renderer_ratio_class_init(TrgCellRendererRatioClass * klass) g_type_class_add_private(klass, sizeof(TrgCellRendererRatioPrivate)); } -static void trg_cell_renderer_ratio_init(TrgCellRendererRatio * self) +static void +trg_cell_renderer_ratio_init(TrgCellRendererRatio * self G_GNUC_UNUSED) { } diff --git a/src/trg-cell-renderer-size.c b/src/trg-cell-renderer-size.c index 28f76ca..0fca8cd 100644 --- a/src/trg-cell-renderer-size.c +++ b/src/trg-cell-renderer-size.c @@ -101,7 +101,8 @@ trg_cell_renderer_size_class_init(TrgCellRendererSizeClass * klass) g_type_class_add_private(klass, sizeof(TrgCellRendererSizePrivate)); } -static void trg_cell_renderer_size_init(TrgCellRendererSize * self) +static void +trg_cell_renderer_size_init(TrgCellRendererSize * self G_GNUC_UNUSED) { } diff --git a/src/trg-cell-renderer-speed.c b/src/trg-cell-renderer-speed.c index d279b0b..0419797 100644 --- a/src/trg-cell-renderer-speed.c +++ b/src/trg-cell-renderer-speed.c @@ -102,7 +102,8 @@ trg_cell_renderer_speed_class_init(TrgCellRendererSpeedClass * klass) g_type_class_add_private(klass, sizeof(TrgCellRendererSpeedPrivate)); } -static void trg_cell_renderer_speed_init(TrgCellRendererSpeed * self) +static void +trg_cell_renderer_speed_init(TrgCellRendererSpeed * self G_GNUC_UNUSED) { } diff --git a/src/trg-cell-renderer-wanted.c b/src/trg-cell-renderer-wanted.c index 4f3a2be..ff90beb 100644 --- a/src/trg-cell-renderer-wanted.c +++ b/src/trg-cell-renderer-wanted.c @@ -93,7 +93,8 @@ trg_cell_renderer_wanted_class_init(TrgCellRendererWantedClass * klass) g_type_class_add_private(klass, sizeof(TrgCellRendererWantedPrivate)); } -static void trg_cell_renderer_wanted_init(TrgCellRendererWanted * self) +static void +trg_cell_renderer_wanted_init(TrgCellRendererWanted * self G_GNUC_UNUSED) { } diff --git a/src/trg-files-model.c b/src/trg-files-model.c index 35d3684..dff880a 100644 --- a/src/trg-files-model.c +++ b/src/trg-files-model.c @@ -115,8 +115,9 @@ static void trg_files_model_init(TrgFilesModel * self) gboolean trg_files_model_update_foreach(GtkListStore * model, - GtkTreePath * path, GtkTreeIter * iter, - gpointer data) + GtkTreePath * path G_GNUC_UNUSED, + GtkTreeIter * iter, + gpointer data G_GNUC_UNUSED) { TrgFilesModelPrivate *priv = TRG_FILES_MODEL_GET_PRIVATE(model); JsonObject *file; @@ -136,7 +137,7 @@ trg_files_model_update(TrgFilesModel * model, gint64 updateSerial, JsonObject * t, gboolean first) { TrgFilesModelPrivate *priv = TRG_FILES_MODEL_GET_PRIVATE(model); - int j; + guint j; if (first == TRUE) gtk_list_store_clear(GTK_LIST_STORE(model)); diff --git a/src/trg-files-tree-view.c b/src/trg-files-tree-view.c index d4367c6..d5d705f 100644 --- a/src/trg-files-tree-view.c +++ b/src/trg-files-tree-view.c @@ -47,38 +47,45 @@ static void trg_files_tree_view_class_init(TrgFilesTreeViewClass * klass) } static void set_unwanted_foreachfunc(GtkTreeModel * model, - GtkTreePath * path, - GtkTreeIter * iter, gpointer data) + GtkTreePath * path G_GNUC_UNUSED, + GtkTreeIter * iter, + gpointer data G_GNUC_UNUSED) { gtk_list_store_set(GTK_LIST_STORE(model), iter, FILESCOL_WANTED, FALSE, FILESCOL_ICON, GTK_STOCK_CANCEL, -1); } static void set_wanted_foreachfunc(GtkTreeModel * model, - GtkTreePath * path, GtkTreeIter * iter, - gpointer data) + GtkTreePath * path G_GNUC_UNUSED, + GtkTreeIter * iter, + gpointer data G_GNUC_UNUSED) { gtk_list_store_set(GTK_LIST_STORE(model), iter, FILESCOL_WANTED, TRUE, FILESCOL_ICON, GTK_STOCK_FILE, -1); } -static void set_low_foreachfunc(GtkTreeModel * model, GtkTreePath * path, - GtkTreeIter * iter, gpointer data) +static void set_low_foreachfunc(GtkTreeModel * model, + GtkTreePath * path G_GNUC_UNUSED, + GtkTreeIter * iter, + gpointer data G_GNUC_UNUSED) { gtk_list_store_set(GTK_LIST_STORE(model), iter, FILESCOL_PRIORITY, T_PRIORITY_LOW, -1); } static void set_normal_foreachfunc(GtkTreeModel * model, - GtkTreePath * path, GtkTreeIter * iter, - gpointer data) + GtkTreePath * path G_GNUC_UNUSED, + GtkTreeIter * iter, + gpointer data G_GNUC_UNUSED) { gtk_list_store_set(GTK_LIST_STORE(model), iter, FILESCOL_PRIORITY, T_PRIORITY_NORMAL, -1); } -static void set_high_foreachfunc(GtkTreeModel * model, GtkTreePath * path, - GtkTreeIter * iter, gpointer data) +static void set_high_foreachfunc(GtkTreeModel * model, + GtkTreePath * path G_GNUC_UNUSED, + GtkTreeIter * iter, + gpointer data G_GNUC_UNUSED) { gtk_list_store_set(GTK_LIST_STORE(model), iter, FILESCOL_PRIORITY, T_PRIORITY_HIGH, -1); @@ -92,7 +99,7 @@ static void add_file_id_to_array(JsonObject * args, gchar * key, } static void send_updated_file_prefs_foreachfunc(GtkTreeModel * model, - GtkTreePath * path, + GtkTreePath * path G_GNUC_UNUSED, GtkTreeIter * iter, gpointer data) { @@ -169,7 +176,7 @@ static void send_updated_file_prefs(TrgFilesTreeView * tv) priv->win); } -static void set_low(GtkWidget * w, gpointer data) +static void set_low(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgFilesTreeView *tv = TRG_FILES_TREE_VIEW(data); GtkTreeSelection *selection = @@ -179,7 +186,7 @@ static void set_low(GtkWidget * w, gpointer data) send_updated_file_prefs(tv); } -static void set_normal(GtkWidget * w, gpointer data) +static void set_normal(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgFilesTreeView *tv = TRG_FILES_TREE_VIEW(data); GtkTreeSelection *selection = @@ -189,7 +196,7 @@ static void set_normal(GtkWidget * w, gpointer data) send_updated_file_prefs(tv); } -static void set_high(GtkWidget * w, gpointer data) +static void set_high(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgFilesTreeView *tv = TRG_FILES_TREE_VIEW(data); GtkTreeSelection *selection = @@ -199,7 +206,7 @@ static void set_high(GtkWidget * w, gpointer data) send_updated_file_prefs(tv); } -static void set_unwanted(GtkWidget * w, gpointer data) +static void set_unwanted(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgFilesTreeView *tv = TRG_FILES_TREE_VIEW(data); GtkTreeSelection *selection = @@ -209,7 +216,7 @@ static void set_unwanted(GtkWidget * w, gpointer data) send_updated_file_prefs(tv); } -static void set_wanted(GtkWidget * w, gpointer data) +static void set_wanted(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgFilesTreeView *tv = TRG_FILES_TREE_VIEW(data); GtkTreeSelection *selection = @@ -221,7 +228,7 @@ static void set_wanted(GtkWidget * w, gpointer data) static void view_popup_menu(GtkWidget * treeview, GdkEventButton * event, - gpointer data) + gpointer data G_GNUC_UNUSED) { GtkWidget *menu, *menuitem; diff --git a/src/trg-main-window.c b/src/trg-main-window.c index ad602ac..92f7011 100644 --- a/src/trg-main-window.c +++ b/src/trg-main-window.c @@ -158,7 +158,7 @@ enum { PROP_CLIENT }; -static void trg_main_window_init(TrgMainWindow * self) +static void trg_main_window_init(TrgMainWindow * self G_GNUC_UNUSED) { } @@ -212,9 +212,19 @@ static void on_torrent_completed(TrgTorrentModel * model, notify = notify_notification_new(name, "This torrent has finished downloading", - GTK_STOCK_APPLY, NULL); + GTK_STOCK_APPLY +/* the fourth argument was removed in libnotify 0.7.0 */ +#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) + , NULL +#endif + ); + +#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) + notify_notification_attach_to_status_icon(notify, priv->statusIcon); +#endif + + - notify_notification_attach_to_status_icon(notify, priv->statusIcon); notify_notification_set_urgency(notify, NOTIFY_URGENCY_LOW); notify_notification_set_timeout(notify, 8000); @@ -223,8 +233,9 @@ static void on_torrent_completed(TrgTorrentModel * model, notify_notification_show(notify, NULL); } -static gboolean delete_event(GtkWidget * w, GdkEvent * event, - gpointer * data) +static gboolean delete_event(GtkWidget * w, + GdkEvent * event G_GNUC_UNUSED, + gpointer * data G_GNUC_UNUSED) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(w); int width, height; @@ -237,7 +248,8 @@ static gboolean delete_event(GtkWidget * w, GdkEvent * event, return FALSE; } -static void destroy_window(GtkWidget * w, gpointer data) +static void +destroy_window(GtkWidget * w G_GNUC_UNUSED, gpointer data G_GNUC_UNUSED) { gtk_main_quit(); } @@ -261,7 +273,7 @@ static const gchar *make_error_message(JsonObject * response, int status) } } -static void open_props_cb(GtkWidget * w, gpointer data) +static void open_props_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); TrgTorrentPropsDialog *dialog = @@ -300,7 +312,7 @@ static gpointer add_files_threadfunc(gpointer data) return NULL; } -static void add_url_cb(GtkWidget * w, gpointer data) +static void add_url_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgMainWindow *win = TRG_MAIN_WINDOW(data); TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); @@ -310,7 +322,7 @@ static void add_url_cb(GtkWidget * w, gpointer data) gtk_widget_show_all(GTK_WIDGET(dlg)); } -static void add_cb(GtkWidget * w, gpointer data) +static void add_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgMainWindowPrivate *priv; GtkWidget *dialog; @@ -355,7 +367,7 @@ static void add_cb(GtkWidget * w, gpointer data) gtk_widget_destroy(dialog); } -static void pause_cb(GtkWidget * w, gpointer data) +static void pause_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); @@ -379,7 +391,7 @@ gboolean trg_add_from_filename(TrgMainWindow * win, gchar * fileName) return FALSE; } -static void resume_cb(GtkWidget * w, gpointer data) +static void resume_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); @@ -389,7 +401,7 @@ static void resume_cb(GtkWidget * w, gpointer data) on_generic_interactive_action, data); } -static void disconnect_cb(GtkWidget * w, gpointer data) +static void disconnect_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); @@ -397,7 +409,7 @@ static void disconnect_cb(GtkWidget * w, gpointer data) trg_status_bar_push_connection_msg(priv->statusBar, "Disconnected."); } -static void connect_cb(GtkWidget * w, gpointer data) +static void connect_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgMainWindowPrivate *priv; @@ -417,6 +429,7 @@ static void connect_cb(GtkWidget * w, gpointer data) GTK_BUTTONS_OK, "Unable to retrieve connection settings from GConf. Schema not installed?"); gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); return; } @@ -425,7 +438,7 @@ static void connect_cb(GtkWidget * w, gpointer data) dispatch_async(priv->client, session_get(), on_session_get, data); } -static void open_local_prefs_cb(GtkWidget * w, gpointer data) +static void open_local_prefs_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); @@ -435,7 +448,7 @@ static void open_local_prefs_cb(GtkWidget * w, gpointer data) gtk_widget_show_all(dlg); } -static void open_remote_prefs_cb(GtkWidget * w, gpointer data) +static void open_remote_prefs_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); @@ -482,7 +495,7 @@ static TrgToolbar *trg_main_window_toolbar_new(TrgMainWindow * win) return toolBar; } -static void verify_cb(GtkWidget * w, gpointer data) +static void verify_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); @@ -559,7 +572,7 @@ static gint confirm_action_dialog(GtkWindow * win, return response; } -static void remove_cb(GtkWidget * w, gpointer data) +static void remove_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgMainWindowPrivate *priv; GtkTreeSelection *selection; @@ -581,7 +594,7 @@ static void remove_cb(GtkWidget * w, gpointer data) on_generic_interactive_action, data); } -static void delete_cb(GtkWidget * w, gpointer data) +static void delete_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgMainWindowPrivate *priv; GtkTreeSelection *selection; @@ -761,8 +774,8 @@ trg_main_window_update_notebook_displays(TrgMainWindow * win, t, first); } -static -void open_about_cb(GtkWidget * w, GtkWindow * parent) +static void +open_about_cb(GtkWidget * w G_GNUC_UNUSED, GtkWindow * parent) { GtkWidget *aboutDialog = trg_about_window_new(parent); @@ -801,12 +814,10 @@ trg_torrent_tree_view_visible_func(GtkTreeModel * model, } static -TrgTorrentTreeView *trg_main_window_torrent_tree_view_new(TrgMainWindow * - win, - GtkTreeModel * - model, - TrgStateSelector - * selector) +TrgTorrentTreeView *trg_main_window_torrent_tree_view_new( + TrgMainWindow * win, + GtkTreeModel * model, + TrgStateSelector * selector G_GNUC_UNUSED) { TrgTorrentTreeView *torrentTreeView = trg_torrent_tree_view_new(model); @@ -847,7 +858,8 @@ trg_dialog_error_handler(TrgMainWindow * win, JsonObject * response, } } -static gboolean torrent_selection_changed(GtkWidget * w, gpointer data) +static gboolean +torrent_selection_changed(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgMainWindow *win; TrgMainWindowPrivate *priv; @@ -973,8 +985,10 @@ static void entry_filter_changed_cb(GtkWidget * w, gpointer data) #endif } -static void torrent_state_selection_changed(TrgStateSelector * selector, - guint flag, gpointer data) +static void +torrent_state_selection_changed(TrgStateSelector * selector G_GNUC_UNUSED, + guint flag G_GNUC_UNUSED, + gpointer data) { gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(data)); } @@ -1032,7 +1046,7 @@ trg_main_window_set_property(GObject * object, guint property_id, } } -static void quit_cb(GtkWidget * w, gpointer data) +static void quit_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) { gtk_widget_destroy(GTK_WIDGET(data)); } @@ -1088,12 +1102,12 @@ static TrgMenuBar *trg_main_window_menu_bar_new(TrgMainWindow * win) return menuBar; } -static void status_icon_activated(GtkStatusIcon * icon, gpointer data) +static void status_icon_activated(GtkStatusIcon * icon G_GNUC_UNUSED, gpointer data) { gtk_window_present(GTK_WINDOW(data)); } -static void clear_filter_entry_cb(GtkWidget * w, gpointer data) +static void clear_filter_entry_cb(GtkWidget * w, gpointer data G_GNUC_UNUSED) { gtk_entry_set_text(GTK_ENTRY(w), ""); } @@ -1102,7 +1116,7 @@ static gboolean torrent_tv_key_press_event(GtkWidget * w, GdkEventKey * key, gpointer data) { - if (key->keyval == GDK_KEY_Delete) { + if (key->keyval == GDK_Delete) { if (key->state & GDK_SHIFT_MASK) delete_cb(w, data); else @@ -1130,7 +1144,8 @@ GtkWidget *trg_imagemenuitem_new(GtkMenuShell * shell, char *text, } static void -trg_torrent_tv_view_menu(GtkWidget * treeview, GdkEventButton * event, +trg_torrent_tv_view_menu(GtkWidget * treeview G_GNUC_UNUSED, + GdkEventButton * event, gpointer data) { GtkWidget *menu; @@ -1163,7 +1178,8 @@ trg_torrent_tv_view_menu(GtkWidget * treeview, GdkEventButton * event, } static void -trg_status_icon_view_menu(GtkStatusIcon * icon, GdkEventButton * event, +trg_status_icon_view_menu(GtkStatusIcon * icon G_GNUC_UNUSED, + GdkEventButton * event, gpointer data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); diff --git a/src/trg-menu-bar.c b/src/trg-menu-bar.c index 72af533..c2de388 100644 --- a/src/trg-menu-bar.c +++ b/src/trg-menu-bar.c @@ -367,7 +367,7 @@ static void trg_menu_bar_init(TrgMenuBar * self) trg_menu_bar_help_menu_new(TRG_MENU_BAR(self)); } -TrgMenuBar *trg_menu_bar_new(TrgMainWindow * win) +TrgMenuBar *trg_menu_bar_new(TrgMainWindow * win G_GNUC_UNUSED) { GObject *obj = g_object_new(TRG_TYPE_MENU_BAR, NULL); return TRG_MENU_BAR(obj); diff --git a/src/trg-model.c b/src/trg-model.c index 67afd12..b27c981 100644 --- a/src/trg-model.c +++ b/src/trg-model.c @@ -28,7 +28,7 @@ struct trg_model_remove_removed_foreachfunc_args { gboolean trg_model_remove_removed_foreachfunc(GtkTreeModel * model, - GtkTreePath * path, + GtkTreePath * path G_GNUC_UNUSED, GtkTreeIter * iter, gpointer data) { struct trg_model_remove_removed_foreachfunc_args *args = diff --git a/src/trg-peers-model.c b/src/trg-peers-model.c index 2f0300d..8627422 100644 --- a/src/trg-peers-model.c +++ b/src/trg-peers-model.c @@ -38,14 +38,16 @@ G_DEFINE_TYPE(TrgPeersModel, trg_peers_model, GTK_TYPE_LIST_STORE) -static void trg_peers_model_class_init(TrgPeersModelClass * klass) +static void +trg_peers_model_class_init(TrgPeersModelClass * klass G_GNUC_UNUSED) { } gboolean find_existing_peer_item_foreachfunc(GtkTreeModel * model, - GtkTreePath * path, GtkTreeIter * iter, - gpointer data) + GtkTreePath * path G_GNUC_UNUSED, + GtkTreeIter * iter, + gpointer data) { struct peerAndIter *pi; gchar *ip; @@ -114,7 +116,7 @@ void trg_peers_model_update(TrgPeersModel * model, gint64 updateSerial, { JsonArray *peers; GtkTreeIter peerIter; - int j; + guint j; gboolean isNew; peers = torrent_get_peers(t); @@ -124,7 +126,7 @@ void trg_peers_model_update(TrgPeersModel * model, gint64 updateSerial, for (j = 0; j < json_array_get_length(peers); j++) { JsonObject *peer; - const gchar *address, *flagStr; + const gchar *address=NULL, *flagStr; #if HAVE_GEOIP GeoIP *gi; const gchar *country = NULL; diff --git a/src/trg-peers-tree-view.c b/src/trg-peers-tree-view.c index 7661400..b35bebc 100644 --- a/src/trg-peers-tree-view.c +++ b/src/trg-peers-tree-view.c @@ -34,7 +34,8 @@ G_DEFINE_TYPE(TrgPeersTreeView, trg_peers_tree_view, TRG_TYPE_TREE_VIEW) -static void trg_peers_tree_view_class_init(TrgPeersTreeViewClass * klass) +static void +trg_peers_tree_view_class_init(TrgPeersTreeViewClass * klass G_GNUC_UNUSED) { } diff --git a/src/trg-preferences-dialog.c b/src/trg-preferences-dialog.c index 8f86fbd..cd8f51f 100644 --- a/src/trg-preferences-dialog.c +++ b/src/trg-preferences-dialog.c @@ -55,7 +55,7 @@ static void trg_preferences_dialog_set_property(GObject * object, guint prop_id, const GValue * value, - GParamSpec * pspec) + GParamSpec * pspec G_GNUC_UNUSED) { TrgPreferencesDialog *pref_dlg = TRG_PREFERENCES_DIALOG(object); @@ -70,7 +70,8 @@ trg_preferences_dialog_set_property(GObject * object, } static void -trg_preferences_response_cb(GtkDialog * dlg, gint res_id, gpointer data) +trg_preferences_response_cb(GtkDialog * dlg, gint res_id, + gpointer data G_GNUC_UNUSED) { switch (res_id) { default: @@ -81,8 +82,9 @@ trg_preferences_response_cb(GtkDialog * dlg, gint res_id, gpointer data) static void trg_preferences_dialog_get_property(GObject * object, - guint prop_id, - GValue * value, GParamSpec * pspec) + guint prop_id, + GValue * value, + GParamSpec * pspec G_GNUC_UNUSED) { TrgPreferencesDialog *pref_dlg = TRG_PREFERENCES_DIALOG(object); diff --git a/src/trg-remote-prefs-dialog.c b/src/trg-remote-prefs-dialog.c index 2a42224..89aefab 100644 --- a/src/trg-remote-prefs-dialog.c +++ b/src/trg-remote-prefs-dialog.c @@ -147,7 +147,8 @@ static void update_session(GtkDialog * dlg) } static void -trg_remote_prefs_response_cb(GtkDialog * dlg, gint res_id, gpointer data) +trg_remote_prefs_response_cb(GtkDialog * dlg, gint res_id, + gpointer data G_GNUC_UNUSED) { if (res_id == GTK_RESPONSE_ACCEPT) { update_session(dlg); @@ -522,7 +523,8 @@ trg_remote_prefs_dialog_class_init(TrgRemotePrefsDialogClass * klass) G_PARAM_STATIC_BLURB)); } -static void trg_remote_prefs_dialog_init(TrgRemotePrefsDialog * self) +static void +trg_remote_prefs_dialog_init(TrgRemotePrefsDialog * self G_GNUC_UNUSED) { } diff --git a/src/trg-toolbar.c b/src/trg-toolbar.c index 341501c..fc80be1 100644 --- a/src/trg-toolbar.c +++ b/src/trg-toolbar.c @@ -163,7 +163,8 @@ static void trg_toolbar_class_init(TrgToolbarClass * klass) } static -GtkWidget *trg_toolbar_item_new(TrgToolbar * toolbar, gchar * text, +GtkWidget *trg_toolbar_item_new(TrgToolbar * toolbar, + gchar * text G_GNUC_UNUSED, int *index, gchar * icon, gboolean sensitive) { diff --git a/src/trg-torrent-model.c b/src/trg-torrent-model.c index fbf4b24..eb93646 100644 --- a/src/trg-torrent-model.c +++ b/src/trg-torrent-model.c @@ -70,12 +70,13 @@ static void trg_torrent_model_class_init(TrgTorrentModelClass * klass) } -static void trg_torrent_module_count_peers(TrgTorrentModel * model, +static void trg_torrent_model_count_peers(TrgTorrentModel * model, GtkTreeIter * iter, JsonObject * t) { JsonArray *peers; - gint seeders, leechers, j; + gint seeders, leechers; + guint j; peers = torrent_get_peers(t); @@ -213,7 +214,7 @@ update_torrent_iter(gint64 serial, TrgTorrentModel * model, if ((lastFlags & TORRENT_FLAG_DOWNLOADING) && (newFlags & TORRENT_FLAG_COMPLETE)) g_signal_emit(model, signals[TMODEL_TORRENT_COMPLETED], 0, iter); - trg_torrent_module_count_peers(model, iter, t); + trg_torrent_model_count_peers(model, iter, t); g_free(statusString); g_free(statusIcon); @@ -226,7 +227,7 @@ TrgTorrentModel *trg_torrent_model_new(void) static gboolean find_existing_torrent_item_foreachfunc(GtkTreeModel * model, - GtkTreePath * path, + GtkTreePath * path G_GNUC_UNUSED, GtkTreeIter * iter, gpointer data) { struct idAndIter *ii; diff --git a/src/trg-torrent-props-dialog.c b/src/trg-torrent-props-dialog.c index 8809699..100b876 100644 --- a/src/trg-torrent-props-dialog.c +++ b/src/trg-torrent-props-dialog.c @@ -64,7 +64,7 @@ static void trg_torrent_props_dialog_set_property(GObject * object, guint prop_id, const GValue * value, - GParamSpec * pspec) + GParamSpec * pspec G_GNUC_UNUSED) { TrgTorrentPropsDialogPrivate *priv = TRG_TORRENT_PROPS_DIALOG_GET_PRIVATE(object); @@ -82,7 +82,8 @@ trg_torrent_props_dialog_set_property(GObject * object, static void trg_torrent_props_dialog_get_property(GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec) + GValue * value, + GParamSpec * pspec G_GNUC_UNUSED) { TrgTorrentPropsDialogPrivate *priv = TRG_TORRENT_PROPS_DIALOG_GET_PRIVATE(object); @@ -98,7 +99,8 @@ trg_torrent_props_dialog_get_property(GObject * object, } static void -trg_torrent_props_response_cb(GtkDialog * dlg, gint res_id, gpointer data) +trg_torrent_props_response_cb(GtkDialog * dlg, gint res_id, + gpointer data G_GNUC_UNUSED) { TrgTorrentPropsDialogPrivate *priv; JsonNode *request; @@ -348,7 +350,8 @@ trg_torrent_props_dialog_class_init(TrgTorrentPropsDialogClass * klass) G_PARAM_STATIC_BLURB)); } -static void trg_torrent_props_dialog_init(TrgTorrentPropsDialog * self) +static void +trg_torrent_props_dialog_init(TrgTorrentPropsDialog * self G_GNUC_UNUSED) { } diff --git a/src/trg-torrent-tree-view.c b/src/trg-torrent-tree-view.c index b719915..9fc0a41 100644 --- a/src/trg-torrent-tree-view.c +++ b/src/trg-torrent-tree-view.c @@ -27,7 +27,7 @@ G_DEFINE_TYPE(TrgTorrentTreeView, trg_torrent_tree_view, TRG_TYPE_TREE_VIEW) static void -trg_torrent_tree_view_class_init(TrgTorrentTreeViewClass * klass) +trg_torrent_tree_view_class_init(TrgTorrentTreeViewClass * klass G_GNUC_UNUSED) { } @@ -89,7 +89,7 @@ gint get_first_selected(TrgTorrentTreeView * view, GtkTreeIter * iter, void trg_torrent_model_get_json_id_array_foreach(GtkTreeModel * model, - GtkTreePath * path, + GtkTreePath * path G_GNUC_UNUSED, GtkTreeIter * iter, gpointer data) { diff --git a/src/trg-trackers-model.c b/src/trg-trackers-model.c index b7ae1ca..efbe16f 100644 --- a/src/trg-trackers-model.c +++ b/src/trg-trackers-model.c @@ -27,7 +27,7 @@ G_DEFINE_TYPE(TrgTrackersModel, trg_trackers_model, GTK_TYPE_LIST_STORE) void trg_trackers_model_update(TrgTrackersModel * model, JsonObject * t) { - int j; + guint j; JsonArray *trackers; gtk_list_store_clear(GTK_LIST_STORE(model)); @@ -49,7 +49,8 @@ void trg_trackers_model_update(TrgTrackersModel * model, JsonObject * t) } } -static void trg_trackers_model_class_init(TrgTrackersModelClass * klass) +static void +trg_trackers_model_class_init(TrgTrackersModelClass * klass G_GNUC_UNUSED) { } diff --git a/src/trg-trackers-tree-view.c b/src/trg-trackers-tree-view.c index 2657e28..9f6f070 100644 --- a/src/trg-trackers-tree-view.c +++ b/src/trg-trackers-tree-view.c @@ -27,7 +27,7 @@ G_DEFINE_TYPE(TrgTrackersTreeView, trg_trackers_tree_view, static void -trg_trackers_tree_view_class_init(TrgTrackersTreeViewClass * klass) +trg_trackers_tree_view_class_init(TrgTrackersTreeViewClass * klass G_GNUC_UNUSED) { } diff --git a/src/trg-tree-view.c b/src/trg-tree-view.c index fd91e83..ca196cd 100644 --- a/src/trg-tree-view.c +++ b/src/trg-tree-view.c @@ -41,7 +41,8 @@ void trg_tree_view_std_column_setup(GtkTreeViewColumn * column, int index, } } -static void trg_tree_view_class_init(TrgTreeViewClass * klass) +static void +trg_tree_view_class_init(TrgTreeViewClass * klass G_GNUC_UNUSED) { } |