From 0d08a471f9ebfdfadded6c92abc700c706475644 Mon Sep 17 00:00:00 2001 From: Alan Fitton Date: Sun, 11 Dec 2011 15:06:01 +0000 Subject: run GNU indent everything. not done this for a while because it was producing weird results. seems ok now. --- src/trg-trackers-tree-view.c | 253 ++++++++++++++++++++++--------------------- 1 file changed, 130 insertions(+), 123 deletions(-) (limited to 'src/trg-trackers-tree-view.c') diff --git a/src/trg-trackers-tree-view.c b/src/trg-trackers-tree-view.c index 3a902e3..2edf858 100644 --- a/src/trg-trackers-tree-view.c +++ b/src/trg-trackers-tree-view.c @@ -32,7 +32,7 @@ #include "trg-main-window.h" G_DEFINE_TYPE(TrgTrackersTreeView, trg_trackers_tree_view, - TRG_TYPE_TREE_VIEW) + TRG_TYPE_TREE_VIEW) #define TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_TRACKERS_TREE_VIEW, TrgTrackersTreeViewPrivate)) typedef struct _TrgTrackersTreeViewPrivate TrgTrackersTreeViewPrivate; @@ -50,18 +50,18 @@ trg_trackers_tree_view_class_init(TrgTrackersTreeViewClass * klass) g_type_class_add_private(klass, sizeof(TrgTrackersTreeViewPrivate)); } -static gboolean is_tracker_edit_supported(TrgClient *tc) +static gboolean is_tracker_edit_supported(TrgClient * tc) { return trg_client_get_rpc_version(tc) >= 10; } -static gboolean -on_trackers_update(gpointer data) +static gboolean on_trackers_update(gpointer data) { - trg_response *response = (trg_response*)data; + trg_response *response = (trg_response *) data; TrgTrackersTreeViewPrivate *priv = - TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(response->cb_data); - GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(response->cb_data)); + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(response->cb_data); + GtkTreeModel *model = + gtk_tree_view_get_model(GTK_TREE_VIEW(response->cb_data)); trg_trackers_model_set_accept(TRG_TRACKERS_MODEL(model), TRUE); @@ -70,30 +70,30 @@ on_trackers_update(gpointer data) } void trg_trackers_tree_view_new_connection(TrgTrackersTreeView * tv, - TrgClient * tc) + TrgClient * tc) { TrgTrackersTreeViewPrivate *priv = - TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(tv); + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(tv); gboolean editable = is_tracker_edit_supported(tc); g_object_set(priv->announceRenderer, "editable", editable, NULL); g_object_set(priv->announceRenderer, "mode", - editable ? GTK_CELL_RENDERER_MODE_EDITABLE : - GTK_CELL_RENDERER_MODE_INERT, NULL); + editable ? GTK_CELL_RENDERER_MODE_EDITABLE : + GTK_CELL_RENDERER_MODE_INERT, NULL); } static void trg_tracker_announce_edited(GtkCellRendererText * renderer, - gchar * path, - gchar * new_text, - gpointer user_data) + gchar * path, + gchar * new_text, + gpointer user_data) { TrgTrackersTreeViewPrivate *priv = - TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(user_data); + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(user_data); GtkTreeModel *model = - gtk_tree_view_get_model(GTK_TREE_VIEW(user_data)); + gtk_tree_view_get_model(GTK_TREE_VIEW(user_data)); gint64 torrentId = - trg_trackers_model_get_torrent_id(TRG_TRACKERS_MODEL(model)); + trg_trackers_model_get_torrent_id(TRG_TRACKERS_MODEL(model)); JsonArray *torrentIds = json_array_new(); JsonArray *trackerModifiers = json_array_new(); @@ -105,9 +105,9 @@ static void trg_tracker_announce_edited(GtkCellRendererText * renderer, gtk_tree_model_get_iter_from_string(model, &iter, path); gtk_list_store_set(GTK_LIST_STORE(model), &iter, TRACKERCOL_ANNOUNCE, - new_text, -1); + new_text, -1); gtk_tree_model_get(model, &iter, TRACKERCOL_ID, &trackerId, - TRACKERCOL_ICON, &icon, -1); + TRACKERCOL_ICON, &icon, -1); json_array_add_int_element(torrentIds, torrentId); @@ -116,13 +116,13 @@ static void trg_tracker_announce_edited(GtkCellRendererText * renderer, args = node_get_arguments(req); if (!g_strcmp0(icon, GTK_STOCK_ADD)) { - json_array_add_string_element(trackerModifiers, new_text); - json_object_set_array_member(args, "trackerAdd", trackerModifiers); + json_array_add_string_element(trackerModifiers, new_text); + json_object_set_array_member(args, "trackerAdd", trackerModifiers); } else { - json_array_add_int_element(trackerModifiers, trackerId); - json_array_add_string_element(trackerModifiers, new_text); - json_object_set_array_member(args, "trackerReplace", - trackerModifiers); + json_array_add_int_element(trackerModifiers, trackerId); + json_array_add_string_element(trackerModifiers, new_text); + json_object_set_array_member(args, "trackerReplace", + trackerModifiers); } g_free(icon); @@ -131,26 +131,26 @@ static void trg_tracker_announce_edited(GtkCellRendererText * renderer, } static void trg_tracker_announce_editing_started(GtkCellRenderer * - renderer G_GNUC_UNUSED, - GtkCellEditable * - editable G_GNUC_UNUSED, - gchar * - path G_GNUC_UNUSED, - gpointer user_data) + renderer G_GNUC_UNUSED, + GtkCellEditable * + editable G_GNUC_UNUSED, + gchar * + path G_GNUC_UNUSED, + gpointer user_data) { TrgTrackersModel *model = - TRG_TRACKERS_MODEL(gtk_tree_view_get_model - (GTK_TREE_VIEW(user_data))); + TRG_TRACKERS_MODEL(gtk_tree_view_get_model + (GTK_TREE_VIEW(user_data))); trg_trackers_model_set_accept(model, FALSE); } static void trg_tracker_announce_editing_canceled(GtkWidget * - w G_GNUC_UNUSED, - gpointer data) + w G_GNUC_UNUSED, + gpointer data) { TrgTrackersModel *model = - TRG_TRACKERS_MODEL(gtk_tree_view_get_model(GTK_TREE_VIEW(data))); + TRG_TRACKERS_MODEL(gtk_tree_view_get_model(GTK_TREE_VIEW(data))); trg_trackers_model_set_accept(model, TRUE); } @@ -158,62 +158,68 @@ static void trg_tracker_announce_editing_canceled(GtkWidget * static void trg_trackers_tree_view_init(TrgTrackersTreeView * self) { TrgTrackersTreeViewPrivate *priv = - TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(self); + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(self); TrgTreeView *ttv = TRG_TREE_VIEW(self); trg_column_description *desc; desc = - trg_tree_view_reg_column(ttv, TRG_COLTYPE_STOCKICONTEXT, - TRACKERCOL_TIER, _("Tier"), "tier", - TRG_COLUMN_UNREMOVABLE); + trg_tree_view_reg_column(ttv, TRG_COLTYPE_STOCKICONTEXT, + TRACKERCOL_TIER, _("Tier"), "tier", + TRG_COLUMN_UNREMOVABLE); desc->model_column_icon = TRACKERCOL_ICON; desc = - trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, - TRACKERCOL_ANNOUNCE, _("Announce URL"), - "announce-url", TRG_COLUMN_UNREMOVABLE); + trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, + TRACKERCOL_ANNOUNCE, _("Announce URL"), + "announce-url", TRG_COLUMN_UNREMOVABLE); priv->announceRenderer = desc->customRenderer = - gtk_cell_renderer_text_new(); + gtk_cell_renderer_text_new(); g_signal_connect(priv->announceRenderer, "edited", - G_CALLBACK(trg_tracker_announce_edited), self); + G_CALLBACK(trg_tracker_announce_edited), self); g_signal_connect(priv->announceRenderer, "editing-canceled", - G_CALLBACK(trg_tracker_announce_editing_canceled), - self); + G_CALLBACK(trg_tracker_announce_editing_canceled), + self); g_signal_connect(priv->announceRenderer, "editing-started", - G_CALLBACK(trg_tracker_announce_editing_started), - self); + G_CALLBACK(trg_tracker_announce_editing_started), + self); desc->out = &priv->announceColumn; - trg_tree_view_reg_column(ttv, TRG_COLTYPE_NUMGTZERO, TRACKERCOL_LAST_ANNOUNCE_PEER_COUNT, - _("Peers"), "last-announce-peer-count", 0); - trg_tree_view_reg_column(ttv, TRG_COLTYPE_NUMGTZERO, TRACKERCOL_SEEDERCOUNT, - _("Seeder Count"), "seeder-count", 0); - trg_tree_view_reg_column(ttv, TRG_COLTYPE_NUMGTZERO, TRACKERCOL_LEECHERCOUNT, - _("Leecher Count"), "leecher-count", 0); - trg_tree_view_reg_column(ttv, TRG_COLTYPE_EPOCH, TRACKERCOL_LAST_ANNOUNCE_TIME, - _("Last Announce"), "last-announce-time", 0); - trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, TRACKERCOL_LAST_ANNOUNCE_RESULT, - _("Last Result"), "last-result", 0); + trg_tree_view_reg_column(ttv, TRG_COLTYPE_NUMGTZERO, + TRACKERCOL_LAST_ANNOUNCE_PEER_COUNT, + _("Peers"), "last-announce-peer-count", 0); + trg_tree_view_reg_column(ttv, TRG_COLTYPE_NUMGTZERO, + TRACKERCOL_SEEDERCOUNT, _("Seeder Count"), + "seeder-count", 0); + trg_tree_view_reg_column(ttv, TRG_COLTYPE_NUMGTZERO, + TRACKERCOL_LEECHERCOUNT, _("Leecher Count"), + "leecher-count", 0); + trg_tree_view_reg_column(ttv, TRG_COLTYPE_EPOCH, + TRACKERCOL_LAST_ANNOUNCE_TIME, + _("Last Announce"), "last-announce-time", 0); + trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, + TRACKERCOL_LAST_ANNOUNCE_RESULT, + _("Last Result"), "last-result", 0); trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, TRACKERCOL_SCRAPE, - _("Scrape URL"), "scrape-url", 0); - trg_tree_view_reg_column(ttv, TRG_COLTYPE_EPOCH, TRACKERCOL_LAST_SCRAPE_TIME, - _("Last Scrape"), "last-scrape-time", TRG_COLUMN_EXTRA); + _("Scrape URL"), "scrape-url", 0); + trg_tree_view_reg_column(ttv, TRG_COLTYPE_EPOCH, + TRACKERCOL_LAST_SCRAPE_TIME, _("Last Scrape"), + "last-scrape-time", TRG_COLUMN_EXTRA); trg_tree_view_reg_column(ttv, TRG_COLTYPE_TEXT, TRACKERCOL_HOST, - _("Host"), "host", TRG_COLUMN_EXTRA); + _("Host"), "host", TRG_COLUMN_EXTRA); } static void add_tracker(GtkWidget * w, gpointer data) { GtkTreeView *tv = GTK_TREE_VIEW(data); TrgTrackersTreeViewPrivate *priv = - TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(data); + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(data); GtkTreeModel *model = gtk_tree_view_get_model(tv); GtkTreeIter iter; GtkTreePath *path; gtk_list_store_append(GTK_LIST_STORE(model), &iter); gtk_list_store_set(GTK_LIST_STORE(model), &iter, TRACKERCOL_ICON, - GTK_STOCK_ADD, -1); + GTK_STOCK_ADD, -1); path = gtk_tree_model_get_path(model, &iter); gtk_tree_view_set_cursor(tv, path, priv->announceColumn, TRUE); @@ -223,13 +229,13 @@ static void add_tracker(GtkWidget * w, gpointer data) static void delete_tracker(GtkWidget * w, gpointer data) { TrgTrackersTreeViewPrivate *priv = - TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(data); + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(data); GtkTreeView *tv = GTK_TREE_VIEW(data); GList *selectionRefs = trg_tree_view_get_selected_refs_list(tv); GtkTreeModel *model = gtk_tree_view_get_model(tv); JsonArray *trackerIds = json_array_new(); gint64 torrentId = - trg_trackers_model_get_torrent_id(TRG_TRACKERS_MODEL(model)); + trg_trackers_model_get_torrent_id(TRG_TRACKERS_MODEL(model)); JsonArray *torrentIds = json_array_new(); JsonNode *req; @@ -237,19 +243,19 @@ static void delete_tracker(GtkWidget * w, gpointer data) GList *li; for (li = selectionRefs; li; li = g_list_next(li)) { - GtkTreeRowReference *rr = (GtkTreeRowReference *) li->data; - GtkTreePath *path = gtk_tree_row_reference_get_path(rr); - if (path) { - gint64 trackerId; - GtkTreeIter trackerIter; - gtk_tree_model_get_iter(model, &trackerIter, path); - gtk_tree_model_get(model, &trackerIter, TRACKERCOL_ID, - &trackerId, -1); - json_array_add_int_element(trackerIds, trackerId); - gtk_list_store_remove(GTK_LIST_STORE(model), &trackerIter); - gtk_tree_path_free(path); - } - gtk_tree_row_reference_free(rr); + GtkTreeRowReference *rr = (GtkTreeRowReference *) li->data; + GtkTreePath *path = gtk_tree_row_reference_get_path(rr); + if (path) { + gint64 trackerId; + GtkTreeIter trackerIter; + gtk_tree_model_get_iter(model, &trackerIter, path); + gtk_tree_model_get(model, &trackerIter, TRACKERCOL_ID, + &trackerId, -1); + json_array_add_int_element(trackerIds, trackerId); + gtk_list_store_remove(GTK_LIST_STORE(model), &trackerIter); + gtk_tree_path_free(path); + } + gtk_tree_row_reference_free(rr); } g_list_free(selectionRefs); @@ -268,85 +274,85 @@ static void delete_tracker(GtkWidget * w, gpointer data) static void view_popup_menu_add_only(GtkWidget * treeview, GdkEventButton * event, - gpointer data G_GNUC_UNUSED) + gpointer data G_GNUC_UNUSED) { GtkWidget *menu, *menuitem; menu = gtk_menu_new(); menuitem = - trg_menu_bar_item_new(GTK_MENU_SHELL(menu), _("Add"), - GTK_STOCK_ADD, TRUE); + trg_menu_bar_item_new(GTK_MENU_SHELL(menu), _("Add"), + GTK_STOCK_ADD, TRUE); g_signal_connect(menuitem, "activate", G_CALLBACK(add_tracker), - treeview); + treeview); 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 view_popup_menu(GtkWidget * treeview, GdkEventButton * event, - gpointer data G_GNUC_UNUSED) + gpointer data G_GNUC_UNUSED) { GtkWidget *menu, *menuitem; menu = gtk_menu_new(); menuitem = - trg_menu_bar_item_new(GTK_MENU_SHELL(menu), _("Delete"), - GTK_STOCK_DELETE, TRUE); + trg_menu_bar_item_new(GTK_MENU_SHELL(menu), _("Delete"), + GTK_STOCK_DELETE, TRUE); g_signal_connect(menuitem, "activate", G_CALLBACK(delete_tracker), - treeview); + treeview); menuitem = - trg_menu_bar_item_new(GTK_MENU_SHELL(menu), _("Add"), - GTK_STOCK_ADD, TRUE); + trg_menu_bar_item_new(GTK_MENU_SHELL(menu), _("Add"), + GTK_STOCK_ADD, TRUE); g_signal_connect(menuitem, "activate", G_CALLBACK(add_tracker), - treeview); + treeview); 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 view_onButtonPressed(GtkWidget * treeview, GdkEventButton * event, - gpointer userdata) + gpointer userdata) { TrgTrackersTreeViewPrivate *priv = - TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(treeview); + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(treeview); TrgTrackersModel *model = - TRG_TRACKERS_MODEL(gtk_tree_view_get_model - (GTK_TREE_VIEW(treeview))); + TRG_TRACKERS_MODEL(gtk_tree_view_get_model + (GTK_TREE_VIEW(treeview))); GtkTreeSelection *selection; GtkTreePath *path; if (!is_tracker_edit_supported(priv->client)) - return FALSE; + return FALSE; 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); - - view_popup_menu(treeview, event, userdata); - } else if (trg_trackers_model_get_torrent_id(model) >= 0) { - view_popup_menu_add_only(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); + + view_popup_menu(treeview, event, userdata); + } else if (trg_trackers_model_get_torrent_id(model) >= 0) { + view_popup_menu_add_only(treeview, event, userdata); + } + return TRUE; } return FALSE; @@ -359,19 +365,20 @@ static gboolean view_onPopupMenu(GtkWidget * treeview, gpointer userdata) } TrgTrackersTreeView *trg_trackers_tree_view_new(TrgTrackersModel * model, - TrgClient * client, - TrgMainWindow * win) + TrgClient * client, + TrgMainWindow * win) { GObject *obj = g_object_new(TRG_TYPE_TRACKERS_TREE_VIEW, NULL); TrgTrackersTreeViewPrivate *priv = - TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(obj); + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(obj); - trg_tree_view_set_prefs(TRG_TREE_VIEW(obj), trg_client_get_prefs(client)); + trg_tree_view_set_prefs(TRG_TREE_VIEW(obj), + trg_client_get_prefs(client)); g_signal_connect(obj, "button-press-event", - G_CALLBACK(view_onButtonPressed), NULL); + G_CALLBACK(view_onButtonPressed), NULL); g_signal_connect(obj, "popup-menu", G_CALLBACK(view_onPopupMenu), - NULL); + NULL); gtk_tree_view_set_model(GTK_TREE_VIEW(obj), GTK_TREE_MODEL(model)); priv->client = client; -- cgit v1.2.3