diff options
Diffstat (limited to 'src/trg-main-window.c')
| -rw-r--r-- | src/trg-main-window.c | 1184 |
1 files changed, 594 insertions, 590 deletions
diff --git a/src/trg-main-window.c b/src/trg-main-window.c index 20e3185..7c84cf1 100644 --- a/src/trg-main-window.c +++ b/src/trg-main-window.c @@ -65,23 +65,23 @@ #include "trg-preferences-dialog.h" static gboolean update_selected_torrent_notebook(TrgMainWindow * win, - gboolean first); + gboolean first); static void torrent_event_notification(TrgTorrentModel * model, - gchar * icon, gchar * desc, - gint tmout, gchar * prefKey, - GtkTreeIter * iter, - gpointer * data); + gchar * icon, gchar * desc, + gint tmout, gchar * prefKey, + GtkTreeIter * iter, + gpointer * data); static void on_torrent_completed(TrgTorrentModel * model, - GtkTreeIter * iter, gpointer * data); + GtkTreeIter * iter, gpointer * data); static void on_torrent_added(TrgTorrentModel * model, GtkTreeIter * iter, - gpointer * data); + gpointer * data); static gboolean delete_event(GtkWidget * w, GdkEvent * event, - gpointer * data); + gpointer * data); static void destroy_window(GtkWidget * w, gpointer data); static void torrent_tv_onRowActivated(GtkTreeView * treeview, - GtkTreePath * path, - GtkTreeViewColumn * col, - gpointer userdata); + GtkTreePath * path, + GtkTreeViewColumn * col, + gpointer userdata); static gpointer add_files_threadfunc(gpointer data); static void add_url_cb(GtkWidget * w, gpointer data); static void add_cb(GtkWidget * w, gpointer data); @@ -98,92 +98,92 @@ static void move_cb(GtkWidget * w, gpointer data); static void delete_cb(GtkWidget * w, gpointer data); static void open_props_cb(GtkWidget * w, gpointer data); static gint confirm_action_dialog(GtkWindow * win, - GtkTreeSelection * selection, - gchar * question_single, - gchar * question_multi, - gchar * action_stock); + GtkTreeSelection * selection, + gchar * question_single, + gchar * question_multi, + gchar * action_stock); static GtkWidget *my_scrolledwin_new(GtkWidget * child); static void view_stats_toggled_cb(GtkWidget * w, gpointer data); static void view_states_toggled_cb(GtkCheckMenuItem * w, gpointer data); static void view_notebook_toggled_cb(GtkCheckMenuItem * w, gpointer data); static GtkWidget *trg_main_window_notebook_new(TrgMainWindow * win); static void on_session_get(JsonObject * response, int status, - gpointer data); + gpointer data); static void on_torrent_get_first(JsonObject * response, int status, - gpointer data); + gpointer data); static void on_torrent_get(JsonObject * response, int status, - gpointer data); + gpointer data); static gboolean trg_update_torrents_timerfunc(gpointer data); static void trg_main_window_update_notebook_displays(TrgMainWindow * win, - JsonObject * t, - GtkTreeIter * iter, - gboolean first); + JsonObject * t, + GtkTreeIter * iter, + gboolean first); static void open_about_cb(GtkWidget * w, GtkWindow * parent); static gboolean trg_torrent_tree_view_visible_func(GtkTreeModel * model, - GtkTreeIter * iter, - gpointer data); + GtkTreeIter * iter, + gpointer data); static TrgTorrentTreeView * trg_main_window_torrent_tree_view_new(TrgMainWindow * win, - GtkTreeModel * model, - TrgStateSelector * selector); + GtkTreeModel * model, + TrgStateSelector * selector); static gboolean trg_dialog_error_handler(TrgMainWindow * win, - JsonObject * response, - int status); + JsonObject * response, + int status); static gboolean torrent_selection_changed(GtkWidget * w, gpointer data); static void trg_main_window_torrent_scrub(TrgMainWindow * win); static void on_torrent_get_multipurpose(JsonObject * response, - gboolean first, int status, - gpointer data); + gboolean first, int status, + gpointer data); static void entry_filter_changed_cb(GtkWidget * w, gpointer data); static void torrent_state_selection_changed(TrgStateSelector * selector, - guint flag, gpointer data); + guint flag, gpointer data); static void trg_main_window_conn_changed(TrgMainWindow * win, - gboolean connected); + gboolean connected); static void trg_main_window_get_property(GObject * object, - guint property_id, GValue * value, - GParamSpec * pspec); + guint property_id, GValue * value, + GParamSpec * pspec); static void trg_main_window_set_property(GObject * object, - guint property_id, - const GValue * value, - GParamSpec * pspec); + guint property_id, + const GValue * value, + GParamSpec * pspec); static void quit_cb(GtkWidget * w, gpointer data); static TrgMenuBar *trg_main_window_menu_bar_new(TrgMainWindow * win); static void status_icon_activated(GtkStatusIcon * icon, gpointer data); static void clear_filter_entry_cb(GtkWidget * w, gpointer data); static gboolean torrent_tv_key_press_event(GtkWidget * w, - GdkEventKey * key, - gpointer data); + GdkEventKey * key, + gpointer data); static GtkWidget *trg_imagemenuitem_new(GtkMenuShell * shell, char *text, - char *stock_id, gboolean sensitive, - GCallback cb, gpointer cbdata); + char *stock_id, gboolean sensitive, + GCallback cb, gpointer cbdata); static void set_limit_cb(GtkWidget * w, gpointer data); static GtkWidget *limit_item_new(TrgMainWindow * win, GtkWidget * menu, - gint64 currentLimit, gint limit); + gint64 currentLimit, gint limit); static GtkWidget *limit_menu_new(TrgMainWindow * win, gchar * title, - gchar * enabledKey, gchar * speedKey, - JsonArray * ids); + gchar * enabledKey, gchar * speedKey, + JsonArray * ids); static void trg_torrent_tv_view_menu(GtkWidget * treeview, - GdkEventButton * event, - gpointer data); + GdkEventButton * event, + gpointer data); static void trg_status_icon_view_menu(GtkStatusIcon * icon, - GdkEventButton * event, - gpointer data); + GdkEventButton * event, + gpointer data); static gboolean trg_status_icon_popup_menu_cb(GtkStatusIcon * icon, - gpointer userdata); + gpointer userdata); static gboolean status_icon_button_press_event(GtkStatusIcon * icon, - GdkEventButton * event, - gpointer data); + GdkEventButton * event, + gpointer data); static gboolean torrent_tv_button_pressed_cb(GtkWidget * treeview, - GdkEventButton * event, - gpointer userdata); + GdkEventButton * event, + gpointer userdata); static gboolean torrent_tv_popup_menu_cb(GtkWidget * treeview, - gpointer userdata); + gpointer userdata); static void status_bar_text_pushed(GtkStatusbar * statusbar, - guint context_id, gchar * text, - gpointer user_data); + guint context_id, gchar * text, + gpointer user_data); static gboolean window_state_event(GtkWidget * widget, - GdkEventWindowState * event, - gpointer trayIcon); + GdkEventWindowState * event, + gpointer trayIcon); G_DEFINE_TYPE(TrgMainWindow, trg_main_window, GTK_TYPE_WINDOW) #define TRG_MAIN_WINDOW_GET_PRIVATE(o) \ @@ -231,7 +231,7 @@ static void trg_main_window_init(TrgMainWindow * self G_GNUC_UNUSED) } static gboolean update_selected_torrent_notebook(TrgMainWindow * win, - gboolean first) + gboolean first) { TrgMainWindowPrivate *priv; GtkTreeIter iter; @@ -240,27 +240,27 @@ static gboolean update_selected_torrent_notebook(TrgMainWindow * win, priv = TRG_MAIN_WINDOW_GET_PRIVATE(win); newFirstSelected = - get_first_selected(priv->client, priv->torrentTreeView, &iter, - &json); + get_first_selected(priv->client, priv->torrentTreeView, &iter, + &json); if (priv->selectedTorrentId >= 0 - && (priv->selectedTorrentId != newFirstSelected - || newFirstSelected < 0)) { - trg_main_window_torrent_scrub(win); + && (priv->selectedTorrentId != newFirstSelected + || newFirstSelected < 0)) { + trg_main_window_torrent_scrub(win); } if ((priv->selectedTorrentId = newFirstSelected) >= 0) { - trg_main_window_update_notebook_displays(win, json, &iter, first); - return TRUE; + trg_main_window_update_notebook_displays(win, json, &iter, first); + return TRUE; } return FALSE; } static void torrent_event_notification(TrgTorrentModel * model, - gchar * icon, gchar * desc, - gint tmout, gchar * prefKey, - GtkTreeIter * iter, gpointer * data) + gchar * icon, gchar * desc, + gint tmout, gchar * prefKey, + GtkTreeIter * iter, gpointer * data) { TrgMainWindowPrivate *priv; gchar *name; @@ -269,20 +269,20 @@ static void torrent_event_notification(TrgTorrentModel * model, priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); if (priv->statusIcon == NULL - || !gtk_status_icon_is_embedded(priv->statusIcon)) - return; + || !gtk_status_icon_is_embedded(priv->statusIcon)) + return; if (!gconf_client_get_bool(priv->client->gconf, prefKey, NULL)) - return; + return; gtk_tree_model_get(GTK_TREE_MODEL(model), iter, - TORRENT_COLUMN_NAME, &name, -1); + TORRENT_COLUMN_NAME, &name, -1); notify = notify_notification_new(name, desc, icon #if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) - , NULL + , NULL #endif - ); + ); #if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) notify_notification_attach_to_status_icon(notify, priv->statusIcon); @@ -297,32 +297,32 @@ static void torrent_event_notification(TrgTorrentModel * model, } static void on_torrent_completed(TrgTorrentModel * model, - GtkTreeIter * iter, gpointer * data) + GtkTreeIter * iter, gpointer * data) { torrent_event_notification(model, GTK_STOCK_APPLY, - "This torrent has completed.", 8000, - TRG_GCONF_KEY_COMPLETE_NOTIFY, iter, data); + "This torrent has completed.", 8000, + TRG_GCONF_KEY_COMPLETE_NOTIFY, iter, data); } static void on_torrent_added(TrgTorrentModel * model, - GtkTreeIter * iter, gpointer * data) + GtkTreeIter * iter, gpointer * data) { torrent_event_notification(model, GTK_STOCK_ADD, - "This torrent has been added.", 3000, - TRG_GCONF_KEY_ADD_NOTIFY, iter, data); + "This torrent has been added.", 3000, + TRG_GCONF_KEY_ADD_NOTIFY, iter, data); } static gboolean delete_event(GtkWidget * w, - GdkEvent * event G_GNUC_UNUSED, - gpointer * data G_GNUC_UNUSED) + GdkEvent * event G_GNUC_UNUSED, + gpointer * data G_GNUC_UNUSED) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(w); int width, height; gtk_window_get_size(GTK_WINDOW(w), &width, &height); gconf_client_set_int(priv->client->gconf, TRG_GCONF_KEY_WINDOW_HEIGHT, - height, NULL); + height, NULL); gconf_client_set_int(priv->client->gconf, TRG_GCONF_KEY_WINDOW_WIDTH, - width, NULL); + width, NULL); return FALSE; } @@ -337,18 +337,18 @@ static void open_props_cb(GtkWidget * w, gpointer data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); TrgTorrentPropsDialog *dialog = - trg_torrent_props_dialog_new(GTK_WINDOW(data), - priv->torrentTreeView, - priv->client); + trg_torrent_props_dialog_new(GTK_WINDOW(data), + priv->torrentTreeView, + priv->client); gtk_widget_show_all(GTK_WIDGET(dialog)); } static void torrent_tv_onRowActivated(GtkTreeView * treeview, - GtkTreePath * path G_GNUC_UNUSED, - GtkTreeViewColumn * col G_GNUC_UNUSED, - gpointer userdata) + GtkTreePath * path G_GNUC_UNUSED, + GtkTreeViewColumn * col G_GNUC_UNUSED, + gpointer userdata) { open_props_cb(GTK_WIDGET(treeview), userdata); } @@ -375,10 +375,10 @@ static gpointer add_files_threadfunc(gpointer data) args = (struct add_torrent_threadfunc_args *) data; for (li = args->list; li != NULL; li = g_slist_next(li)) { - request = torrent_add((gchar *) li->data, FALSE); - g_free(li->data); - response = dispatch(args->client, request, &status); - on_generic_interactive_action(response, status, args->cb_data); + request = torrent_add((gchar *) li->data, FALSE); + g_free(li->data); + response = dispatch(args->client, request, &status); + on_generic_interactive_action(response, status, args->cb_data); } g_slist_free(args->list); @@ -393,7 +393,7 @@ static void add_url_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); TrgTorrentAddUrlDialog *dlg = - trg_torrent_add_url_dialog_new(win, priv->client); + trg_torrent_add_url_dialog_new(win, priv->client); gtk_widget_show_all(GTK_WIDGET(dlg)); } @@ -406,12 +406,12 @@ static void add_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); dialog = gtk_file_chooser_dialog_new("Open File", - GTK_WINDOW(data), - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, - GTK_RESPONSE_ACCEPT, NULL); + GTK_WINDOW(data), + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, + GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), TRUE); filter = gtk_file_filter_new(); @@ -420,23 +420,23 @@ static void add_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - GThread *thread; - GError *error = NULL; - struct add_torrent_threadfunc_args *args; - - args = g_new(struct add_torrent_threadfunc_args, 1); - args->list = - gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog)); - args->cb_data = data; - args->client = priv->client; - - thread = - g_thread_create(add_files_threadfunc, args, FALSE, &error); - if (error != NULL) { - g_printf("thread creation error: %s\n", error->message); - g_error_free(error); - g_free(args); - } + GThread *thread; + GError *error = NULL; + struct add_torrent_threadfunc_args *args; + + args = g_new(struct add_torrent_threadfunc_args, 1); + args->list = + gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog)); + args->cb_data = data; + args->client = priv->client; + + thread = + g_thread_create(add_files_threadfunc, args, FALSE, &error); + if (error != NULL) { + g_printf("thread creation error: %s\n", error->message); + g_error_free(error); + g_free(args); + } } gtk_widget_destroy(dialog); @@ -447,9 +447,9 @@ static void pause_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); dispatch_async(priv->client, - torrent_pause(build_json_id_array - (priv->torrentTreeView)), - on_generic_interactive_action, data); + torrent_pause(build_json_id_array + (priv->torrentTreeView)), + on_generic_interactive_action, data); } gboolean trg_add_from_filename(TrgMainWindow * win, gchar * fileName) @@ -457,10 +457,10 @@ gboolean trg_add_from_filename(TrgMainWindow * win, gchar * fileName) TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(win); if (g_file_test(fileName, G_FILE_TEST_EXISTS) == TRUE) { - JsonNode *torrentAddReq = torrent_add(fileName, FALSE); - dispatch_async(priv->client, torrentAddReq, - on_generic_interactive_action, win); - return TRUE; + JsonNode *torrentAddReq = torrent_add(fileName, FALSE); + dispatch_async(priv->client, torrentAddReq, + on_generic_interactive_action, win); + return TRUE; } return FALSE; @@ -471,9 +471,9 @@ static void resume_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); dispatch_async(priv->client, - torrent_start(build_json_id_array - (priv->torrentTreeView)), - on_generic_interactive_action, data); + torrent_start(build_json_id_array + (priv->torrentTreeView)), + on_generic_interactive_action, data); } static void disconnect_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) @@ -492,36 +492,36 @@ static void connect_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); populate_result = - trg_client_populate_with_settings(priv->client, - priv->client->gconf); + trg_client_populate_with_settings(priv->client, + priv->client->gconf); if (populate_result < 0) { - gchar *msg; - - switch (populate_result) { - case TRG_GCONF_SCHEMA_ERROR: - msg = - "Unable to retrieve connection settings from GConf. Schema not installed?"; - break; - case TRG_NO_HOSTNAME_SET: - msg = "No hostname set"; - break; - default: - msg = "Unknown error getting settings"; - break; - } - - - - dialog = - gtk_message_dialog_new(GTK_WINDOW(data), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, "%s", msg); - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); - - return; + gchar *msg; + + switch (populate_result) { + case TRG_GCONF_SCHEMA_ERROR: + msg = + "Unable to retrieve connection settings from GConf. Schema not installed?"; + break; + case TRG_NO_HOSTNAME_SET: + msg = "No hostname set"; + break; + default: + msg = "Unknown error getting settings"; + break; + } + + + + dialog = + gtk_message_dialog_new(GTK_WINDOW(data), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, "%s", msg); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); + + return; } trg_status_bar_push_connection_msg(priv->statusBar, "Connecting..."); @@ -533,19 +533,19 @@ static void open_local_prefs_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); GtkWidget *dlg = - trg_preferences_dialog_get_instance(TRG_MAIN_WINDOW(data), - priv->client->gconf); + trg_preferences_dialog_get_instance(TRG_MAIN_WINDOW(data), + priv->client->gconf); gtk_widget_show_all(dlg); } static void open_remote_prefs_cb(GtkWidget * w G_GNUC_UNUSED, - gpointer data) + gpointer data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); TrgRemotePrefsDialog *dlg = - trg_remote_prefs_dialog_get_instance(TRG_MAIN_WINDOW(data), - priv->client); + trg_remote_prefs_dialog_get_instance(TRG_MAIN_WINDOW(data), + priv->client); gtk_widget_show_all(GTK_WIDGET(dlg)); } @@ -554,24 +554,24 @@ static TrgToolbar *trg_main_window_toolbar_new(TrgMainWindow * win) { GObject *b_connect, *b_disconnect, *b_add, *b_resume, *b_pause; GObject *b_remove, *b_delete, *b_props, *b_local_prefs, - *b_remote_prefs; + *b_remote_prefs; TrgToolbar *toolBar = trg_toolbar_new(); g_object_get(toolBar, - "connect-button", &b_connect, - "disconnect-button", &b_disconnect, - "add-button", &b_add, - "resume-button", &b_resume, - "pause-button", &b_pause, - "delete-button", &b_delete, - "remove-button", &b_remove, - "props-button", &b_props, - "remote-prefs-button", &b_remote_prefs, - "local-prefs-button", &b_local_prefs, NULL); + "connect-button", &b_connect, + "disconnect-button", &b_disconnect, + "add-button", &b_add, + "resume-button", &b_resume, + "pause-button", &b_pause, + "delete-button", &b_delete, + "remove-button", &b_remove, + "props-button", &b_props, + "remote-prefs-button", &b_remote_prefs, + "local-prefs-button", &b_local_prefs, NULL); g_signal_connect(b_connect, "clicked", G_CALLBACK(connect_cb), win); g_signal_connect(b_disconnect, "clicked", - G_CALLBACK(disconnect_cb), win); + G_CALLBACK(disconnect_cb), win); g_signal_connect(b_add, "clicked", G_CALLBACK(add_cb), win); g_signal_connect(b_resume, "clicked", G_CALLBACK(resume_cb), win); g_signal_connect(b_pause, "clicked", G_CALLBACK(pause_cb), win); @@ -579,9 +579,9 @@ static TrgToolbar *trg_main_window_toolbar_new(TrgMainWindow * win) g_signal_connect(b_remove, "clicked", G_CALLBACK(remove_cb), win); g_signal_connect(b_props, "clicked", G_CALLBACK(open_props_cb), win); g_signal_connect(b_local_prefs, "clicked", - G_CALLBACK(open_local_prefs_cb), win); + G_CALLBACK(open_local_prefs_cb), win); g_signal_connect(b_remote_prefs, "clicked", - G_CALLBACK(open_remote_prefs_cb), win); + G_CALLBACK(open_remote_prefs_cb), win); return toolBar; } @@ -591,16 +591,16 @@ static void verify_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); dispatch_async(priv->client, - torrent_verify(build_json_id_array - (priv->torrentTreeView)), - on_generic_interactive_action, data); + torrent_verify(build_json_id_array + (priv->torrentTreeView)), + on_generic_interactive_action, data); } static gint confirm_action_dialog(GtkWindow * win, - GtkTreeSelection * selection, - gchar * question_single, - gchar * question_multi, - gchar * action_stock) + GtkTreeSelection * selection, + gchar * question_single, + gchar * question_multi, + gchar * action_stock) { TrgMainWindowPrivate *priv; gint selectCount; @@ -612,50 +612,50 @@ static gint confirm_action_dialog(GtkWindow * win, selectCount = gtk_tree_selection_count_selected_rows(selection); if (selectCount == 1) { - GList *list; - GList *firstNode; - GtkTreeIter firstIter; - gchar *name = NULL; - - list = gtk_tree_selection_get_selected_rows(selection, NULL); - firstNode = g_list_first(list); - - gtk_tree_model_get_iter(GTK_TREE_MODEL - (priv->sortedTorrentModel), - &firstIter, firstNode->data); - gtk_tree_model_get(GTK_TREE_MODEL - (priv->sortedTorrentModel), - &firstIter, TORRENT_COLUMN_NAME, &name, -1); - g_list_free(list); - - dialog = - gtk_message_dialog_new_with_markup(GTK_WINDOW(win), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_NONE, - question_single, name); - g_free(name); + GList *list; + GList *firstNode; + GtkTreeIter firstIter; + gchar *name = NULL; + + list = gtk_tree_selection_get_selected_rows(selection, NULL); + firstNode = g_list_first(list); + + gtk_tree_model_get_iter(GTK_TREE_MODEL + (priv->sortedTorrentModel), + &firstIter, firstNode->data); + gtk_tree_model_get(GTK_TREE_MODEL + (priv->sortedTorrentModel), + &firstIter, TORRENT_COLUMN_NAME, &name, -1); + g_list_free(list); + + dialog = + gtk_message_dialog_new_with_markup(GTK_WINDOW(win), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_NONE, + question_single, name); + g_free(name); } else if (selectCount > 1) { - dialog = - gtk_message_dialog_new_with_markup(GTK_WINDOW(win), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_NONE, - question_multi, - selectCount); + dialog = + gtk_message_dialog_new_with_markup(GTK_WINDOW(win), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_NONE, + question_multi, + selectCount); } else { - return 0; + return 0; } gtk_dialog_add_buttons(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - action_stock, GTK_RESPONSE_ACCEPT, NULL); + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + action_stock, GTK_RESPONSE_ACCEPT, NULL); gtk_dialog_set_default_response(GTK_DIALOG(dialog), - GTK_RESPONSE_CANCEL); + GTK_RESPONSE_CANCEL); gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog), - GTK_RESPONSE_ACCEPT, - GTK_RESPONSE_CANCEL, -1); + GTK_RESPONSE_ACCEPT, + GTK_RESPONSE_CANCEL, -1); response = gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); @@ -666,8 +666,8 @@ static void move_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); TrgTorrentMoveDialog *dlg = - trg_torrent_move_dialog_new(TRG_MAIN_WINDOW(data), priv->client, - priv->torrentTreeView); + trg_torrent_move_dialog_new(TRG_MAIN_WINDOW(data), priv->client, + priv->torrentTreeView); gtk_widget_show_all(GTK_WIDGET(dlg)); } @@ -680,19 +680,19 @@ static void remove_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); selection = - gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->torrentTreeView)); + gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->torrentTreeView)); ids = build_json_id_array(priv->torrentTreeView); if (confirm_action_dialog - (GTK_WINDOW(data), selection, - "<big><b>Remove torrent \"%s\"?</b></big>", - "<big><b>Remove %d torrents?</b></big>", - GTK_STOCK_REMOVE) == GTK_RESPONSE_ACCEPT) - dispatch_async(priv->client, - torrent_remove(ids, - FALSE), - on_generic_interactive_action, data); + (GTK_WINDOW(data), selection, + "<big><b>Remove torrent \"%s\"?</b></big>", + "<big><b>Remove %d torrents?</b></big>", + GTK_STOCK_REMOVE) == GTK_RESPONSE_ACCEPT) + dispatch_async(priv->client, + torrent_remove(ids, + FALSE), + on_generic_interactive_action, data); else - json_array_unref(ids); + json_array_unref(ids); } static void delete_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) @@ -704,20 +704,20 @@ static void delete_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); selection = - gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->torrentTreeView)); + gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->torrentTreeView)); ids = build_json_id_array(priv->torrentTreeView); if (confirm_action_dialog - (GTK_WINDOW(data), selection, - "<big><b>Remove and delete torrent \"%s\"?</b></big>", - "<big><b>Remove and delete %d torrents?</b></big>", - GTK_STOCK_DELETE) == GTK_RESPONSE_ACCEPT) - dispatch_async(priv->client, - torrent_remove(ids, - TRUE), - on_generic_interactive_action, data); + (GTK_WINDOW(data), selection, + "<big><b>Remove and delete torrent \"%s\"?</b></big>", + "<big><b>Remove and delete %d torrents?</b></big>", + GTK_STOCK_DELETE) == GTK_RESPONSE_ACCEPT) + dispatch_async(priv->client, + torrent_remove(ids, + TRUE), + on_generic_interactive_action, data); else - json_array_unref(ids); + json_array_unref(ids); } static @@ -725,8 +725,8 @@ GtkWidget *my_scrolledwin_new(GtkWidget * child) { GtkWidget *scrolled_win = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_win), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); gtk_container_add(GTK_CONTAINER(scrolled_win), child); return scrolled_win; } @@ -736,7 +736,7 @@ static void view_stats_toggled_cb(GtkWidget * w, gpointer data) TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); TrgStatsDialog *dlg = - trg_stats_dialog_get_instance(TRG_MAIN_WINDOW(data), priv->client); + trg_stats_dialog_get_instance(TRG_MAIN_WINDOW(data), priv->client); gtk_widget_show_all(GTK_WIDGET(dlg)); } @@ -745,14 +745,14 @@ static void view_states_toggled_cb(GtkCheckMenuItem * w, gpointer data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); gtk_widget_set_visible(GTK_WIDGET(priv->stateSelector), - gtk_check_menu_item_get_active(w)); + gtk_check_menu_item_get_active(w)); } static void view_notebook_toggled_cb(GtkCheckMenuItem * w, gpointer data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); gtk_widget_set_visible(priv->notebook, - gtk_check_menu_item_get_active(w)); + gtk_check_menu_item_get_active(w)); } static @@ -766,31 +766,31 @@ GtkWidget *trg_main_window_notebook_new(TrgMainWindow * win) priv->genDetails = trg_general_panel_new(priv->sortedTorrentModel); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), - GTK_WIDGET(priv->genDetails), - gtk_label_new("General")); + GTK_WIDGET(priv->genDetails), + gtk_label_new("General")); priv->trackersModel = trg_trackers_model_new(); priv->trackersTreeView = - trg_trackers_tree_view_new(priv->trackersModel, priv->client, win); + trg_trackers_tree_view_new(priv->trackersModel, priv->client, win); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), - my_scrolledwin_new(GTK_WIDGET - (priv->trackersTreeView)), - gtk_label_new("Trackers")); + my_scrolledwin_new(GTK_WIDGET + (priv->trackersTreeView)), + gtk_label_new("Trackers")); priv->filesModel = trg_files_model_new(); priv->filesTreeView = - trg_files_tree_view_new(priv->filesModel, win, priv->client); + trg_files_tree_view_new(priv->filesModel, win, priv->client); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), - my_scrolledwin_new(GTK_WIDGET - (priv->filesTreeView)), - gtk_label_new("Files")); + my_scrolledwin_new(GTK_WIDGET + (priv->filesTreeView)), + gtk_label_new("Files")); priv->peersModel = trg_peers_model_new(); priv->peersTreeView = trg_peers_tree_view_new(priv->peersModel); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), - my_scrolledwin_new(GTK_WIDGET - (priv->peersTreeView)), - gtk_label_new("Peers")); + my_scrolledwin_new(GTK_WIDGET + (priv->peersTreeView)), + gtk_label_new("Peers")); return notebook; } @@ -800,7 +800,7 @@ void on_session_set(JsonObject * response, int status, gpointer data) TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); if (status == CURLE_OK || status == FAIL_RESPONSE_UNSUCCESSFUL) - dispatch_async(priv->client, session_get(), on_session_get, data); + dispatch_async(priv->client, session_get(), on_session_get, data); gdk_threads_enter(); trg_dialog_error_handler(TRG_MAIN_WINDOW(data), response, status); @@ -810,7 +810,7 @@ void on_session_set(JsonObject * response, int status, gpointer data) } static void on_session_get(JsonObject * response, int status, - gpointer data) + gpointer data) { TrgMainWindow *win = TRG_MAIN_WINDOW(data); TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); @@ -820,18 +820,18 @@ static void on_session_get(JsonObject * response, int status, gdk_threads_enter(); if (trg_dialog_error_handler(win, response, status) == TRUE) { - response_unref(response); - gdk_threads_leave(); - return; + response_unref(response); + gdk_threads_leave(); + return; } newSession = get_arguments(response); if (client->session == NULL) { - trg_status_bar_connect(priv->statusBar, newSession); - trg_main_window_conn_changed(win, TRUE); + trg_status_bar_connect(priv->statusBar, newSession); + trg_main_window_conn_changed(win, TRUE); - dispatch_async(client, torrent_get(), on_torrent_get_first, data); + dispatch_async(client, torrent_get(), on_torrent_get_first, data); } trg_client_set_session(client, newSession); @@ -849,7 +849,7 @@ on_torrent_get_first(JsonObject * response, int status, gpointer data) } static void on_torrent_get(JsonObject * response, int status, - gpointer data) + gpointer data) { on_torrent_get_multipurpose(response, FALSE, status, data); } @@ -859,16 +859,16 @@ static gboolean trg_update_torrents_timerfunc(gpointer data) TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); if (priv->client->session != NULL) - dispatch_async(priv->client, torrent_get(), on_torrent_get, data); + dispatch_async(priv->client, torrent_get(), on_torrent_get, data); return FALSE; } static void trg_main_window_update_notebook_displays(TrgMainWindow * win, - JsonObject * t, - GtkTreeIter * iter, - gboolean first) + JsonObject * t, + GtkTreeIter * iter, + gboolean first) { TrgMainWindowPrivate *priv; trg_client *client; @@ -877,11 +877,12 @@ trg_main_window_update_notebook_displays(TrgMainWindow * win, client = priv->client; trg_general_panel_update(priv->genDetails, t, iter); - trg_trackers_model_update(priv->trackersModel, client->updateSerial, t, first); - trg_files_model_update(priv->filesModel, client->updateSerial, - t, first); - trg_peers_model_update(priv->peersModel, client->updateSerial, - t, first); + trg_trackers_model_update(priv->trackersModel, client->updateSerial, t, + first); + trg_files_model_update(priv->filesModel, client->updateSerial, t, + first); + trg_peers_model_update(priv->peersModel, client->updateSerial, t, + first); } static void open_about_cb(GtkWidget * w G_GNUC_UNUSED, GtkWindow * parent) @@ -894,7 +895,7 @@ static void open_about_cb(GtkWidget * w G_GNUC_UNUSED, GtkWindow * parent) static gboolean trg_torrent_tree_view_visible_func(GtkTreeModel * model, - GtkTreeIter * iter, gpointer data) + GtkTreeIter * iter, gpointer data) { guint flags; gchar *name = NULL; @@ -905,16 +906,16 @@ trg_torrent_tree_view_visible_func(GtkTreeModel * model, guint32 criteria = trg_state_selector_get_flag(priv->stateSelector); gtk_tree_model_get(model, iter, - TORRENT_COLUMN_FLAGS, &flags, - TORRENT_COLUMN_NAME, &name, -1); + TORRENT_COLUMN_FLAGS, &flags, + TORRENT_COLUMN_NAME, &name, -1); if (criteria != 0 && !(flags & criteria)) { - visible = FALSE; + visible = FALSE; } else if (name != NULL) { - const gchar *filterText = - gtk_entry_get_text(GTK_ENTRY(priv->filterEntry)); - if (strlen(filterText) > 0 && strstr(name, filterText) == NULL) - visible = FALSE; + const gchar *filterText = + gtk_entry_get_text(GTK_ENTRY(priv->filterEntry)); + if (strlen(filterText) > 0 && strstr(name, filterText) == NULL) + visible = FALSE; } g_free(name); @@ -924,50 +925,50 @@ trg_torrent_tree_view_visible_func(GtkTreeModel * model, static TrgTorrentTreeView *trg_main_window_torrent_tree_view_new(TrgMainWindow * - win, - GtkTreeModel * - model, - TrgStateSelector - * - selector - G_GNUC_UNUSED) + win, + GtkTreeModel * + model, + TrgStateSelector + * + selector + G_GNUC_UNUSED) { TrgTorrentTreeView *torrentTreeView = trg_torrent_tree_view_new(model); GtkTreeSelection *selection = - gtk_tree_view_get_selection(GTK_TREE_VIEW(torrentTreeView)); + gtk_tree_view_get_selection(GTK_TREE_VIEW(torrentTreeView)); g_signal_connect(G_OBJECT(selection), "changed", - G_CALLBACK(torrent_selection_changed), win); + G_CALLBACK(torrent_selection_changed), win); return torrentTreeView; } static gboolean trg_dialog_error_handler(TrgMainWindow * win, JsonObject * response, - int status) + int status) { TrgMainWindowPrivate *priv; priv = TRG_MAIN_WINDOW_GET_PRIVATE(win); if (status != CURLE_OK) { - GtkWidget *dialog; - const gchar *msg; - - msg = make_error_message(response, status); - trg_status_bar_push_connection_msg(priv->statusBar, msg); - dialog = gtk_message_dialog_new(GTK_WINDOW(win), - GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, "%s", msg); - gtk_window_set_title(GTK_WINDOW(dialog), "Error"); - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); - g_free((gpointer) msg); - return TRUE; + GtkWidget *dialog; + const gchar *msg; + + msg = make_error_message(response, status); + trg_status_bar_push_connection_msg(priv->statusBar, msg); + dialog = gtk_message_dialog_new(GTK_WINDOW(win), + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, "%s", msg); + gtk_window_set_title(GTK_WINDOW(dialog), "Error"); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); + g_free((gpointer) msg); + return TRUE; } else { - return FALSE; + return FALSE; } } @@ -989,14 +990,15 @@ torrent_selection_changed(GtkWidget * w G_GNUC_UNUSED, gpointer data) trg_menu_bar_torrent_actions_sensitive(priv->menuBar, isSelected); if (!isSelected) - trg_trackers_model_set_no_selection(TRG_TRACKERS_MODEL(priv->trackersModel)); + trg_trackers_model_set_no_selection(TRG_TRACKERS_MODEL + (priv->trackersModel)); return TRUE; } void on_generic_interactive_action(JsonObject * response, int status, - gpointer data) + gpointer data) { gdk_threads_enter(); trg_dialog_error_handler(TRG_MAIN_WINDOW(data), response, status); @@ -1018,7 +1020,7 @@ void trg_main_window_torrent_scrub(TrgMainWindow * win) static void on_torrent_get_multipurpose(JsonObject * response, gboolean first, - int status, gpointer data) + int status, gpointer data) { trg_torrent_model_update_stats stats; TrgMainWindowPrivate *priv; @@ -1031,34 +1033,35 @@ on_torrent_get_multipurpose(JsonObject * response, gboolean first, /* Disconnected between request and response callback */ if (client->session == NULL) { - gdk_threads_leave(); - response_unref(response); - return; + gdk_threads_leave(); + response_unref(response); + return; } if (status != CURLE_OK) { - client->failCount++; - if (client->failCount >= 3) { - trg_main_window_conn_changed(TRG_MAIN_WINDOW(data), FALSE); - trg_dialog_error_handler(TRG_MAIN_WINDOW(data), - response, status); - } else { - const gchar *msg; - gchar *statusBarMsg; - - msg = make_error_message(response, status); - statusBarMsg = - g_strdup_printf("Request %d/%d failed: %s", - client->failCount, 3, msg); - trg_status_bar_push_connection_msg(priv->statusBar, - statusBarMsg); - g_free((gpointer) msg); - g_free(statusBarMsg); - g_timeout_add_seconds(client->interval, trg_update_torrents_timerfunc, data); - } - gdk_threads_leave(); - response_unref(response); - return; + client->failCount++; + if (client->failCount >= 3) { + trg_main_window_conn_changed(TRG_MAIN_WINDOW(data), FALSE); + trg_dialog_error_handler(TRG_MAIN_WINDOW(data), + response, status); + } else { + const gchar *msg; + gchar *statusBarMsg; + + msg = make_error_message(response, status); + statusBarMsg = + g_strdup_printf("Request %d/%d failed: %s", + client->failCount, 3, msg); + trg_status_bar_push_connection_msg(priv->statusBar, + statusBarMsg); + g_free((gpointer) msg); + g_free(statusBarMsg); + g_timeout_add_seconds(client->interval, + trg_update_torrents_timerfunc, data); + } + gdk_threads_leave(); + response_unref(response); + return; } client->failCount = 0; @@ -1073,7 +1076,7 @@ on_torrent_get_multipurpose(JsonObject * response, gboolean first, client->updateSerial++; trg_torrent_model_update(priv->torrentModel, priv->client, - response, &stats, first); + response, &stats, first); update_selected_torrent_notebook(TRG_MAIN_WINDOW(data), first); @@ -1081,7 +1084,8 @@ on_torrent_get_multipurpose(JsonObject * response, gboolean first, trg_status_bar_update(priv->statusBar, &stats); - g_timeout_add_seconds(client->interval, trg_update_torrents_timerfunc, data); + g_timeout_add_seconds(client->interval, trg_update_torrents_timerfunc, + data); gdk_threads_leave(); response_unref(response); @@ -1093,11 +1097,11 @@ static void entry_filter_changed_cb(GtkWidget * w, gpointer data) gboolean clearSensitive = gtk_entry_get_text_length(GTK_ENTRY(w)) > 0; gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER - (priv->filteredTorrentModel)); + (priv->filteredTorrentModel)); #if GTK_CHECK_VERSION( 2,16,0 ) g_object_set(priv->filterEntryClearButton, - "secondary-icon-sensitive", clearSensitive, NULL); + "secondary-icon-sensitive", clearSensitive, NULL); #else gtk_widget_set_sensitive(priv->filterEntryClearButton, clearSensitive); #endif @@ -1105,7 +1109,7 @@ static void entry_filter_changed_cb(GtkWidget * w, gpointer data) static void torrent_state_selection_changed(TrgStateSelector * selector G_GNUC_UNUSED, - guint flag G_GNUC_UNUSED, gpointer data) + guint flag G_GNUC_UNUSED, gpointer data) { gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(data)); } @@ -1123,43 +1127,43 @@ void trg_main_window_conn_changed(TrgMainWindow * win, gboolean connected) gtk_widget_set_sensitive(GTK_WIDGET(priv->peersTreeView), connected); gtk_widget_set_sensitive(GTK_WIDGET(priv->filesTreeView), connected); gtk_widget_set_sensitive(GTK_WIDGET(priv->trackersTreeView), - connected); + connected); gtk_widget_set_sensitive(GTK_WIDGET(priv->genDetails), connected); if (connected == FALSE) { - json_object_unref(tc->session); - tc->session = NULL; + json_object_unref(tc->session); + tc->session = NULL; - gtk_list_store_clear(GTK_LIST_STORE(priv->torrentModel)); - trg_main_window_torrent_scrub(win); + gtk_list_store_clear(GTK_LIST_STORE(priv->torrentModel)); + trg_main_window_torrent_scrub(win); } } static void trg_main_window_get_property(GObject * object, guint property_id, - GValue * value, GParamSpec * pspec) + GValue * value, GParamSpec * pspec) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(object); switch (property_id) { case PROP_CLIENT: - g_value_set_pointer(value, priv->client); - break; + g_value_set_pointer(value, priv->client); + break; default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); } } static void trg_main_window_set_property(GObject * object, guint property_id, - const GValue * value, GParamSpec * pspec) + const GValue * value, GParamSpec * pspec) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(object); switch (property_id) { case PROP_CLIENT: - priv->client = g_value_get_pointer(value); - break; + priv->client = g_value_get_pointer(value); + break; default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); } } @@ -1171,34 +1175,34 @@ static void quit_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) static TrgMenuBar *trg_main_window_menu_bar_new(TrgMainWindow * win) { GObject *b_connect, *b_disconnect, *b_add, *b_resume, *b_pause, - *b_verify, *b_remove, *b_delete, *b_props, *b_local_prefs, - *b_remote_prefs, *b_about, *b_view_states, *b_view_notebook, - *b_view_stats, *b_add_url, *b_quit, *b_move; + *b_verify, *b_remove, *b_delete, *b_props, *b_local_prefs, + *b_remote_prefs, *b_about, *b_view_states, *b_view_notebook, + *b_view_stats, *b_add_url, *b_quit, *b_move; TrgMenuBar *menuBar; menuBar = trg_menu_bar_new(win); g_object_get(menuBar, - "connect-button", &b_connect, - "disconnect-button", &b_disconnect, - "add-button", &b_add, - "add-url-button", &b_add_url, - "resume-button", &b_resume, - "pause-button", &b_pause, - "delete-button", &b_delete, - "remove-button", &b_remove, - "move-button", &b_move, - "verify-button", &b_verify, - "props-button", &b_props, - "remote-prefs-button", &b_remote_prefs, - "local-prefs-button", &b_local_prefs, - "view-notebook-button", &b_view_notebook, - "view-states-button", &b_view_states, - "view-stats-button", &b_view_stats, - "about-button", &b_about, "quit-button", &b_quit, NULL); + "connect-button", &b_connect, + "disconnect-button", &b_disconnect, + "add-button", &b_add, + "add-url-button", &b_add_url, + "resume-button", &b_resume, + "pause-button", &b_pause, + "delete-button", &b_delete, + "remove-button", &b_remove, + "move-button", &b_move, + "verify-button", &b_verify, + "props-button", &b_props, + "remote-prefs-button", &b_remote_prefs, + "local-prefs-button", &b_local_prefs, + "view-notebook-button", &b_view_notebook, + "view-states-button", &b_view_states, + "view-stats-button", &b_view_stats, + "about-button", &b_about, "quit-button", &b_quit, NULL); g_signal_connect(b_connect, "activate", G_CALLBACK(connect_cb), win); g_signal_connect(b_disconnect, "activate", - G_CALLBACK(disconnect_cb), win); + G_CALLBACK(disconnect_cb), win); g_signal_connect(b_add, "activate", G_CALLBACK(add_cb), win); g_signal_connect(b_add_url, "activate", G_CALLBACK(add_url_cb), win); g_signal_connect(b_resume, "activate", G_CALLBACK(resume_cb), win); @@ -1209,15 +1213,15 @@ static TrgMenuBar *trg_main_window_menu_bar_new(TrgMainWindow * win) g_signal_connect(b_move, "activate", G_CALLBACK(move_cb), win); g_signal_connect(b_about, "activate", G_CALLBACK(open_about_cb), win); g_signal_connect(b_local_prefs, "activate", - G_CALLBACK(open_local_prefs_cb), win); + G_CALLBACK(open_local_prefs_cb), win); g_signal_connect(b_remote_prefs, "activate", - G_CALLBACK(open_remote_prefs_cb), win); + G_CALLBACK(open_remote_prefs_cb), win); g_signal_connect(b_view_notebook, "toggled", - G_CALLBACK(view_notebook_toggled_cb), win); + G_CALLBACK(view_notebook_toggled_cb), win); g_signal_connect(b_view_states, "toggled", - G_CALLBACK(view_states_toggled_cb), win); + G_CALLBACK(view_states_toggled_cb), win); g_signal_connect(b_view_stats, "activate", - G_CALLBACK(view_stats_toggled_cb), win); + G_CALLBACK(view_stats_toggled_cb), win); g_signal_connect(b_props, "activate", G_CALLBACK(open_props_cb), win); g_signal_connect(b_quit, "activate", G_CALLBACK(quit_cb), win); @@ -1225,41 +1229,41 @@ static TrgMenuBar *trg_main_window_menu_bar_new(TrgMainWindow * win) } static void status_icon_activated(GtkStatusIcon * icon G_GNUC_UNUSED, - gpointer data) + gpointer data) { gtk_window_deiconify(GTK_WINDOW(data)); gtk_window_present(GTK_WINDOW(data)); } static void clear_filter_entry_cb(GtkWidget * w, - gpointer data G_GNUC_UNUSED) + gpointer data G_GNUC_UNUSED) { gtk_entry_set_text(GTK_ENTRY(w), ""); } static gboolean torrent_tv_key_press_event(GtkWidget * w, - GdkEventKey * key, - gpointer data) + GdkEventKey * key, + gpointer data) { if (key->keyval == GDK_Delete) { - if (key->state & GDK_SHIFT_MASK) - delete_cb(w, data); - else - remove_cb(w, data); + if (key->state & GDK_SHIFT_MASK) + delete_cb(w, data); + else + remove_cb(w, data); } return FALSE; } static GtkWidget *trg_imagemenuitem_new(GtkMenuShell * shell, char *text, - char *stock_id, gboolean sensitive, - GCallback cb, gpointer cbdata) + char *stock_id, gboolean sensitive, + GCallback cb, gpointer cbdata) { GtkWidget *item = gtk_image_menu_item_new_with_label(stock_id); gtk_image_menu_item_set_use_stock(GTK_IMAGE_MENU_ITEM(item), TRUE); gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM - (item), TRUE); + (item), TRUE); gtk_menu_item_set_label(GTK_MENU_ITEM(item), text); g_signal_connect(item, "activate", cb, cbdata); gtk_widget_set_sensitive(item, sensitive); @@ -1282,27 +1286,27 @@ static void set_limit_cb(GtkWidget * w, gpointer data) JsonNode *req = NULL; JsonObject *args; if (limitIds == NULL) { - req = session_set(); + req = session_set(); } else { - req = torrent_set((JsonArray *) limitIds); + req = torrent_set((JsonArray *) limitIds); } args = node_get_arguments(req); if (speed >= 0) - json_object_set_int_member(args, speedKey, speed); + json_object_set_int_member(args, speedKey, speed); json_object_set_boolean_member(args, enabledKey, speed >= 0); if (limitIds == NULL) - dispatch_async(priv->client, req, on_session_set, data); + dispatch_async(priv->client, req, on_session_set, data); else - dispatch_async(priv->client, req, on_generic_interactive_action, - data); + dispatch_async(priv->client, req, on_generic_interactive_action, + data); } static GtkWidget *limit_item_new(TrgMainWindow * win, GtkWidget * menu, - gint64 currentLimit, gint limit) + gint64 currentLimit, gint limit) { char speed[32]; GtkWidget *item; @@ -1320,8 +1324,8 @@ static GtkWidget *limit_item_new(TrgMainWindow * win, GtkWidget * menu, } static GtkWidget *limit_menu_new(TrgMainWindow * win, gchar * title, - gchar * enabledKey, gchar * speedKey, - JsonArray * ids) + gchar * enabledKey, gchar * speedKey, + JsonArray * ids) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(win); @@ -1331,27 +1335,27 @@ static GtkWidget *limit_menu_new(TrgMainWindow * win, gchar * title, gint64 limit; if (ids == NULL) - current = priv->client->session; + current = priv->client->session; else - get_first_selected(priv->client, priv->torrentTreeView, &iter, - ¤t); + get_first_selected(priv->client, priv->torrentTreeView, &iter, + ¤t); limit = json_object_get_boolean_member(current, enabledKey) ? - json_object_get_int_member(current, speedKey) : -1; + json_object_get_int_member(current, speedKey) : -1; toplevel = gtk_image_menu_item_new_with_label(GTK_STOCK_NETWORK); gtk_image_menu_item_set_use_stock(GTK_IMAGE_MENU_ITEM(toplevel), TRUE); gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM - (toplevel), TRUE); + (toplevel), TRUE); gtk_menu_item_set_label(GTK_MENU_ITEM(toplevel), title); menu = gtk_menu_new(); g_object_set_data_full(G_OBJECT(menu), "speedKey", - g_strdup(speedKey), g_free); + g_strdup(speedKey), g_free); g_object_set_data_full(G_OBJECT(menu), "enabledKey", - g_strdup(enabledKey), g_free); + g_strdup(enabledKey), g_free); g_object_set_data_full(G_OBJECT(menu), "limit-ids", ids, - (GDestroyNotify) json_array_unref); + (GDestroyNotify) json_array_unref); item = gtk_check_menu_item_new_with_label("No Limit"); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), limit < 0); @@ -1360,7 +1364,7 @@ static GtkWidget *limit_menu_new(TrgMainWindow * win, gchar * title, gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); gtk_menu_shell_append(GTK_MENU_SHELL(menu), - gtk_separator_menu_item_new()); + gtk_separator_menu_item_new()); limit_item_new(win, menu, limit, 0); limit_item_new(win, menu, limit, 5); @@ -1382,7 +1386,7 @@ static GtkWidget *limit_menu_new(TrgMainWindow * win, gchar * title, static void trg_torrent_tv_view_menu(GtkWidget * treeview, - GdkEventButton * event, gpointer data) + GdkEventButton * event, gpointer data) { GtkWidget *menu; JsonArray *ids; @@ -1391,46 +1395,46 @@ trg_torrent_tv_view_menu(GtkWidget * treeview, ids = build_json_id_array(TRG_TORRENT_TREE_VIEW(treeview)); trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Properties", - GTK_STOCK_PROPERTIES, TRUE, - G_CALLBACK(open_props_cb), data); + GTK_STOCK_PROPERTIES, TRUE, + G_CALLBACK(open_props_cb), data); trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Resume", - GTK_STOCK_MEDIA_PLAY, TRUE, - G_CALLBACK(resume_cb), data); + GTK_STOCK_MEDIA_PLAY, TRUE, + G_CALLBACK(resume_cb), data); trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Pause", - GTK_STOCK_MEDIA_PAUSE, TRUE, - G_CALLBACK(pause_cb), data); + GTK_STOCK_MEDIA_PAUSE, TRUE, + G_CALLBACK(pause_cb), data); trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Verify", - GTK_STOCK_REFRESH, TRUE, G_CALLBACK(verify_cb), - data); + GTK_STOCK_REFRESH, TRUE, G_CALLBACK(verify_cb), + data); trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Move", - GTK_STOCK_HARDDISK, TRUE, G_CALLBACK(move_cb), - data); + GTK_STOCK_HARDDISK, TRUE, G_CALLBACK(move_cb), + data); trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Remove", GTK_STOCK_REMOVE, - TRUE, G_CALLBACK(remove_cb), data); + TRUE, G_CALLBACK(remove_cb), data); trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Remove & Delete", - GTK_STOCK_DELETE, TRUE, G_CALLBACK(delete_cb), - data); + GTK_STOCK_DELETE, TRUE, G_CALLBACK(delete_cb), + data); gtk_menu_shell_append(GTK_MENU_SHELL(menu), - limit_menu_new(TRG_MAIN_WINDOW(data), - "Down Limit", - FIELD_DOWNLOAD_LIMITED, - FIELD_DOWNLOAD_LIMIT, ids)); + limit_menu_new(TRG_MAIN_WINDOW(data), + "Down Limit", + FIELD_DOWNLOAD_LIMITED, + FIELD_DOWNLOAD_LIMIT, ids)); gtk_menu_shell_append(GTK_MENU_SHELL(menu), - limit_menu_new(TRG_MAIN_WINDOW(data), "Up Limit", - FIELD_UPLOAD_LIMITED, - FIELD_UPLOAD_LIMIT, ids)); + limit_menu_new(TRG_MAIN_WINDOW(data), "Up Limit", + FIELD_UPLOAD_LIMITED, + FIELD_UPLOAD_LIMIT, ids)); gtk_widget_show_all(menu); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, - (event != NULL) ? event->button : 0, - gdk_event_get_time((GdkEvent *) event)); + (event != NULL) ? event->button : 0, + gdk_event_get_time((GdkEvent *) event)); } static void trg_status_icon_view_menu(GtkStatusIcon * icon G_GNUC_UNUSED, - GdkEventButton * event, gpointer data) + GdkEventButton * event, gpointer data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data); gboolean connected = priv->client->session != NULL; @@ -1439,132 +1443,132 @@ trg_status_icon_view_menu(GtkStatusIcon * icon G_GNUC_UNUSED, menu = gtk_menu_new(); if (!connected) { - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Connect", - GTK_STOCK_CONNECT, !connected, - G_CALLBACK(connect_cb), data); + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Connect", + GTK_STOCK_CONNECT, !connected, + G_CALLBACK(connect_cb), data); } else { - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Disconnect", - GTK_STOCK_DISCONNECT, connected, - G_CALLBACK(disconnect_cb), data); - - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Add", GTK_STOCK_ADD, - connected, G_CALLBACK(add_cb), data); - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Add from URL", - GTK_STOCK_ADD, connected, - G_CALLBACK(add_url_cb), data); - - gtk_menu_shell_append(GTK_MENU_SHELL(menu), - limit_menu_new(TRG_MAIN_WINDOW(data), - "Down Limit", - SGET_SPEED_LIMIT_DOWN_ENABLED, - SGET_SPEED_LIMIT_DOWN, NULL)); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), - limit_menu_new(TRG_MAIN_WINDOW(data), - "Up Limit", - SGET_SPEED_LIMIT_UP_ENABLED, - SGET_SPEED_LIMIT_UP, NULL)); + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Disconnect", + GTK_STOCK_DISCONNECT, connected, + G_CALLBACK(disconnect_cb), data); + + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Add", GTK_STOCK_ADD, + connected, G_CALLBACK(add_cb), data); + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Add from URL", + GTK_STOCK_ADD, connected, + G_CALLBACK(add_url_cb), data); + + gtk_menu_shell_append(GTK_MENU_SHELL(menu), + limit_menu_new(TRG_MAIN_WINDOW(data), + "Down Limit", + SGET_SPEED_LIMIT_DOWN_ENABLED, + SGET_SPEED_LIMIT_DOWN, NULL)); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), + limit_menu_new(TRG_MAIN_WINDOW(data), + "Up Limit", + SGET_SPEED_LIMIT_UP_ENABLED, + SGET_SPEED_LIMIT_UP, NULL)); } gtk_menu_shell_append(GTK_MENU_SHELL(menu), - gtk_separator_menu_item_new()); + gtk_separator_menu_item_new()); trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Quit", GTK_STOCK_QUIT, - TRUE, G_CALLBACK(quit_cb), data); + TRUE, G_CALLBACK(quit_cb), data); gtk_widget_show_all(menu); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, - (event != NULL) ? event->button : 0, - gdk_event_get_time((GdkEvent *) event)); + (event != NULL) ? event->button : 0, + gdk_event_get_time((GdkEvent *) event)); } static gboolean trg_status_icon_popup_menu_cb(GtkStatusIcon * icon, - gpointer userdata) + gpointer userdata) { trg_status_icon_view_menu(icon, NULL, userdata); return TRUE; } static gboolean status_icon_button_press_event(GtkStatusIcon * icon, - GdkEventButton * event, - gpointer data) + GdkEventButton * event, + gpointer data) { if (event->type == GDK_BUTTON_PRESS && event->button == 3) { - trg_status_icon_view_menu(icon, event, data); - return TRUE; + trg_status_icon_view_menu(icon, event, data); + return TRUE; } else { - return FALSE; + return FALSE; } } static gboolean torrent_tv_button_pressed_cb(GtkWidget * treeview, GdkEventButton * event, - gpointer userdata) + gpointer userdata) { GtkTreeSelection *selection; GtkTreePath *path; if (event->type == GDK_BUTTON_PRESS && event->button == 3) { - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); - - if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(treeview), - (gint) event->x, - (gint) event->y, &path, - NULL, NULL, NULL)) { - if (!gtk_tree_selection_path_is_selected(selection, path)) { - gtk_tree_selection_unselect_all(selection); - gtk_tree_selection_select_path(selection, path); - } - - gtk_tree_path_free(path); - - trg_torrent_tv_view_menu(treeview, event, userdata); - return TRUE; - } + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + + if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(treeview), + (gint) event->x, + (gint) event->y, &path, + NULL, NULL, NULL)) { + if (!gtk_tree_selection_path_is_selected(selection, path)) { + gtk_tree_selection_unselect_all(selection); + gtk_tree_selection_select_path(selection, path); + } + + gtk_tree_path_free(path); + + trg_torrent_tv_view_menu(treeview, event, userdata); + return TRUE; + } } return FALSE; } static gboolean torrent_tv_popup_menu_cb(GtkWidget * treeview, - gpointer userdata) + gpointer userdata) { trg_torrent_tv_view_menu(treeview, NULL, userdata); return TRUE; } static void status_bar_text_pushed(GtkStatusbar * statusbar, - guint context_id, gchar * text, - gpointer user_data) + guint context_id, gchar * text, + gpointer user_data) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(user_data); if (priv->statusIcon != NULL) - gtk_status_icon_set_tooltip(priv->statusIcon, text); + gtk_status_icon_set_tooltip(priv->statusIcon, text); } static gboolean window_state_event(GtkWidget * widget, - GdkEventWindowState * event, - gpointer trayIcon) + GdkEventWindowState * event, + gpointer trayIcon) { TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(widget); if (priv->statusIcon != NULL - && event->changed_mask == GDK_WINDOW_STATE_ICONIFIED - && (event->new_window_state == GDK_WINDOW_STATE_ICONIFIED - || event->new_window_state == - (GDK_WINDOW_STATE_ICONIFIED | GDK_WINDOW_STATE_MAXIMIZED))) { - GError *error = NULL; - gboolean tray_min = gconf_client_get_bool(priv->client->gconf, - TRG_GCONF_KEY_SYSTEM_TRAY_MINIMISE, - &error); - - if (error) { - g_error_free(error); - tray_min = TRUE; - } - - if (tray_min) - gtk_widget_hide(GTK_WIDGET(widget)); + && event->changed_mask == GDK_WINDOW_STATE_ICONIFIED + && (event->new_window_state == GDK_WINDOW_STATE_ICONIFIED + || event->new_window_state == + (GDK_WINDOW_STATE_ICONIFIED | GDK_WINDOW_STATE_MAXIMIZED))) { + GError *error = NULL; + gboolean tray_min = gconf_client_get_bool(priv->client->gconf, + TRG_GCONF_KEY_SYSTEM_TRAY_MINIMISE, + &error); + + if (error) { + g_error_free(error); + tray_min = TRUE; + } + + if (tray_min) + gtk_widget_hide(GTK_WIDGET(widget)); } return TRUE; @@ -1575,7 +1579,7 @@ void trg_main_window_remove_status_icon(TrgMainWindow * win) TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(win); if (priv->statusIcon != NULL) - g_object_unref(G_OBJECT(priv->statusIcon)); + g_object_unref(G_OBJECT(priv->statusIcon)); priv->statusIcon = NULL; } @@ -1585,24 +1589,24 @@ void trg_main_window_add_status_icon(TrgMainWindow * win) TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(win); if (priv->icon == NULL) - return; + return; priv->statusIcon = gtk_status_icon_new_from_pixbuf(priv->icon); gtk_status_icon_set_screen(priv->statusIcon, - gtk_window_get_screen(GTK_WINDOW(win))); + gtk_window_get_screen(GTK_WINDOW(win))); g_signal_connect(priv->statusIcon, "activate", - G_CALLBACK(status_icon_activated), win); + G_CALLBACK(status_icon_activated), win); g_signal_connect(priv->statusIcon, "button-press-event", - G_CALLBACK(status_icon_button_press_event), win); + G_CALLBACK(status_icon_button_press_event), win); g_signal_connect(priv->statusIcon, "popup-menu", - G_CALLBACK(trg_status_icon_popup_menu_cb), win); + G_CALLBACK(trg_status_icon_popup_menu_cb), win); } static GObject *trg_main_window_constructor(GType type, - guint - n_construct_properties, - GObjectConstructParam - * construct_params) + guint + n_construct_properties, + GObjectConstructParam + * construct_params) { TrgMainWindow *self; TrgMainWindowPrivate *priv; @@ -1615,102 +1619,102 @@ static GObject *trg_main_window_constructor(GType type, gboolean tray; self = TRG_MAIN_WINDOW(G_OBJECT_CLASS - (trg_main_window_parent_class)->constructor - (type, n_construct_properties, - construct_params)); + (trg_main_window_parent_class)->constructor + (type, n_construct_properties, + construct_params)); priv = TRG_MAIN_WINDOW_GET_PRIVATE(self); theme = gtk_icon_theme_get_default(); priv->icon = - gtk_icon_theme_load_icon(theme, PACKAGE_NAME, 48, - GTK_ICON_LOOKUP_USE_BUILTIN, NULL); + gtk_icon_theme_load_icon(theme, PACKAGE_NAME, 48, + GTK_ICON_LOOKUP_USE_BUILTIN, NULL); if (priv->icon) - gtk_window_set_default_icon(priv->icon); + gtk_window_set_default_icon(priv->icon); gtk_window_set_title(GTK_WINDOW(self), PACKAGE_NAME); gtk_container_set_border_width(GTK_CONTAINER(self), 5); gtk_window_set_default_size(GTK_WINDOW(self), 1000, 600); g_signal_connect(G_OBJECT(self), "delete-event", - G_CALLBACK(delete_event), NULL); + G_CALLBACK(delete_event), NULL); g_signal_connect(G_OBJECT(self), "destroy", G_CALLBACK(destroy_window), - NULL); + NULL); g_signal_connect(G_OBJECT(self), "window-state-event", - G_CALLBACK(window_state_event), NULL); + G_CALLBACK(window_state_event), NULL); priv->torrentModel = trg_torrent_model_new(); g_signal_connect(priv->torrentModel, "torrent-completed", - G_CALLBACK(on_torrent_completed), self); + G_CALLBACK(on_torrent_completed), self); g_signal_connect(priv->torrentModel, "torrent-added", - G_CALLBACK(on_torrent_added), self); + G_CALLBACK(on_torrent_added), self); priv->filteredTorrentModel = - gtk_tree_model_filter_new(GTK_TREE_MODEL(priv->torrentModel), - NULL); + gtk_tree_model_filter_new(GTK_TREE_MODEL(priv->torrentModel), + NULL); gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER - (priv->filteredTorrentModel), - trg_torrent_tree_view_visible_func, - self, NULL); + (priv->filteredTorrentModel), + trg_torrent_tree_view_visible_func, + self, NULL); priv->sortedTorrentModel = - gtk_tree_model_sort_new_with_model(priv->filteredTorrentModel); + gtk_tree_model_sort_new_with_model(priv->filteredTorrentModel); priv->torrentTreeView = - trg_main_window_torrent_tree_view_new(self, - priv->sortedTorrentModel, - priv->stateSelector); + trg_main_window_torrent_tree_view_new(self, + priv->sortedTorrentModel, + priv->stateSelector); g_signal_connect(priv->torrentTreeView, "key-press-event", - G_CALLBACK(torrent_tv_key_press_event), self); + G_CALLBACK(torrent_tv_key_press_event), self); g_signal_connect(priv->torrentTreeView, "popup-menu", - G_CALLBACK(torrent_tv_popup_menu_cb), self); + G_CALLBACK(torrent_tv_popup_menu_cb), self); g_signal_connect(priv->torrentTreeView, "button-press-event", - G_CALLBACK(torrent_tv_button_pressed_cb), self); + G_CALLBACK(torrent_tv_button_pressed_cb), self); g_signal_connect(priv->torrentTreeView, "row-activated", - G_CALLBACK(torrent_tv_onRowActivated), self); + G_CALLBACK(torrent_tv_onRowActivated), self); outerVbox = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(self), outerVbox); priv->menuBar = trg_main_window_menu_bar_new(self); gtk_box_pack_start(GTK_BOX(outerVbox), GTK_WIDGET(priv->menuBar), - FALSE, FALSE, 0); + FALSE, FALSE, 0); toolbarHbox = gtk_hbox_new(FALSE, 0); priv->toolBar = trg_main_window_toolbar_new(self); gtk_box_pack_start(GTK_BOX(toolbarHbox), GTK_WIDGET(priv->toolBar), - TRUE, TRUE, 0); + TRUE, TRUE, 0); #if GTK_CHECK_VERSION( 2,16,0 ) w = gtk_entry_new(); gtk_entry_set_icon_from_stock(GTK_ENTRY(w), - GTK_ENTRY_ICON_SECONDARY, - GTK_STOCK_CLEAR); + GTK_ENTRY_ICON_SECONDARY, + GTK_STOCK_CLEAR); g_signal_connect(w, "icon-release", - G_CALLBACK(clear_filter_entry_cb), w); + G_CALLBACK(clear_filter_entry_cb), w); gtk_box_pack_start(GTK_BOX(toolbarHbox), w, FALSE, FALSE, 0); g_object_set(w, "secondary-icon-sensitive", FALSE, NULL); priv->filterEntryClearButton = priv->filterEntry = w; #else priv->filterEntry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(toolbarHbox), priv->filterEntry, FALSE, - FALSE, 0); + FALSE, 0); w = gtk_button_new(); gtk_button_set_relief(GTK_BUTTON(w), GTK_RELIEF_NONE); gtk_button_set_image(GTK_BUTTON(w), - gtk_image_new_from_stock(GTK_STOCK_CLEAR, - GTK_ICON_SIZE_MENU)); + gtk_image_new_from_stock(GTK_STOCK_CLEAR, + GTK_ICON_SIZE_MENU)); gtk_box_pack_start(GTK_BOX(toolbarHbox), w, FALSE, FALSE, 0); g_signal_connect_swapped(w, "clicked", - G_CALLBACK(clear_filter_entry_cb), - priv->filterEntry); + G_CALLBACK(clear_filter_entry_cb), + priv->filterEntry); priv->filterEntryClearButton = w; #endif g_signal_connect(G_OBJECT(priv->filterEntry), "changed", - G_CALLBACK(entry_filter_changed_cb), self); + G_CALLBACK(entry_filter_changed_cb), self); gtk_box_pack_start(GTK_BOX(outerVbox), GTK_WIDGET(toolbarHbox), - FALSE, FALSE, 0); + FALSE, FALSE, 0); priv->vpaned = gtk_vpaned_new(); priv->hpaned = gtk_hpaned_new(); @@ -1719,50 +1723,50 @@ static GObject *trg_main_window_constructor(GType type, priv->stateSelector = trg_state_selector_new(); gtk_paned_pack1(GTK_PANED(priv->hpaned), - GTK_WIDGET(priv->stateSelector), FALSE, FALSE); + GTK_WIDGET(priv->stateSelector), FALSE, FALSE); gtk_paned_pack2(GTK_PANED(priv->hpaned), - my_scrolledwin_new(GTK_WIDGET - (priv->torrentTreeView)), TRUE, - TRUE); + my_scrolledwin_new(GTK_WIDGET + (priv->torrentTreeView)), TRUE, + TRUE); g_signal_connect(G_OBJECT(priv->stateSelector), - "torrent-state-changed", - G_CALLBACK(torrent_state_selection_changed), - priv->filteredTorrentModel); + "torrent-state-changed", + G_CALLBACK(torrent_state_selection_changed), + priv->filteredTorrentModel); priv->notebook = trg_main_window_notebook_new(self); gtk_paned_pack2(GTK_PANED(priv->vpaned), priv->notebook, FALSE, FALSE); tray = - gconf_client_get_bool(priv->client->gconf, - TRG_GCONF_KEY_SYSTEM_TRAY, &error); + gconf_client_get_bool(priv->client->gconf, + TRG_GCONF_KEY_SYSTEM_TRAY, &error); if (error) { - g_error_free(error); - tray = TRUE; + g_error_free(error); + tray = TRUE; } if (tray) { - trg_main_window_add_status_icon(self); + trg_main_window_add_status_icon(self); } else { - priv->statusIcon = NULL; + priv->statusIcon = NULL; } priv->statusBar = trg_status_bar_new(); g_signal_connect(priv->statusBar, "text-pushed", - G_CALLBACK(status_bar_text_pushed), self); + G_CALLBACK(status_bar_text_pushed), self); gtk_box_pack_start(GTK_BOX(outerVbox), GTK_WIDGET(priv->statusBar), - FALSE, FALSE, 2); + FALSE, FALSE, 2); width = - gconf_client_get_int(priv->client->gconf, - TRG_GCONF_KEY_WINDOW_WIDTH, NULL); + gconf_client_get_int(priv->client->gconf, + TRG_GCONF_KEY_WINDOW_WIDTH, NULL); height = - gconf_client_get_int(priv->client->gconf, - TRG_GCONF_KEY_WINDOW_HEIGHT, NULL); + gconf_client_get_int(priv->client->gconf, + TRG_GCONF_KEY_WINDOW_HEIGHT, NULL); if (width > 0 && height > 0) - gtk_window_set_default_size(GTK_WINDOW(self), width, height); + gtk_window_set_default_size(GTK_WINDOW(self), width, height); return G_OBJECT(self); } @@ -1778,30 +1782,30 @@ static void trg_main_window_class_init(TrgMainWindowClass * klass) object_class->set_property = trg_main_window_set_property; g_object_class_install_property(object_class, - PROP_CLIENT, - g_param_spec_pointer - ("trg-client", "TClient", - "Client", - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + PROP_CLIENT, + g_param_spec_pointer + ("trg-client", "TClient", + "Client", + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); } void auto_connect_if_required(TrgMainWindow * win, trg_client * tc) { gchar *host = - gconf_client_get_string(tc->gconf, TRG_GCONF_KEY_HOSTNAME, - NULL); + gconf_client_get_string(tc->gconf, TRG_GCONF_KEY_HOSTNAME, + NULL); if (host != NULL) { - gint len = strlen(host); - g_free(host); - if (len > 0 - && gconf_client_get_bool(tc->gconf, - TRG_GCONF_KEY_AUTO_CONNECT, - NULL) == TRUE) - connect_cb(NULL, win); + gint len = strlen(host); + g_free(host); + if (len > 0 + && gconf_client_get_bool(tc->gconf, + TRG_GCONF_KEY_AUTO_CONNECT, + NULL) == TRUE) + connect_cb(NULL, win); } } |