diff options
| author |  Alan Fitton <ajf@eth0.org.uk> | 2011-02-18 00:49:08 +0000 |
|---|---|---|
| committer | Alan Fitton <ajf@eth0.org.uk> | 2011-02-18 00:49:08 +0000 |
| commit | 8aacf43b3b4f21247a63b8301c952c6a8c98585e (patch) | |
| tree | d2dc275b7d2672390ab9eeb1adffaf5953a4981d | |
| parent | bfff941cb7fdb428de57971831e39e3cf660112b (diff) | |
adding trackers now seems to work. change all tabs to whitespace.
87 files changed, 2786 insertions, 2693 deletions
diff --git a/src/base64.c b/src/base64.c index 2504a68..8e0562b 100644 --- a/src/base64.c +++ b/src/base64.c @@ -30,9 +30,9 @@ void encodeblock(unsigned char in[3], unsigned char out[4], int len) out[0] = cb64[in[0] >> 2]; out[1] = cb64[((in[0] & 0x03) << 4) | ((in[1] & 0xf0) >> 4)]; out[2] = - (unsigned char) (len > - 1 ? cb64[((in[1] & 0x0f) << 2) | - ((in[2] & 0xc0) >> 6)] : '='); + (unsigned char) (len > + 1 ? cb64[((in[1] & 0x0f) << 2) | + ((in[2] & 0xc0) >> 6)] : '='); out[3] = (unsigned char) (len > 2 ? cb64[in[2] & 0x3f] : '='); } @@ -43,22 +43,22 @@ char *base64encode(char *filename) int i, len, j = 0; char *output = NULL; while (!feof(infile)) { - len = 0; - for (i = 0; i < 3; i++) { - in[i] = (unsigned char) getc(infile); - if (!feof(infile)) { - len++; - } else { - in[i] = 0; - } - } - if (len) { - output = (char *) realloc(output, j + 5); - encodeblock(in, out, len); - for (i = 0; i < 4; i++) { - output[j++] = out[i]; - } - } + len = 0; + for (i = 0; i < 3; i++) { + in[i] = (unsigned char) getc(infile); + if (!feof(infile)) { + len++; + } else { + in[i] = 0; + } + } + if (len) { + output = (char *) realloc(output, j + 5); + encodeblock(in, out, len); + for (i = 0; i < 4; i++) { + output[j++] = out[i]; + } + } } output[j] = '\0'; fclose(infile); diff --git a/src/base64.h b/src/base64.h index cd59524..e47bf62 100644 --- a/src/base64.h +++ b/src/base64.h @@ -22,4 +22,4 @@ char *base64encode(char *filename); -#endif /* BASE64_H_ */ +#endif /* BASE64_H_ */ diff --git a/src/dispatch.c b/src/dispatch.c index e72c4ed..aee8ce7 100644 --- a/src/dispatch.c +++ b/src/dispatch.c @@ -41,35 +41,35 @@ JsonObject *dispatch(trg_client * client, JsonNode * req, int *status) json_node_free(req); #ifdef DEBUG if (g_getenv("TRG_SHOW_OUTGOING") != NULL) - g_printf("=>(outgoing)=> %s\n", serialized); + g_printf("=>(outgoing)=> %s\n", serialized); #endif response = trg_http_perform(client, serialized); g_free(serialized); if (status != NULL) - *status = response->status; + *status = response->status; if (response->status != CURLE_OK) { - http_response_free(response); - return NULL; + http_response_free(response); + return NULL; } deserialized = trg_deserialize(response, &decode_error); http_response_free(response); if (decode_error != NULL) { - g_printf("JSON decoding error: %s\n", decode_error->message); - g_error_free(decode_error); - if (status != NULL) - *status = FAIL_JSON_DECODE; - return NULL; + g_printf("JSON decoding error: %s\n", decode_error->message); + g_error_free(decode_error); + if (status != NULL) + *status = FAIL_JSON_DECODE; + return NULL; } result = json_object_get_member(deserialized, "result"); if (status != NULL - && (result == NULL - || g_strcmp0(json_node_get_string(result), "success") != 0)) - *status = FAIL_RESPONSE_UNSUCCESSFUL; + && (result == NULL + || g_strcmp0(json_node_get_string(result), "success") != 0)) + *status = FAIL_RESPONSE_UNSUCCESSFUL; return deserialized; } @@ -80,14 +80,14 @@ static gpointer dispatch_async_threadfunc(gpointer ptr) int status; JsonObject *result = dispatch(args->client, args->req, &status); if (args->callback != NULL) - args->callback(result, status, args->data); + args->callback(result, status, args->data); g_free(args); return NULL; } GThread *dispatch_async(trg_client * client, JsonNode * req, - void (*callback) (JsonObject *, int, gpointer), - gpointer data) + void (*callback) (JsonObject *, int, gpointer), + gpointer data) { GError *error = NULL; GThread *thread; @@ -100,13 +100,13 @@ GThread *dispatch_async(trg_client * client, JsonNode * req, args->client = client; thread = - g_thread_create(dispatch_async_threadfunc, args, FALSE, &error); + g_thread_create(dispatch_async_threadfunc, args, FALSE, &error); if (error != NULL) { - g_printf("thread creation error: %s\n", error->message); - g_error_free(error); - g_free(args); - return NULL; + g_printf("thread creation error: %s\n", error->message); + g_error_free(error); + g_free(args); + return NULL; } else { - return thread; + return thread; } } diff --git a/src/dispatch.h b/src/dispatch.h index 4ff3ad6..cf4c908 100644 --- a/src/dispatch.h +++ b/src/dispatch.h @@ -34,7 +34,7 @@ struct dispatch_async_args { JsonObject *dispatch(trg_client * client, JsonNode * req, int *status); GThread *dispatch_async(trg_client * client, JsonNode * req, - void (*callback) (JsonObject *, int, gpointer), - gpointer data); + void (*callback) (JsonObject *, int, gpointer), + gpointer data); -#endif /* DISPATCH_H_ */ +#endif /* DISPATCH_H_ */ @@ -34,7 +34,7 @@ void hig_workarea_add_section_divider(GtkWidget * t, int *row) void hig_workarea_add_section_title_widget(GtkWidget * t, - int *row, GtkWidget * w) + int *row, GtkWidget * w) { gtk_table_attach(GTK_TABLE(t), w, 0, 2, *row, *row + 1, ~0, 0, 0, 0); ++*row; @@ -42,7 +42,7 @@ hig_workarea_add_section_title_widget(GtkWidget * t, void hig_workarea_add_section_title(GtkWidget * t, - int *row, const char *section_title) + int *row, const char *section_title) { char buf[512]; GtkWidget *l; @@ -66,9 +66,9 @@ static GtkWidget *rowNew(GtkWidget * w) /* lhs widget */ if (GTK_IS_MISC(w)) - gtk_misc_set_alignment(GTK_MISC(w), 0.0f, 0.5f); + gtk_misc_set_alignment(GTK_MISC(w), 0.0f, 0.5f); if (GTK_IS_LABEL(w)) - gtk_label_set_use_markup(GTK_LABEL(w), TRUE); + gtk_label_set_use_markup(GTK_LABEL(w), TRUE); gtk_box_pack_start(GTK_BOX(h), w, TRUE, TRUE, 0); return h; @@ -79,7 +79,7 @@ void hig_workarea_add_wide_control(GtkWidget * t, int *row, GtkWidget * w) GtkWidget *r = rowNew(w); gtk_table_attach(GTK_TABLE(t), r, 0, 2, *row, *row + 1, GTK_FILL, - 0, 0, 0); + 0, 0, 0); ++*row; } @@ -89,16 +89,16 @@ hig_workarea_add_wide_tall_control(GtkWidget * t, int *row, GtkWidget * w) GtkWidget *r = rowNew(w); gtk_table_attach(GTK_TABLE(t), r, 0, 2, *row, *row + 1, - GTK_EXPAND | GTK_SHRINK | GTK_FILL, - GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); + GTK_EXPAND | GTK_SHRINK | GTK_FILL, + GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); ++*row; } GtkWidget *hig_workarea_add_wide_checkbutton(GtkWidget * t, - int *row, - const char *mnemonic_string, - gboolean is_active) + int *row, + const char *mnemonic_string, + gboolean is_active) { GtkWidget *w = gtk_check_button_new_with_mnemonic(mnemonic_string); @@ -112,11 +112,11 @@ void hig_workarea_add_label_w(GtkWidget * t, int row, GtkWidget * l) GtkWidget *w = rowNew(l); gtk_table_attach(GTK_TABLE(t), w, 0, 1, row, row + 1, GTK_FILL, - GTK_FILL, 0, 0); + GTK_FILL, 0, 0); } GtkWidget *hig_workarea_add_label(GtkWidget * t, - int row, const char *mnemonic_string) + int row, const char *mnemonic_string) { GtkWidget *l = gtk_label_new_with_mnemonic(mnemonic_string); @@ -128,42 +128,42 @@ static void hig_workarea_add_tall_control(GtkWidget * t, int row, GtkWidget * control) { if (GTK_IS_MISC(control)) - gtk_misc_set_alignment(GTK_MISC(control), 0.0f, 0.5f); + gtk_misc_set_alignment(GTK_MISC(control), 0.0f, 0.5f); gtk_table_attach(GTK_TABLE(t), control, - 1, 2, row, row + 1, - GTK_EXPAND | GTK_SHRINK | GTK_FILL, - GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); + 1, 2, row, row + 1, + GTK_EXPAND | GTK_SHRINK | GTK_FILL, + GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); } void hig_workarea_add_control(GtkWidget * t, int row, GtkWidget * control) { if (GTK_IS_MISC(control)) - gtk_misc_set_alignment(GTK_MISC(control), 0.0f, 0.5f); + gtk_misc_set_alignment(GTK_MISC(control), 0.0f, 0.5f); gtk_table_attach(GTK_TABLE(t), control, - 1, 2, row, row + 1, - GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0); + 1, 2, row, row + 1, + GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0); } void hig_workarea_add_row_w(GtkWidget * t, - int *row, - GtkWidget * label, - GtkWidget * control, GtkWidget * mnemonic) + int *row, + GtkWidget * label, + GtkWidget * control, GtkWidget * mnemonic) { hig_workarea_add_label_w(t, *row, label); hig_workarea_add_control(t, *row, control); if (GTK_IS_LABEL(label)) - gtk_label_set_mnemonic_widget(GTK_LABEL(label), - mnemonic ? mnemonic : control); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), + mnemonic ? mnemonic : control); ++*row; } GtkWidget *hig_workarea_add_row(GtkWidget * t, - int *row, - const char *mnemonic_string, - GtkWidget * control, GtkWidget * mnemonic) + int *row, + const char *mnemonic_string, + GtkWidget * control, GtkWidget * mnemonic) { GtkWidget *l = gtk_label_new_with_mnemonic(mnemonic_string); @@ -172,10 +172,10 @@ GtkWidget *hig_workarea_add_row(GtkWidget * t, } GtkWidget *hig_workarea_add_tall_row(GtkWidget * table, - int *row, - const char *mnemonic_string, - GtkWidget * control, - GtkWidget * mnemonic) + int *row, + const char *mnemonic_string, + GtkWidget * control, + GtkWidget * mnemonic) { GtkWidget *l = gtk_label_new_with_mnemonic(mnemonic_string); GtkWidget *h = gtk_hbox_new(FALSE, 0); @@ -187,8 +187,8 @@ GtkWidget *hig_workarea_add_tall_row(GtkWidget * table, hig_workarea_add_tall_control(table, *row, control); if (GTK_IS_LABEL(l)) - gtk_label_set_mnemonic_widget(GTK_LABEL(l), - mnemonic ? mnemonic : control); + gtk_label_set_mnemonic_widget(GTK_LABEL(l), + mnemonic ? mnemonic : control); ++*row; return l; @@ -201,7 +201,7 @@ void hig_workarea_finish(GtkWidget * t, int *row) void hig_message_dialog_set_text(GtkMessageDialog * dialog, - const char *primary, const char *secondary) + const char *primary, const char *secondary) { gtk_message_dialog_set_markup(dialog, primary); gtk_message_dialog_format_secondary_text(dialog, "%s", secondary); @@ -25,55 +25,55 @@ GtkWidget *hig_workarea_create(void); void hig_workarea_add_section_divider(GtkWidget * table, int *row); void hig_workarea_add_section_title_widget(GtkWidget * t, - int *row, GtkWidget * w); + int *row, GtkWidget * w); void hig_workarea_add_section_title(GtkWidget * table, - int *row, const char *section_title); + int *row, const char *section_title); void hig_workarea_add_wide_tall_control(GtkWidget * table, - int *row, GtkWidget * w); + int *row, GtkWidget * w); void hig_workarea_add_wide_control(GtkWidget * table, - int *row, GtkWidget * w); + int *row, GtkWidget * w); GtkWidget *hig_workarea_add_wide_checkbutton(GtkWidget * table, - int *row, - const char *mnemonic_string, - gboolean is_active); + int *row, + const char *mnemonic_string, + gboolean is_active); GtkWidget *hig_workarea_add_label(GtkWidget * table, - int row, const char *mnemonic_string); + int row, const char *mnemonic_string); void hig_workarea_add_label_w(GtkWidget * table, - int row, GtkWidget * label_widget); + int row, GtkWidget * label_widget); void hig_workarea_add_control(GtkWidget * table, - int row, GtkWidget * control); + int row, GtkWidget * control); GtkWidget *hig_workarea_add_tall_row(GtkWidget * table, - int *row, - const char *mnemonic_string, - GtkWidget * control, - GtkWidget * - mnemonic_or_null_for_control); + int *row, + const char *mnemonic_string, + GtkWidget * control, + GtkWidget * + mnemonic_or_null_for_control); GtkWidget *hig_workarea_add_row(GtkWidget * table, - int *row, - const char *mnemonic_string, - GtkWidget * control, - GtkWidget * mnemonic_or_null_for_control); + int *row, + const char *mnemonic_string, + GtkWidget * control, + GtkWidget * mnemonic_or_null_for_control); void hig_workarea_add_row_w(GtkWidget * table, - int *row, - GtkWidget * label, - GtkWidget * control, - GtkWidget * mnemonic_or_null_for_control); + int *row, + GtkWidget * label, + GtkWidget * control, + GtkWidget * mnemonic_or_null_for_control); void hig_workarea_finish(GtkWidget * table, int *row); void hig_message_dialog_set_text(GtkMessageDialog * dialog, - const char *primary, - const char *secondary); + const char *primary, + const char *secondary); enum { GUI_PAD_SMALL = 3, @@ -82,4 +82,4 @@ enum { GUI_PAD_LARGE = 12 }; -#endif /* __HIG_H__ */ +#endif /* __HIG_H__ */ @@ -32,26 +32,26 @@ #include "http.h" static struct http_response *trg_http_perform_inner(trg_client * client, - gchar * req, - gboolean recurse); + gchar * req, + gboolean recurse); static size_t http_receive_callback(void *ptr, size_t size, size_t nmemb, - void *data); + void *data); static size_t header_callback(void *ptr, size_t size, size_t nmemb, - void *data); + void *data); void http_response_free(struct http_response *response) { if (response->data != NULL) - g_free(response->data); + g_free(response->data); g_free(response); } static struct http_response *trg_http_perform_inner(trg_client * tc, - gchar * req, - gboolean recurse) + gchar * req, + gboolean recurse) { CURL *handle; long httpCode; @@ -71,17 +71,17 @@ static struct http_response *trg_http_perform_inner(trg_client * tc, curl_easy_setopt(handle, CURLOPT_URL, tc->url); curl_easy_setopt(handle, CURLOPT_HTTPAUTH, CURLAUTH_BASIC); curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, - &http_receive_callback); + &http_receive_callback); curl_easy_setopt(handle, CURLOPT_WRITEDATA, (void *) response); curl_easy_setopt(handle, CURLOPT_HEADERFUNCTION, &header_callback); curl_easy_setopt(handle, CURLOPT_WRITEHEADER, (void *) tc); curl_easy_setopt(handle, CURLOPT_POSTFIELDS, req); if (tc->ssl) - curl_easy_setopt(handle, CURLOPT_SSL_VERIFYPEER, 0); + curl_easy_setopt(handle, CURLOPT_SSL_VERIFYPEER, 0); if (tc->session_id != NULL) { - headers = curl_slist_append(headers, tc->session_id); - curl_easy_setopt(handle, CURLOPT_HTTPHEADER, headers); + headers = curl_slist_append(headers, tc->session_id); + curl_easy_setopt(handle, CURLOPT_HTTPHEADER, headers); } response->status = curl_easy_perform(handle); @@ -90,15 +90,15 @@ static struct http_response *trg_http_perform_inner(trg_client * tc, curl_easy_cleanup(handle); if (headers != NULL) - curl_slist_free_all(headers); + curl_slist_free_all(headers); if (response->status == CURLE_OK) { - if (httpCode == HTTP_CONFLICT && recurse == TRUE) { - http_response_free(response); - return trg_http_perform_inner(tc, req, FALSE); - } else if (httpCode != HTTP_OK) { - response->status = (-httpCode) - 100; - } + if (httpCode == HTTP_CONFLICT && recurse == TRUE) { + http_response_free(response); + return trg_http_perform_inner(tc, req, FALSE); + } else if (httpCode != HTTP_OK) { + response->status = (-httpCode) - 100; + } } return response; @@ -117,29 +117,29 @@ http_receive_callback(void *ptr, size_t size, size_t nmemb, void *data) mem->data = realloc(mem->data, mem->size + realsize + 1); if (mem->data) { - memcpy(&(mem->data[mem->size]), ptr, realsize); - mem->size += realsize; - mem->data[mem->size] = 0; + memcpy(&(mem->data[mem->size]), ptr, realsize); + mem->size += realsize; + mem->data[mem->size] = 0; } return realsize; } static size_t header_callback(void *ptr, size_t size, size_t nmemb, - void *data) + void *data) { char *header = (char *) (ptr); trg_client *client = (trg_client *) data; if (g_str_has_prefix(header, "X-Transmission-Session-Id: ") == TRUE) { - char *nl; + char *nl; - if (client->session_id != NULL) - g_free(client->session_id); + if (client->session_id != NULL) + g_free(client->session_id); - client->session_id = g_strdup(header); - nl = strrchr(client->session_id, '\r'); - if (nl) - *nl = '\0'; + client->session_id = g_strdup(header); + nl = strrchr(client->session_id, '\r'); + if (nl) + *nl = '\0'; } return (nmemb * size); @@ -40,4 +40,4 @@ struct http_response { void http_response_free(struct http_response *response); struct http_response *trg_http_perform(trg_client * client, gchar * req); -#endif /* HTTP_H_ */ +#endif /* HTTP_H_ */ @@ -45,7 +45,7 @@ gchar *trg_serialize(JsonNode * req) } JsonObject *trg_deserialize(struct http_response * response, - GError ** error) + GError ** error) { JsonParser *parser; JsonNode *root; @@ -53,30 +53,30 @@ JsonObject *trg_deserialize(struct http_response * response, parser = json_parser_new(); json_parser_load_from_data(parser, response->data, response->size, - error); + error); if (*error == NULL) { - root = json_parser_get_root(parser); + root = json_parser_get_root(parser); #ifdef DEBUG - if (g_getenv("TRG_SHOW_INCOMING") != NULL) { - g_printf("incoming JSON data:\n%s\n", response->data); - } else if (g_getenv("TRG_SHOW_INCOMING_PRETTY") != NULL) { - JsonGenerator *pg; - gsize len; - gchar *pgdata; - - pg = json_generator_new(); - g_object_set(pg, "pretty", TRUE, NULL); - json_generator_set_root(pg, root); - - pgdata = json_generator_to_data(pg, &len); - g_printf("incoming JSON data:\n%s\n", pgdata); - g_free(pgdata); - - g_object_unref(pg); - } + if (g_getenv("TRG_SHOW_INCOMING") != NULL) { + g_printf("incoming JSON data:\n%s\n", response->data); + } else if (g_getenv("TRG_SHOW_INCOMING_PRETTY") != NULL) { + JsonGenerator *pg; + gsize len; + gchar *pgdata; + + pg = json_generator_new(); + g_object_set(pg, "pretty", TRUE, NULL); + json_generator_set_root(pg, root); + + pgdata = json_generator_to_data(pg, &len); + g_printf("incoming JSON data:\n%s\n", pgdata); + g_free(pgdata); + + g_object_unref(pg); + } #endif - ret = json_node_get_object(root); - json_object_ref(ret); + ret = json_node_get_object(root); + json_object_ref(ret); } g_object_unref(parser); @@ -27,8 +27,8 @@ gchar *trg_serialize(JsonNode * req); JsonObject *trg_deserialize(struct http_response *response, - GError ** error); + GError ** error); JsonObject *get_arguments(JsonObject * req); JsonObject *node_get_arguments(JsonNode * req); -#endif /* JSON_H_ */ +#endif /* JSON_H_ */ @@ -41,9 +41,9 @@ enum { static UniqueResponse message_received_cb(UniqueApp * app G_GNUC_UNUSED, - gint command, - UniqueMessageData * message, - guint time_, gpointer user_data) + gint command, + UniqueMessageData * message, + guint time_, gpointer user_data) { TrgMainWindow *win; UniqueResponse res; @@ -52,21 +52,21 @@ message_received_cb(UniqueApp * app G_GNUC_UNUSED, switch (command) { case UNIQUE_ACTIVATE: - gtk_window_set_screen(GTK_WINDOW(user_data), - unique_message_data_get_screen(message)); - gtk_window_present_with_time(GTK_WINDOW(user_data), time_); - res = UNIQUE_RESPONSE_OK; - break; + gtk_window_set_screen(GTK_WINDOW(user_data), + unique_message_data_get_screen(message)); + gtk_window_present_with_time(GTK_WINDOW(user_data), time_); + res = UNIQUE_RESPONSE_OK; + break; case COMMAND_ADD: - res = - trg_add_from_filename(win, - unique_message_data_get_filename - (message)) ? UNIQUE_RESPONSE_OK : - UNIQUE_RESPONSE_FAIL; - break; + res = + trg_add_from_filename(win, + unique_message_data_get_filename + (message)) ? UNIQUE_RESPONSE_OK : + UNIQUE_RESPONSE_FAIL; + break; default: - res = UNIQUE_RESPONSE_OK; - break; + res = UNIQUE_RESPONSE_OK; + break; } return res; @@ -85,47 +85,47 @@ int main(int argc, char *argv[]) gtk_init(&argc, &argv); app = unique_app_new_with_commands("org.eth0.uk.org.trg", NULL, - "add", COMMAND_ADD, NULL); + "add", COMMAND_ADD, NULL); if (unique_app_is_running(app)) { - UniqueCommand command; - UniqueResponse response; - UniqueMessageData *message; - - if (argc > 1) { - command = COMMAND_ADD; - message = unique_message_data_new(); - unique_message_data_set_filename(message, argv[1]); - } else { - command = UNIQUE_ACTIVATE; - message = NULL; - } - - response = unique_app_send_message(app, command, message); - unique_message_data_free(message); - - if (response == UNIQUE_RESPONSE_OK) { - returnValue = 0; - } else { - returnValue = 1; - } + UniqueCommand command; + UniqueResponse response; + UniqueMessageData *message; + + if (argc > 1) { + command = COMMAND_ADD; + message = unique_message_data_new(); + unique_message_data_set_filename(message, argv[1]); + } else { + command = UNIQUE_ACTIVATE; + message = NULL; + } + + response = unique_app_send_message(app, command, message); + unique_message_data_free(message); + + if (response == UNIQUE_RESPONSE_OK) { + returnValue = 0; + } else { + returnValue = 1; + } } else { - client = trg_init_client(); + client = trg_init_client(); - curl_global_init(CURL_GLOBAL_ALL); + curl_global_init(CURL_GLOBAL_ALL); - window = trg_main_window_new(client); - unique_app_watch_window(app, GTK_WINDOW(window)); + window = trg_main_window_new(client); + unique_app_watch_window(app, GTK_WINDOW(window)); - g_signal_connect(app, "message-received", - G_CALLBACK(message_received_cb), window); + g_signal_connect(app, "message-received", + G_CALLBACK(message_received_cb), window); - gtk_widget_show_all(GTK_WIDGET(window)); + gtk_widget_show_all(GTK_WIDGET(window)); - auto_connect_if_required(window, client); - gtk_main(); + auto_connect_if_required(window, client); + gtk_main(); - curl_global_cleanup(); + curl_global_cleanup(); } g_object_unref(app); diff --git a/src/protocol-constants.h b/src/protocol-constants.h index 4d48751..52dd348 100644 --- a/src/protocol-constants.h +++ b/src/protocol-constants.h @@ -27,7 +27,7 @@ /* torrents */ -#define FIELD_TORRENTS "torrents" /* parent node */ +#define FIELD_TORRENTS "torrents" /* parent node */ #define FIELD_ANNOUNCE_URL "announceUrl" #define FIELD_LEFT_UNTIL_DONE "leftUntilDone" #define FIELD_TOTAL_SIZE "totalSize" @@ -119,4 +119,4 @@ enum { #define TFILE_BYTES_COMPLETED "bytesCompleted" #define TFILE_NAME "name" -#endif /* PROTOCOL_CONSTANTS_H_ */ +#endif /* PROTOCOL_CONSTANTS_H_ */ diff --git a/src/requests.c b/src/requests.c index 221ab5f..1304d7a 100644 --- a/src/requests.c +++ b/src/requests.c @@ -34,8 +34,8 @@ JsonNode *generic_request(gchar * method, JsonArray * ids) JsonNode *root = base_request(method); if (ids != NULL) - json_object_set_array_member(node_get_arguments(root), - PARAM_IDS, ids); + json_object_set_array_member(node_get_arguments(root), + PARAM_IDS, ids); return root; } @@ -61,7 +61,7 @@ JsonNode *session_get() } JsonNode *torrent_set_location(JsonArray * array, gchar * location, - gboolean move) + gboolean move) { JsonNode *req = generic_request(METHOD_TORRENT_SET_LOCATION, array); JsonObject *args = node_get_arguments(req); @@ -101,7 +101,7 @@ JsonNode *torrent_remove(JsonArray * array, gboolean removeData) JsonObject *args = node_get_arguments(root); json_object_set_array_member(args, PARAM_IDS, array); json_object_set_boolean_member(args, PARAM_DELETE_LOCAL_DATA, - removeData); + removeData); return root; } @@ -146,7 +146,7 @@ JsonNode *torrent_get() json_array_add_string_element(fields, FIELD_WANTED); json_array_add_string_element(fields, FIELD_PRIORITIES); json_object_set_array_member(node_get_arguments(root), - PARAM_FIELDS, fields); + PARAM_FIELDS, fields); return root; } diff --git a/src/requests.h b/src/requests.h index b5d8c75..e0443a1 100644 --- a/src/requests.h +++ b/src/requests.h @@ -36,9 +36,9 @@ JsonNode *torrent_remove(JsonArray * array, int removeData); JsonNode *torrent_add(gchar * filename, gboolean paused); JsonNode *torrent_add_url(const gchar * url, gboolean paused); JsonNode *torrent_set_location(JsonArray * array, gchar * location, - gboolean move); + gboolean move); JsonNode *blocklist_update(); JsonNode *port_test(); JsonNode *session_stats(); -#endif /* REQUESTS_H_ */ +#endif /* REQUESTS_H_ */ diff --git a/src/session-get.c b/src/session-get.c index f89175b..581efcc 100644 --- a/src/session-get.c +++ b/src/session-get.c @@ -27,7 +27,7 @@ int session_get_version(JsonObject * s, float *version) { const gchar *versionStr = - json_object_get_string_member(s, SGET_VERSION); + json_object_get_string_member(s, SGET_VERSION); return sscanf(versionStr, "%f", version); } @@ -49,7 +49,7 @@ const gchar *session_get_download_dir(JsonObject * s) gboolean session_get_peer_port_random(JsonObject * s) { return json_object_get_boolean_member(s, - SGET_PEER_PORT_RANDOM_ON_START); + SGET_PEER_PORT_RANDOM_ON_START); } gint64 session_get_peer_port(JsonObject * s) @@ -100,21 +100,21 @@ gboolean session_get_seed_ratio_limited(JsonObject * s) const gchar *session_get_torrent_done_filename(JsonObject * s) { return json_object_get_string_member(s, - SGET_SCRIPT_TORRENT_DONE_FILENAME); + SGET_SCRIPT_TORRENT_DONE_FILENAME); } gboolean session_get_torrent_done_enabled(JsonObject * s) { return json_object_get_boolean_member(s, - SGET_SCRIPT_TORRENT_DONE_ENABLED); + SGET_SCRIPT_TORRENT_DONE_ENABLED); } gint64 session_get_cache_size_mb(JsonObject * s) { if (json_object_has_member(s, SGET_CACHE_SIZE_MB)) - return json_object_get_int_member(s, SGET_CACHE_SIZE_MB); + return json_object_get_int_member(s, SGET_CACHE_SIZE_MB); else - return -1; + return -1; } gdouble session_get_seed_ratio_limit(JsonObject * s) @@ -130,7 +130,7 @@ gboolean session_get_start_added_torrents(JsonObject * s) gboolean session_get_trash_original_torrent_files(JsonObject * s) { return json_object_get_boolean_member(s, - SGET_TRASH_ORIGINAL_TORRENT_FILES); + SGET_TRASH_ORIGINAL_TORRENT_FILES); } gboolean session_get_speed_limit_up_enabled(JsonObject * s) @@ -156,7 +156,7 @@ gint64 session_get_speed_limit_up(JsonObject * s) gboolean session_get_speed_limit_down_enabled(JsonObject * s) { return json_object_get_boolean_member(s, - SGET_SPEED_LIMIT_DOWN_ENABLED); + SGET_SPEED_LIMIT_DOWN_ENABLED); } gint64 session_get_speed_limit_down(JsonObject * s) diff --git a/src/session-get.h b/src/session-get.h index bbd31f2..eefaa48 100644 --- a/src/session-get.h +++ b/src/session-get.h @@ -86,4 +86,4 @@ gint64 session_get_speed_limit_up(JsonObject * s); gboolean session_get_speed_limit_down_enabled(JsonObject * s); gint64 session_get_speed_limit_down(JsonObject * s); -#endif /* SESSION_GET_H_ */ +#endif /* SESSION_GET_H_ */ diff --git a/src/tfile.c b/src/tfile.c index f0b073c..0dca0a4 100644 --- a/src/tfile.c +++ b/src/tfile.c @@ -25,7 +25,7 @@ gdouble file_get_progress(JsonObject * f) { return ((gdouble) file_get_bytes_completed(f) / - (gdouble) file_get_length(f)) * 100.0; + (gdouble) file_get_length(f)) * 100.0; } gint64 file_get_length(JsonObject * f) diff --git a/src/tfile.h b/src/tfile.h index 06f87eb..ad5c57b 100644 --- a/src/tfile.h +++ b/src/tfile.h @@ -28,4 +28,4 @@ gint64 file_get_bytes_completed(JsonObject * f); const gchar *file_get_name(JsonObject * f); gdouble file_get_progress(JsonObject * f); -#endif /* TFILE_H_ */ +#endif /* TFILE_H_ */ diff --git a/src/torrent.c b/src/torrent.c index d6fcde2..def9cbc 100644 --- a/src/torrent.c +++ b/src/torrent.c @@ -161,28 +161,28 @@ gdouble torrent_get_percent_done(JsonObject * t) json_node_get_value(percentDone, &a); switch (G_VALUE_TYPE(&a)) { case G_TYPE_INT64: - return (gdouble) g_value_get_int64(&a) * 100.0; + return (gdouble) g_value_get_int64(&a) * 100.0; case G_TYPE_DOUBLE: - return g_value_get_double(&a) * 100.0; + return g_value_get_double(&a) * 100.0; default: - return 0.0; + return 0.0; } } gchar *torrent_get_status_icon(guint flags) { if (flags & TORRENT_FLAG_ERROR) - return g_strdup(GTK_STOCK_DIALOG_WARNING); + return g_strdup(GTK_STOCK_DIALOG_WARNING); else if (flags & TORRENT_FLAG_DOWNLOADING) - return g_strdup(GTK_STOCK_GO_DOWN); + return g_strdup(GTK_STOCK_GO_DOWN); else if (flags & TORRENT_FLAG_PAUSED) - return g_strdup(GTK_STOCK_MEDIA_PAUSE); + return g_strdup(GTK_STOCK_MEDIA_PAUSE); else if (flags & TORRENT_FLAG_SEEDING) - return g_strdup(GTK_STOCK_GO_UP); + return g_strdup(GTK_STOCK_GO_UP); else if (flags & TORRENT_FLAG_CHECKING) - return g_strdup(GTK_STOCK_REFRESH); + return g_strdup(GTK_STOCK_REFRESH); else - return g_strdup(GTK_STOCK_DIALOG_QUESTION); + return g_strdup(GTK_STOCK_DIALOG_QUESTION); } const gchar *torrent_get_errorstr(JsonObject * t) @@ -194,23 +194,23 @@ gchar *torrent_get_status_string(gint64 value) { switch (value) { case STATUS_DOWNLOADING: - return g_strdup("Downloading"); + return g_strdup("Downloading"); case STATUS_PAUSED: - return g_strdup("Paused"); + return g_strdup("Paused"); case STATUS_SEEDING: - return g_strdup("Seeding"); + return g_strdup("Seeding"); case STATUS_CHECKING: - return g_strdup("Checking"); + return g_strdup("Checking"); case STATUS_WAITING_TO_CHECK: - return g_strdup("Waiting To Check"); + return g_strdup("Waiting To Check"); default: - return g_strdup("Unknown"); + return g_strdup("Unknown"); } } -gint64 tracker_get_id(JsonObject *t) +gint64 tracker_get_id(JsonObject * t) { - return json_object_get_int_member(t, FIELD_ID); + return json_object_get_int_member(t, FIELD_ID); } gint64 tracker_get_tier(JsonObject * t) diff --git a/src/torrent.h b/src/torrent.h index 093759f..e76fccc 100644 --- a/src/torrent.h +++ b/src/torrent.h @@ -22,14 +22,14 @@ #include <json-glib/json-glib.h> -#define TORRENT_FLAG_ERROR (1 << 0) /* 0x01 */ -#define TORRENT_FLAG_COMPLETE (1 << 1) /* 0x02 */ -#define TORRENT_FLAG_INCOMPLETE (1 << 2) /* 0x02 */ -#define TORRENT_FLAG_SEEDING (1 << 3) /* 0x04 */ -#define TORRENT_FLAG_CHECKING (1 << 4) /* 0x08 */ -#define TORRENT_FLAG_WAITING_CHECK (1 << 5) /* 0x16 */ -#define TORRENT_FLAG_DOWNLOADING (1 << 6) /* 0x32 */ -#define TORRENT_FLAG_PAUSED (1 << 7) /* 0x64 */ +#define TORRENT_FLAG_ERROR (1 << 0) /* 0x01 */ +#define TORRENT_FLAG_COMPLETE (1 << 1) /* 0x02 */ +#define TORRENT_FLAG_INCOMPLETE (1 << 2) /* 0x02 */ +#define TORRENT_FLAG_SEEDING (1 << 3) /* 0x04 */ +#define TORRENT_FLAG_CHECKING (1 << 4) /* 0x08 */ +#define TORRENT_FLAG_WAITING_CHECK (1 << 5) /* 0x16 */ +#define TORRENT_FLAG_DOWNLOADING (1 << 6) /* 0x32 */ +#define TORRENT_FLAG_PAUSED (1 << 7) /* 0x64 */ gint64 torrent_get_size(JsonObject * t); const gchar *torrent_get_name(JsonObject * t); @@ -51,7 +51,7 @@ JsonArray *torrent_get_wanted(JsonObject * t); JsonArray *torrent_get_priorities(JsonObject * t); gint64 torrent_get_id(JsonObject * t); gint64 tracker_get_tier(JsonObject * t); -gint64 tracker_get_id(JsonObject *t); +gint64 tracker_get_id(JsonObject * t); const gchar *tracker_get_announce(JsonObject * t); const gchar *tracker_get_scrape(JsonObject * t); JsonArray *torrent_get_files(JsonObject * args); @@ -70,4 +70,4 @@ gint64 torrent_get_peer_limit(JsonObject * t); JsonArray *get_torrents(JsonObject * response); -#endif /* TORRENT_H_ */ +#endif /* TORRENT_H_ */ diff --git a/src/tpeer.c b/src/tpeer.c index c44ce4b..9a22928 100644 --- a/src/tpeer.c +++ b/src/tpeer.c @@ -61,11 +61,11 @@ gdouble peer_get_progress(JsonObject * p) gint64 peer_get_rate_to_client(JsonObject * p) { return (gint64) - json_node_get_int(json_object_get_member(p, TPEER_RATE_TO_CLIENT)); + json_node_get_int(json_object_get_member(p, TPEER_RATE_TO_CLIENT)); } gint64 peer_get_rate_to_peer(JsonObject * p) { return (gint64) - json_node_get_int(json_object_get_member(p, TPEER_RATE_TO_PEER)); + json_node_get_int(json_object_get_member(p, TPEER_RATE_TO_PEER)); } diff --git a/src/tpeer.h b/src/tpeer.h index 90b9f8c..4c41c9f 100644 --- a/src/tpeer.h +++ b/src/tpeer.h @@ -44,4 +44,4 @@ gint64 peer_get_rate_to_peer(JsonObject * p); gboolean peer_get_is_uploading_to(JsonObject * p); gboolean peer_get_is_downloading_from(JsonObject * p); -#endif /* TPEER_H_ */ +#endif /* TPEER_H_ */ diff --git a/src/trg-about-window.c b/src/trg-about-window.c index 49eaca3..8ece638 100644 --- a/src/trg-about-window.c +++ b/src/trg-about-window.c @@ -41,37 +41,37 @@ GtkWidget *trg_about_window_new(GtkWindow * parent) gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); logo = - gdk_pixbuf_new_from_file("/usr/share/pixmaps/transmission.png", - &error); + gdk_pixbuf_new_from_file("/usr/share/pixmaps/transmission.png", + &error); if (error == NULL) - gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(dialog), logo); + gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(dialog), logo); else { - if (error->domain == GDK_PIXBUF_ERROR) - g_print("GdkPixbufError: %s\n", error->message); - else if (error->domain == G_FILE_ERROR) - g_print("GFileError: %s\n", error->message); - else - g_print - ("An error in the domain: %d has occurred!\n", - error->domain); - g_error_free(error); + if (error->domain == GDK_PIXBUF_ERROR) + g_print("GdkPixbufError: %s\n", error->message); + else if (error->domain == G_FILE_ERROR) + g_print("GFileError: %s\n", error->message); + else + g_print + ("An error in the domain: %d has occurred!\n", + error->domain); + g_error_free(error); } /* Set application data that will be displayed in the main dialog. */ gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(dialog), PACKAGE_NAME); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), - PACKAGE_VERSION); + PACKAGE_VERSION); gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(dialog), - "(C) 2011 Alan Fitton"); + "(C) 2011 Alan Fitton"); gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(dialog), - "A remote client to transmission-daemon."); + "A remote client to transmission-daemon."); /* Set the license text, which is usually loaded from a file. Also, set the * web site address and label. */ gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(dialog), "GPL2"); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog), - "http://code.google.com/p/transmission-remote-gtk/"); + "http://code.google.com/p/transmission-remote-gtk/"); gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(dialog), - "http://code.google.com/p/transmission-remote-gtk/"); + "http://code.google.com/p/transmission-remote-gtk/"); /* Set the application authors, documenters and translators. */ gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(dialog), trgAuthors); diff --git a/src/trg-about-window.h b/src/trg-about-window.h index 621ccfc..8fbd132 100644 --- a/src/trg-about-window.h +++ b/src/trg-about-window.h @@ -24,4 +24,4 @@ GtkWidget *trg_about_window_new(GtkWindow * parent); -#endif /* ABOUT_WINDOW_H_ */ +#endif /* ABOUT_WINDOW_H_ */ diff --git a/src/trg-cell-renderer-eta.c b/src/trg-cell-renderer-eta.c index c4f3556..ef732bc 100644 --- a/src/trg-cell-renderer-eta.c +++ b/src/trg-cell-renderer-eta.c @@ -29,7 +29,7 @@ enum { }; G_DEFINE_TYPE(TrgCellRendererEta, trg_cell_renderer_eta, - GTK_TYPE_CELL_RENDERER_TEXT) + GTK_TYPE_CELL_RENDERER_TEXT) #define TRG_CELL_RENDERER_ETA_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_CELL_RENDERER_ETA, TrgCellRendererEtaPrivate)) typedef struct _TrgCellRendererEtaPrivate TrgCellRendererEtaPrivate; @@ -40,41 +40,41 @@ struct _TrgCellRendererEtaPrivate { static void trg_cell_renderer_eta_get_property(GObject * object, guint property_id, - GValue * value, GParamSpec * pspec) + GValue * value, GParamSpec * pspec) { TrgCellRendererEtaPrivate *priv = - TRG_CELL_RENDERER_ETA_GET_PRIVATE(object); + TRG_CELL_RENDERER_ETA_GET_PRIVATE(object); switch (property_id) { case PROP_ETA_VALUE: - g_value_set_int64(value, priv->eta_value); - break; + g_value_set_int64(value, priv->eta_value); + 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_cell_renderer_eta_set_property(GObject * object, guint property_id, - const GValue * value, - GParamSpec * pspec) + const GValue * value, + GParamSpec * pspec) { TrgCellRendererEtaPrivate *priv = - TRG_CELL_RENDERER_ETA_GET_PRIVATE(object); + TRG_CELL_RENDERER_ETA_GET_PRIVATE(object); if (property_id == PROP_ETA_VALUE) { - priv->eta_value = g_value_get_int64(value); - if (priv->eta_value > 0) { - char etaString[32]; - tr_strltime_short(etaString, priv->eta_value, - sizeof(etaString)); - g_object_set(object, "text", etaString, NULL); - } else if (priv->eta_value == -2) { - g_object_set(object, "text", "∞", NULL); - } else { - g_object_set(object, "text", "", NULL); - } + priv->eta_value = g_value_get_int64(value); + if (priv->eta_value > 0) { + char etaString[32]; + tr_strltime_short(etaString, priv->eta_value, + sizeof(etaString)); + g_object_set(object, "text", etaString, NULL); + } else if (priv->eta_value == -2) { + g_object_set(object, "text", "∞", NULL); + } else { + g_object_set(object, "text", "", NULL); + } } else { - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); } } @@ -87,20 +87,20 @@ trg_cell_renderer_eta_class_init(TrgCellRendererEtaClass * klass) object_class->set_property = trg_cell_renderer_eta_set_property; g_object_class_install_property(object_class, - PROP_ETA_VALUE, - g_param_spec_int64("eta-value", - "Eta Value", - "Eta Value", - INT64_MIN, - INT64_MAX, - 0, - G_PARAM_READWRITE - | - G_PARAM_STATIC_NAME - | - G_PARAM_STATIC_NICK - | - G_PARAM_STATIC_BLURB)); + PROP_ETA_VALUE, + g_param_spec_int64("eta-value", + "Eta Value", + "Eta Value", + INT64_MIN, + INT64_MAX, + 0, + G_PARAM_READWRITE + | + G_PARAM_STATIC_NAME + | + G_PARAM_STATIC_NICK + | + G_PARAM_STATIC_BLURB)); g_type_class_add_private(klass, sizeof(TrgCellRendererEtaPrivate)); } @@ -113,5 +113,5 @@ trg_cell_renderer_eta_init(TrgCellRendererEta * self G_GNUC_UNUSED) GtkCellRenderer *trg_cell_renderer_eta_new(void) { return - GTK_CELL_RENDERER(g_object_new(TRG_TYPE_CELL_RENDERER_ETA, NULL)); + GTK_CELL_RENDERER(g_object_new(TRG_TYPE_CELL_RENDERER_ETA, NULL)); } diff --git a/src/trg-cell-renderer-eta.h b/src/trg-cell-renderer-eta.h index d3533fc..a56d96f 100644 --- a/src/trg-cell-renderer-eta.h +++ b/src/trg-cell-renderer-eta.h @@ -48,4 +48,4 @@ GType trg_cell_renderer_eta_get_type(void); GtkCellRenderer *trg_cell_renderer_eta_new(void); G_END_DECLS -#endif /* TRG_CELL_RENDERER_ETA_H_ */ +#endif /* TRG_CELL_RENDERER_ETA_H_ */ diff --git a/src/trg-cell-renderer-priority.c b/src/trg-cell-renderer-priority.c index 91ab812..77fe4f9 100644 --- a/src/trg-cell-renderer-priority.c +++ b/src/trg-cell-renderer-priority.c @@ -30,7 +30,7 @@ enum { }; G_DEFINE_TYPE(TrgCellRendererPriority, trg_cell_renderer_priority, - GTK_TYPE_CELL_RENDERER_TEXT) + GTK_TYPE_CELL_RENDERER_TEXT) #define TRG_CELL_RENDERER_PRIORITY_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_CELL_RENDERER_PRIORITY, TrgCellRendererPriorityPrivate)) typedef struct _TrgCellRendererPriorityPrivate @@ -42,40 +42,40 @@ struct _TrgCellRendererPriorityPrivate { static void trg_cell_renderer_priority_get_property(GObject * object, - guint property_id, GValue * value, - GParamSpec * pspec) + guint property_id, GValue * value, + GParamSpec * pspec) { TrgCellRendererPriorityPrivate *priv = - TRG_CELL_RENDERER_PRIORITY_GET_PRIVATE(object); + TRG_CELL_RENDERER_PRIORITY_GET_PRIVATE(object); switch (property_id) { case PROP_PRIORITY_VALUE: - g_value_set_int64(value, priv->priority_value); - break; + g_value_set_int64(value, priv->priority_value); + 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_cell_renderer_priority_set_property(GObject * object, - guint property_id, - const GValue * value, - GParamSpec * pspec) + guint property_id, + const GValue * value, + GParamSpec * pspec) { TrgCellRendererPriorityPrivate *priv = - TRG_CELL_RENDERER_PRIORITY_GET_PRIVATE(object); + TRG_CELL_RENDERER_PRIORITY_GET_PRIVATE(object); if (property_id == PROP_PRIORITY_VALUE) { - priv->priority_value = g_value_get_int64(value); - if (priv->priority_value == T_PRIORITY_LOW) { - g_object_set(object, "text", "Low", NULL); - } else if (priv->priority_value == T_PRIORITY_HIGH) { - g_object_set(object, "text", "High", NULL); - } else { - g_object_set(object, "text", "Normal", NULL); - } + priv->priority_value = g_value_get_int64(value); + if (priv->priority_value == T_PRIORITY_LOW) { + g_object_set(object, "text", "Low", NULL); + } else if (priv->priority_value == T_PRIORITY_HIGH) { + g_object_set(object, "text", "High", NULL); + } else { + g_object_set(object, "text", "Normal", NULL); + } } else { - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); } } @@ -88,30 +88,30 @@ trg_cell_renderer_priority_class_init(TrgCellRendererPriorityClass * klass) object_class->set_property = trg_cell_renderer_priority_set_property; g_object_class_install_property(object_class, - PROP_PRIORITY_VALUE, - g_param_spec_int64 - ("priority-value", - "Priority Value", - "Priority Value", T_PRIORITY_LOW, - T_PRIORITY_HIGH, T_PRIORITY_NORMAL, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + PROP_PRIORITY_VALUE, + g_param_spec_int64 + ("priority-value", + "Priority Value", + "Priority Value", T_PRIORITY_LOW, + T_PRIORITY_HIGH, T_PRIORITY_NORMAL, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_type_class_add_private(klass, - sizeof(TrgCellRendererPriorityPrivate)); + sizeof(TrgCellRendererPriorityPrivate)); } static void trg_cell_renderer_priority_init(TrgCellRendererPriority * - self G_GNUC_UNUSED) + self G_GNUC_UNUSED) { } GtkCellRenderer *trg_cell_renderer_priority_new(void) { return - GTK_CELL_RENDERER(g_object_new - (TRG_TYPE_CELL_RENDERER_PRIORITY, NULL)); + GTK_CELL_RENDERER(g_object_new + (TRG_TYPE_CELL_RENDERER_PRIORITY, NULL)); } diff --git a/src/trg-cell-renderer-priority.h b/src/trg-cell-renderer-priority.h index e53d8ce..8d47bca 100644 --- a/src/trg-cell-renderer-priority.h +++ b/src/trg-cell-renderer-priority.h @@ -49,4 +49,4 @@ GType trg_cell_renderer_priority_get_type(void); GtkCellRenderer *trg_cell_renderer_priority_new(void); G_END_DECLS -#endif /* TRG_CELL_RENDERER_PRIORITY_H_ */ +#endif /* TRG_CELL_RENDERER_PRIORITY_H_ */ diff --git a/src/trg-cell-renderer-ratio.c b/src/trg-cell-renderer-ratio.c index 5b0d4b6..2a1c304 100644 --- a/src/trg-cell-renderer-ratio.c +++ b/src/trg-cell-renderer-ratio.c @@ -29,7 +29,7 @@ enum { }; G_DEFINE_TYPE(TrgCellRendererRatio, trg_cell_renderer_ratio, - GTK_TYPE_CELL_RENDERER_TEXT) + GTK_TYPE_CELL_RENDERER_TEXT) #define TRG_CELL_RENDERER_RATIO_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_CELL_RENDERER_RATIO, TrgCellRendererRatioPrivate)) typedef struct _TrgCellRendererRatioPrivate TrgCellRendererRatioPrivate; @@ -40,37 +40,37 @@ struct _TrgCellRendererRatioPrivate { static void trg_cell_renderer_ratio_get_property(GObject * object, guint property_id, - GValue * value, GParamSpec * pspec) + GValue * value, GParamSpec * pspec) { TrgCellRendererRatioPrivate *priv = - TRG_CELL_RENDERER_RATIO_GET_PRIVATE(object); + TRG_CELL_RENDERER_RATIO_GET_PRIVATE(object); switch (property_id) { case PROP_RATIO_VALUE: - g_value_set_double(value, priv->ratio_value); - break; + g_value_set_double(value, priv->ratio_value); + 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_cell_renderer_ratio_set_property(GObject * object, guint property_id, - const GValue * value, - GParamSpec * pspec) + const GValue * value, + GParamSpec * pspec) { TrgCellRendererRatioPrivate *priv = - TRG_CELL_RENDERER_RATIO_GET_PRIVATE(object); + TRG_CELL_RENDERER_RATIO_GET_PRIVATE(object); if (property_id == PROP_RATIO_VALUE) { - priv->ratio_value = g_value_get_double(value); - if (priv->ratio_value > 0) { - char ratioString[32]; - trg_strlratio(ratioString, priv->ratio_value); - g_object_set(object, "text", ratioString, NULL); - } else { - g_object_set(object, "text", "", NULL); - } + priv->ratio_value = g_value_get_double(value); + if (priv->ratio_value > 0) { + char ratioString[32]; + trg_strlratio(ratioString, priv->ratio_value); + g_object_set(object, "text", ratioString, NULL); + } else { + g_object_set(object, "text", "", NULL); + } } else { - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); } } @@ -83,20 +83,20 @@ trg_cell_renderer_ratio_class_init(TrgCellRendererRatioClass * klass) object_class->set_property = trg_cell_renderer_ratio_set_property; g_object_class_install_property(object_class, - PROP_RATIO_VALUE, - g_param_spec_double("ratio-value", - "Ratio Value", - "Ratio Value", - 0, - DBL_MAX, - 0, - G_PARAM_READWRITE - | - G_PARAM_STATIC_NAME - | - G_PARAM_STATIC_NICK - | - G_PARAM_STATIC_BLURB)); + PROP_RATIO_VALUE, + g_param_spec_double("ratio-value", + "Ratio Value", + "Ratio Value", + 0, + DBL_MAX, + 0, + G_PARAM_READWRITE + | + G_PARAM_STATIC_NAME + | + G_PARAM_STATIC_NICK + | + G_PARAM_STATIC_BLURB)); g_type_class_add_private(klass, sizeof(TrgCellRendererRatioPrivate)); } @@ -109,6 +109,6 @@ static void trg_cell_renderer_ratio_init(TrgCellRendererRatio * self) GtkCellRenderer *trg_cell_renderer_ratio_new(void) { return - GTK_CELL_RENDERER(g_object_new - (TRG_TYPE_CELL_RENDERER_RATIO, NULL)); + GTK_CELL_RENDERER(g_object_new + (TRG_TYPE_CELL_RENDERER_RATIO, NULL)); } diff --git a/src/trg-cell-renderer-ratio.h b/src/trg-cell-renderer-ratio.h index 9606f54..82593a0 100644 --- a/src/trg-cell-renderer-ratio.h +++ b/src/trg-cell-renderer-ratio.h @@ -48,4 +48,4 @@ GType trg_cell_renderer_ratio_get_type(void); GtkCellRenderer *trg_cell_renderer_ratio_new(void); G_END_DECLS -#endif /* TRG_CELL_RENDERER_RATIO_H_ */ +#endif /* TRG_CELL_RENDERER_RATIO_H_ */ diff --git a/src/trg-cell-renderer-size.c b/src/trg-cell-renderer-size.c index eadf59e..2271d2e 100644 --- a/src/trg-cell-renderer-size.c +++ b/src/trg-cell-renderer-size.c @@ -29,7 +29,7 @@ enum { }; G_DEFINE_TYPE(TrgCellRendererSize, trg_cell_renderer_size, - GTK_TYPE_CELL_RENDERER_TEXT) + GTK_TYPE_CELL_RENDERER_TEXT) #define TRG_CELL_RENDERER_SIZE_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_CELL_RENDERER_SIZE, TrgCellRendererSizePrivate)) typedef struct _TrgCellRendererSizePrivate TrgCellRendererSizePrivate; @@ -40,37 +40,37 @@ struct _TrgCellRendererSizePrivate { static void trg_cell_renderer_size_get_property(GObject * object, guint property_id, - GValue * value, GParamSpec * pspec) + GValue * value, GParamSpec * pspec) { TrgCellRendererSizePrivate *priv = - TRG_CELL_RENDERER_SIZE_GET_PRIVATE(object); + TRG_CELL_RENDERER_SIZE_GET_PRIVATE(object); switch (property_id) { case PROP_SIZE_VALUE: - g_value_set_int64(value, priv->size_value); - break; + g_value_set_int64(value, priv->size_value); + 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_cell_renderer_size_set_property(GObject * object, guint property_id, - const GValue * value, - GParamSpec * pspec) + const GValue * value, + GParamSpec * pspec) { TrgCellRendererSizePrivate *priv = - TRG_CELL_RENDERER_SIZE_GET_PRIVATE(object); + TRG_CELL_RENDERER_SIZE_GET_PRIVATE(object); if (property_id == PROP_SIZE_VALUE) { - priv->size_value = g_value_get_int64(value); - if (priv->size_value > 0) { - char sizeString[32]; - trg_strlsize(sizeString, priv->size_value); - g_object_set(object, "text", sizeString, NULL); - } else { - g_object_set(object, "text", "", NULL); - } + priv->size_value = g_value_get_int64(value); + if (priv->size_value > 0) { + char sizeString[32]; + trg_strlsize(sizeString, priv->size_value); + g_object_set(object, "text", sizeString, NULL); + } else { + g_object_set(object, "text", "", NULL); + } } else { - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); } } @@ -83,20 +83,20 @@ trg_cell_renderer_size_class_init(TrgCellRendererSizeClass * klass) object_class->set_property = trg_cell_renderer_size_set_property; g_object_class_install_property(object_class, - PROP_SIZE_VALUE, - g_param_spec_int64("size-value", - "Size Value", - "Size Value", - 0, - INT64_MAX, - 0, - G_PARAM_READWRITE - | - G_PARAM_STATIC_NAME - | - G_PARAM_STATIC_NICK - | - G_PARAM_STATIC_BLURB)); + PROP_SIZE_VALUE, + g_param_spec_int64("size-value", + "Size Value", + "Size Value", + 0, + INT64_MAX, + 0, + G_PARAM_READWRITE + | + G_PARAM_STATIC_NAME + | + G_PARAM_STATIC_NICK + | + G_PARAM_STATIC_BLURB)); g_type_class_add_private(klass, sizeof(TrgCellRendererSizePrivate)); } @@ -109,5 +109,5 @@ static void trg_cell_renderer_size_init(TrgCellRendererSize * self) GtkCellRenderer *trg_cell_renderer_size_new(void) { return - GTK_CELL_RENDERER(g_object_new(TRG_TYPE_CELL_RENDERER_SIZE, NULL)); + GTK_CELL_RENDERER(g_object_new(TRG_TYPE_CELL_RENDERER_SIZE, NULL)); } diff --git a/src/trg-cell-renderer-size.h b/src/trg-cell-renderer-size.h index e4967f7..afeaab7 100644 --- a/src/trg-cell-renderer-size.h +++ b/src/trg-cell-renderer-size.h @@ -49,4 +49,4 @@ GType trg_cell_renderer_size_get_type(void); GtkCellRenderer *trg_cell_renderer_size_new(void); G_END_DECLS -#endif /* TRG_CELL_RENDERER_SIZE_H_ */ +#endif /* TRG_CELL_RENDERER_SIZE_H_ */ diff --git a/src/trg-cell-renderer-speed.c b/src/trg-cell-renderer-speed.c index 369e04d..6fcc797 100644 --- a/src/trg-cell-renderer-speed.c +++ b/src/trg-cell-renderer-speed.c @@ -29,7 +29,7 @@ enum { }; G_DEFINE_TYPE(TrgCellRendererSpeed, trg_cell_renderer_speed, - GTK_TYPE_CELL_RENDERER_TEXT) + GTK_TYPE_CELL_RENDERER_TEXT) #define TRG_CELL_RENDERER_SPEED_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_CELL_RENDERER_SPEED, TrgCellRendererSpeedPrivate)) typedef struct _TrgCellRendererSpeedPrivate TrgCellRendererSpeedPrivate; @@ -40,38 +40,38 @@ struct _TrgCellRendererSpeedPrivate { static void trg_cell_renderer_speed_get_property(GObject * object, guint property_id, - GValue * value, GParamSpec * pspec) + GValue * value, GParamSpec * pspec) { TrgCellRendererSpeedPrivate *priv = - TRG_CELL_RENDERER_SPEED_GET_PRIVATE(object); + TRG_CELL_RENDERER_SPEED_GET_PRIVATE(object); switch (property_id) { case PROP_SPEED_VALUE: - g_value_set_int64(value, priv->speed_value); - break; + g_value_set_int64(value, priv->speed_value); + 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_cell_renderer_speed_set_property(GObject * object, guint property_id, - const GValue * value, - GParamSpec * pspec) + const GValue * value, + GParamSpec * pspec) { TrgCellRendererSpeedPrivate *priv = - TRG_CELL_RENDERER_SPEED_GET_PRIVATE(object); + TRG_CELL_RENDERER_SPEED_GET_PRIVATE(object); if (property_id == PROP_SPEED_VALUE) { - priv->speed_value = g_value_get_int64(value); - if (priv->speed_value > 0) { - char speedString[32]; - trg_strlspeed(speedString, - priv->speed_value / KILOBYTE_FACTOR); - g_object_set(object, "text", speedString, NULL); - } else { - g_object_set(object, "text", "", NULL); - } + priv->speed_value = g_value_get_int64(value); + if (priv->speed_value > 0) { + char speedString[32]; + trg_strlspeed(speedString, + priv->speed_value / KILOBYTE_FACTOR); + g_object_set(object, "text", speedString, NULL); + } else { + g_object_set(object, "text", "", NULL); + } } else { - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); } } @@ -84,20 +84,20 @@ trg_cell_renderer_speed_class_init(TrgCellRendererSpeedClass * klass) object_class->set_property = trg_cell_renderer_speed_set_property; g_object_class_install_property(object_class, - PROP_SPEED_VALUE, - g_param_spec_int64("speed-value", - "Speed Value", - "Speed Value", - 0, - INT64_MAX, - 0, - G_PARAM_READWRITE - | - G_PARAM_STATIC_NAME - | - G_PARAM_STATIC_NICK - | - G_PARAM_STATIC_BLURB)); + PROP_SPEED_VALUE, + g_param_spec_int64("speed-value", + "Speed Value", + "Speed Value", + 0, + INT64_MAX, + 0, + G_PARAM_READWRITE + | + G_PARAM_STATIC_NAME + | + G_PARAM_STATIC_NICK + | + G_PARAM_STATIC_BLURB)); g_type_class_add_private(klass, sizeof(TrgCellRendererSpeedPrivate)); } @@ -110,6 +110,6 @@ static void trg_cell_renderer_speed_init(TrgCellRendererSpeed * self) GtkCellRenderer *trg_cell_renderer_speed_new(void) { return - GTK_CELL_RENDERER(g_object_new - (TRG_TYPE_CELL_RENDERER_SPEED, NULL)); + GTK_CELL_RENDERER(g_object_new + (TRG_TYPE_CELL_RENDERER_SPEED, NULL)); } diff --git a/src/trg-cell-renderer-speed.h b/src/trg-cell-renderer-speed.h index 6aa6b7f..e8ea8f0 100644 --- a/src/trg-cell-renderer-speed.h +++ b/src/trg-cell-renderer-speed.h @@ -49,4 +49,4 @@ GType trg_cell_renderer_speed_get_type(void); GtkCellRenderer *trg_cell_renderer_speed_new(void); G_END_DECLS -#endif /* TRG_CELL_RENDERER_SPEED_H_ */ +#endif /* TRG_CELL_RENDERER_SPEED_H_ */ diff --git a/src/trg-cell-renderer-wanted.c b/src/trg-cell-renderer-wanted.c index ff90beb..d364bd2 100644 --- a/src/trg-cell-renderer-wanted.c +++ b/src/trg-cell-renderer-wanted.c @@ -29,7 +29,7 @@ enum { }; G_DEFINE_TYPE(TrgCellRendererWanted, trg_cell_renderer_wanted, - GTK_TYPE_CELL_RENDERER_TEXT) + GTK_TYPE_CELL_RENDERER_TEXT) #define TRG_CELL_RENDERER_WANTED_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_CELL_RENDERER_WANTED, TrgCellRendererWantedPrivate)) typedef struct _TrgCellRendererWantedPrivate TrgCellRendererWantedPrivate; @@ -40,35 +40,35 @@ struct _TrgCellRendererWantedPrivate { static void trg_cell_renderer_wanted_get_property(GObject * object, guint property_id, - GValue * value, GParamSpec * pspec) + GValue * value, GParamSpec * pspec) { TrgCellRendererWantedPrivate *priv = - TRG_CELL_RENDERER_WANTED_GET_PRIVATE(object); + TRG_CELL_RENDERER_WANTED_GET_PRIVATE(object); switch (property_id) { case PROP_WANTED_VALUE: - g_value_set_boolean(value, priv->wanted_value); - break; + g_value_set_boolean(value, priv->wanted_value); + 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_cell_renderer_wanted_set_property(GObject * object, guint property_id, - const GValue * value, - GParamSpec * pspec) + const GValue * value, + GParamSpec * pspec) { TrgCellRendererWantedPrivate *priv = - TRG_CELL_RENDERER_WANTED_GET_PRIVATE(object); + TRG_CELL_RENDERER_WANTED_GET_PRIVATE(object); if (property_id == PROP_WANTED_VALUE) { - priv->wanted_value = g_value_get_boolean(value); - if (priv->wanted_value) { - g_object_set(object, "text", "Yes", NULL); - } else { - g_object_set(object, "text", "No", NULL); - } + priv->wanted_value = g_value_get_boolean(value); + if (priv->wanted_value) { + g_object_set(object, "text", "Yes", NULL); + } else { + g_object_set(object, "text", "No", NULL); + } } else { - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); } } @@ -81,14 +81,14 @@ trg_cell_renderer_wanted_class_init(TrgCellRendererWantedClass * klass) object_class->set_property = trg_cell_renderer_wanted_set_property; g_object_class_install_property(object_class, - PROP_WANTED_VALUE, - g_param_spec_boolean - ("wanted-value", "Wanted Value", - "Wanted Value", TRUE, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + PROP_WANTED_VALUE, + g_param_spec_boolean + ("wanted-value", "Wanted Value", + "Wanted Value", TRUE, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_type_class_add_private(klass, sizeof(TrgCellRendererWantedPrivate)); } @@ -101,6 +101,6 @@ trg_cell_renderer_wanted_init(TrgCellRendererWanted * self G_GNUC_UNUSED) GtkCellRenderer *trg_cell_renderer_wanted_new(void) { return - GTK_CELL_RENDERER(g_object_new - (TRG_TYPE_CELL_RENDERER_WANTED, NULL)); + GTK_CELL_RENDERER(g_object_new + (TRG_TYPE_CELL_RENDERER_WANTED, NULL)); } diff --git a/src/trg-cell-renderer-wanted.h b/src/trg-cell-renderer-wanted.h index e3ef18a..f8f83d8 100644 --- a/src/trg-cell-renderer-wanted.h +++ b/src/trg-cell-renderer-wanted.h @@ -49,4 +49,4 @@ GType trg_cell_renderer_wanted_get_type(void); GtkCellRenderer *trg_cell_renderer_wanted_new(void); G_END_DECLS -#endif /* TRG_CELL_RENDERER_WANTED_H_ */ +#endif /* TRG_CELL_RENDERER_WANTED_H_ */ diff --git a/src/trg-client.c b/src/trg-client.c index 8e7c46a..cdbebfc 100644 --- a/src/trg-client.c +++ b/src/trg-client.c @@ -24,9 +24,9 @@ #include "trg-client.h" #include "trg-preferences.h" -gboolean trg_client_supports_tracker_edit(trg_client *tc) +gboolean trg_client_supports_tracker_edit(trg_client * tc) { - return tc->session != NULL && tc->version >= 2.10; + return tc->session != NULL && tc->version >= 2.10; } trg_client *trg_init_client() @@ -42,14 +42,14 @@ trg_client *trg_init_client() #define check_for_error(error) if (error) { g_error_free(error); return TRG_GCONF_SCHEMA_ERROR; } -void trg_client_set_session(trg_client *tc, JsonObject *session) +void trg_client_set_session(trg_client * tc, JsonObject * session) { - if (tc->session != NULL) - json_object_unref(tc->session); + if (tc->session != NULL) + json_object_unref(tc->session); - session_get_version(session, &(tc->version)); + session_get_version(session, &(tc->version)); - tc->session = session; + tc->session = session; } int trg_client_populate_with_settings(trg_client * tc, GConfClient * gconf) @@ -73,27 +73,28 @@ int trg_client_populate_with_settings(trg_client * tc, GConfClient * gconf) host = gconf_client_get_string(gconf, TRG_GCONF_KEY_HOSTNAME, &error); check_for_error(error); if (!host || strlen(host) < 1) - return TRG_NO_HOSTNAME_SET; + return TRG_NO_HOSTNAME_SET; tc->ssl = gconf_client_get_bool(gconf, TRG_GCONF_KEY_SSL, &error); check_for_error(error); tc->url = - g_strdup_printf("%s://%s:%d/transmission/rpc", - tc->ssl ? "https" : "http", host, port); + g_strdup_printf("%s://%s:%d/transmission/rpc", + tc->ssl ? "https" : "http", host, port); g_free(host); - tc->interval = gconf_client_get_int(gconf, TRG_GCONF_KEY_UPDATE_INTERVAL, &error); + tc->interval = + gconf_client_get_int(gconf, TRG_GCONF_KEY_UPDATE_INTERVAL, &error); check_for_error(error); if (tc->interval < 1) - tc->interval = 3; + tc->interval = 3; tc->username = - gconf_client_get_string(gconf, TRG_GCONF_KEY_USERNAME, &error); + gconf_client_get_string(gconf, TRG_GCONF_KEY_USERNAME, &error); check_for_error(error); tc->password = - gconf_client_get_string(gconf, TRG_GCONF_KEY_PASSWORD, &error); + gconf_client_get_string(gconf, TRG_GCONF_KEY_PASSWORD, &error); check_for_error(error); return 0; diff --git a/src/trg-client.h b/src/trg-client.h index 60086e6..ae0f889 100644 --- a/src/trg-client.h +++ b/src/trg-client.h @@ -46,8 +46,8 @@ typedef struct { trg_client *trg_init_client(); int trg_client_populate_with_settings(trg_client * tc, - GConfClient * gconf); -void trg_client_set_session(trg_client *tc, JsonObject *session); -gboolean trg_client_supports_tracker_edit(trg_client *tc); + GConfClient * gconf); +void trg_client_set_session(trg_client * tc, JsonObject * session); +gboolean trg_client_supports_tracker_edit(trg_client * tc); -#endif /* TRG_CLIENT_H_ */ +#endif /* TRG_CLIENT_H_ */ diff --git a/src/trg-files-model.c b/src/trg-files-model.c index 3800545..9afc4cc 100644 --- a/src/trg-files-model.c +++ b/src/trg-files-model.c @@ -42,8 +42,8 @@ struct _TrgFilesModelPrivate { }; static void trg_files_model_iter_new(TrgFilesModel * model, - GtkTreeIter * iter, JsonObject * file, - int id) + GtkTreeIter * iter, JsonObject * file, + int id) { char size[32]; @@ -51,12 +51,12 @@ static void trg_files_model_iter_new(TrgFilesModel * model, trg_strlsize(size, file_get_length(file)); gtk_list_store_set(GTK_LIST_STORE(model), iter, - FILESCOL_NAME, file_get_name(file), - FILESCOL_SIZE, size, FILESCOL_ID, id, -1); + FILESCOL_NAME, file_get_name(file), + FILESCOL_SIZE, size, FILESCOL_ID, id, -1); } void trg_files_model_set_update_barrier(TrgFilesModel * model, - gint64 serial) + gint64 serial) { TrgFilesModelPrivate *priv = TRG_FILES_MODEL_GET_PRIVATE(model); priv->updateBarrier = serial; @@ -64,28 +64,28 @@ void trg_files_model_set_update_barrier(TrgFilesModel * model, static void trg_files_model_iter_update(TrgFilesModel * model, - GtkTreeIter * filesIter, JsonObject * file, - JsonArray * wantedArray, - JsonArray * prioritiesArray, int id) + GtkTreeIter * filesIter, JsonObject * file, + JsonArray * wantedArray, + JsonArray * prioritiesArray, int id) { TrgFilesModelPrivate *priv = TRG_FILES_MODEL_GET_PRIVATE(model); gboolean wanted = json_node_get_int(json_array_get_element - (wantedArray, id)) == 1; + (wantedArray, id)) == 1; gint64 priority = - json_node_get_int(json_array_get_element(prioritiesArray, id)); + json_node_get_int(json_array_get_element(prioritiesArray, id)); gdouble progress = file_get_progress(file); gtk_list_store_set(GTK_LIST_STORE(model), filesIter, - FILESCOL_PROGRESS, progress, -1); + FILESCOL_PROGRESS, progress, -1); if (priv->updateBarrier < 0 - || priv->currentSerial > priv->updateBarrier) { - gtk_list_store_set(GTK_LIST_STORE(model), filesIter, - FILESCOL_ICON, - wanted ? GTK_STOCK_FILE : - GTK_STOCK_STOP, FILESCOL_WANTED, wanted, - FILESCOL_PRIORITY, priority, -1); + || priv->currentSerial > priv->updateBarrier) { + gtk_list_store_set(GTK_LIST_STORE(model), filesIter, + FILESCOL_ICON, + wanted ? GTK_STOCK_FILE : + GTK_STOCK_STOP, FILESCOL_WANTED, wanted, + FILESCOL_PRIORITY, priority, -1); } } @@ -110,14 +110,14 @@ static void trg_files_model_init(TrgFilesModel * self) column_types[FILESCOL_PRIORITY] = G_TYPE_INT64; gtk_list_store_set_column_types(GTK_LIST_STORE(self), - FILESCOL_COLUMNS, column_types); + FILESCOL_COLUMNS, column_types); } gboolean trg_files_model_update_foreach(GtkListStore * model, - GtkTreePath * path G_GNUC_UNUSED, - GtkTreeIter * iter, - gpointer data G_GNUC_UNUSED) + GtkTreePath * path G_GNUC_UNUSED, + GtkTreeIter * iter, + gpointer data G_GNUC_UNUSED) { TrgFilesModelPrivate *priv = TRG_FILES_MODEL_GET_PRIVATE(model); JsonObject *file; @@ -127,20 +127,20 @@ trg_files_model_update_foreach(GtkListStore * model, file = json_node_get_object(json_array_get_element(priv->files, id)); trg_files_model_iter_update(TRG_FILES_MODEL(model), iter, file, - priv->wanted, priv->priorities, id); + priv->wanted, priv->priorities, id); return FALSE; } void trg_files_model_update(TrgFilesModel * model, gint64 updateSerial, - JsonObject * t, gboolean first) + JsonObject * t, gboolean first) { TrgFilesModelPrivate *priv = TRG_FILES_MODEL_GET_PRIVATE(model); guint j; if (first) - gtk_list_store_clear(GTK_LIST_STORE(model)); + gtk_list_store_clear(GTK_LIST_STORE(model)); priv->torrentId = torrent_get_id(t); priv->priorities = torrent_get_priorities(t); @@ -149,20 +149,20 @@ trg_files_model_update(TrgFilesModel * model, gint64 updateSerial, priv->currentSerial = updateSerial; if (first == TRUE) { - for (j = 0; j < json_array_get_length(priv->files); j++) { - JsonObject *file = - json_node_get_object(json_array_get_element - (priv->files, j)); - GtkTreeIter filesIter; - trg_files_model_iter_new(model, &filesIter, file, j); - trg_files_model_iter_update(model, &filesIter, - file, priv->wanted, - priv->priorities, j); - } + for (j = 0; j < json_array_get_length(priv->files); j++) { + JsonObject *file = + json_node_get_object(json_array_get_element + (priv->files, j)); + GtkTreeIter filesIter; + trg_files_model_iter_new(model, &filesIter, file, j); + trg_files_model_iter_update(model, &filesIter, + file, priv->wanted, + priv->priorities, j); + } } else { - gtk_tree_model_foreach(GTK_TREE_MODEL(model), - (GtkTreeModelForeachFunc) - trg_files_model_update_foreach, NULL); + gtk_tree_model_foreach(GTK_TREE_MODEL(model), + (GtkTreeModelForeachFunc) + trg_files_model_update_foreach, NULL); } } diff --git a/src/trg-files-model.h b/src/trg-files-model.h index 9b56be6..7c5a296 100644 --- a/src/trg-files-model.h +++ b/src/trg-files-model.h @@ -66,9 +66,9 @@ G_END_DECLS enum { void trg_files_model_update(TrgFilesModel * model, gint64 updateSerial, - JsonObject * t, gboolean first); + JsonObject * t, gboolean first); gint64 trg_files_model_get_torrent_id(TrgFilesModel * model); void trg_files_model_set_update_barrier(TrgFilesModel * model, - gint64 serial); + gint64 serial); -#endif /* TRG_FILES_MODEL_H_ */ +#endif /* TRG_FILES_MODEL_H_ */ diff --git a/src/trg-files-tree-view.c b/src/trg-files-tree-view.c index 01d8a7a..de947e8 100644 --- a/src/trg-files-tree-view.c +++ b/src/trg-files-tree-view.c @@ -47,92 +47,92 @@ static void trg_files_tree_view_class_init(TrgFilesTreeViewClass * klass) } static void set_unwanted_foreachfunc(GtkTreeModel * model, - GtkTreePath * path G_GNUC_UNUSED, - GtkTreeIter * iter, - gpointer data G_GNUC_UNUSED) + 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); + FALSE, FILESCOL_ICON, GTK_STOCK_CANCEL, -1); } static void set_wanted_foreachfunc(GtkTreeModel * model, - GtkTreePath * path G_GNUC_UNUSED, - GtkTreeIter * iter, - gpointer data G_GNUC_UNUSED) + 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); + TRUE, FILESCOL_ICON, GTK_STOCK_FILE, -1); } static void set_low_foreachfunc(GtkTreeModel * model, - GtkTreePath * path G_GNUC_UNUSED, - GtkTreeIter * iter, - gpointer data G_GNUC_UNUSED) + GtkTreePath * path G_GNUC_UNUSED, + GtkTreeIter * iter, + gpointer data G_GNUC_UNUSED) { GValue value = { 0 }; g_value_init(&value, G_TYPE_INT64); g_value_set_int64(&value, T_PRIORITY_LOW); gtk_list_store_set_value(GTK_LIST_STORE(model), iter, - FILESCOL_PRIORITY, &value); + FILESCOL_PRIORITY, &value); } static void set_normal_foreachfunc(GtkTreeModel * model, - GtkTreePath * path G_GNUC_UNUSED, - GtkTreeIter * iter, - gpointer data G_GNUC_UNUSED) + 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); + T_PRIORITY_NORMAL, -1); } static void set_high_foreachfunc(GtkTreeModel * model, - GtkTreePath * path G_GNUC_UNUSED, - GtkTreeIter * iter, - gpointer data G_GNUC_UNUSED) + 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); + T_PRIORITY_HIGH, -1); } static void add_file_id_to_array(JsonObject * args, gchar * key, - gint index) + gint index) { JsonArray *array = json_object_get_array_member(args, key); json_array_add_int_element(array, index); } static void send_updated_file_prefs_foreachfunc(GtkTreeModel * model, - GtkTreePath * - path G_GNUC_UNUSED, - GtkTreeIter * iter, - gpointer data) + GtkTreePath * + path G_GNUC_UNUSED, + GtkTreeIter * iter, + gpointer data) { JsonObject *args = (JsonObject *) data; gint64 priority, id; gboolean wanted; gtk_tree_model_get(model, iter, FILESCOL_WANTED, &wanted, - FILESCOL_PRIORITY, &priority, FILESCOL_ID, &id, -1); + FILESCOL_PRIORITY, &priority, FILESCOL_ID, &id, -1); if (wanted == FALSE) - add_file_id_to_array(args, FIELD_FILES_UNWANTED, id); + add_file_id_to_array(args, FIELD_FILES_UNWANTED, id); else - add_file_id_to_array(args, FIELD_FILES_WANTED, id); + add_file_id_to_array(args, FIELD_FILES_WANTED, id); if (priority == T_PRIORITY_LOW) - add_file_id_to_array(args, FIELD_FILES_PRIORITY_LOW, id); + add_file_id_to_array(args, FIELD_FILES_PRIORITY_LOW, id); else if (priority == T_PRIORITY_HIGH) - add_file_id_to_array(args, FIELD_FILES_PRIORITY_HIGH, id); + add_file_id_to_array(args, FIELD_FILES_PRIORITY_HIGH, id); else - add_file_id_to_array(args, FIELD_FILES_PRIORITY_NORMAL, id); + add_file_id_to_array(args, FIELD_FILES_PRIORITY_NORMAL, id); } static void remove_array_if_empty(JsonObject * args, gchar * key) { JsonArray *array = json_object_get_array_member(args, key); if (json_array_get_length(array) == 0) - json_object_remove_member(args, key); + json_object_remove_member(args, key); } static void send_updated_file_prefs(TrgFilesTreeView * tv) @@ -155,19 +155,19 @@ static void send_updated_file_prefs(TrgFilesTreeView * tv) args = node_get_arguments(req); json_object_set_array_member(args, FIELD_FILES_WANTED, - json_array_new()); + json_array_new()); json_object_set_array_member(args, FIELD_FILES_UNWANTED, - json_array_new()); + json_array_new()); json_object_set_array_member(args, FIELD_FILES_PRIORITY_HIGH, - json_array_new()); + json_array_new()); json_object_set_array_member(args, FIELD_FILES_PRIORITY_NORMAL, - json_array_new()); + json_array_new()); json_object_set_array_member(args, FIELD_FILES_PRIORITY_LOW, - json_array_new()); + json_array_new()); gtk_tree_selection_selected_foreach(selection, - send_updated_file_prefs_foreachfunc, - args); + send_updated_file_prefs_foreachfunc, + args); remove_array_if_empty(args, FIELD_FILES_WANTED); remove_array_if_empty(args, FIELD_FILES_UNWANTED); @@ -176,18 +176,18 @@ static void send_updated_file_prefs(TrgFilesTreeView * tv) remove_array_if_empty(args, FIELD_FILES_PRIORITY_LOW); trg_files_model_set_update_barrier(TRG_FILES_MODEL(model), - priv->client->updateSerial + 1); + priv->client->updateSerial + 1); dispatch_async(priv->client, req, on_generic_interactive_action, - priv->win); + priv->win); } static void set_low(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgFilesTreeView *tv = TRG_FILES_TREE_VIEW(data); GtkTreeSelection *selection = - gtk_tree_view_get_selection(GTK_TREE_VIEW(data)); + gtk_tree_view_get_selection(GTK_TREE_VIEW(data)); gtk_tree_selection_selected_foreach(selection, set_low_foreachfunc, - NULL); + NULL); send_updated_file_prefs(tv); } @@ -195,9 +195,9 @@ static void set_normal(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgFilesTreeView *tv = TRG_FILES_TREE_VIEW(data); GtkTreeSelection *selection = - gtk_tree_view_get_selection(GTK_TREE_VIEW(data)); + gtk_tree_view_get_selection(GTK_TREE_VIEW(data)); gtk_tree_selection_selected_foreach(selection, - set_normal_foreachfunc, NULL); + set_normal_foreachfunc, NULL); send_updated_file_prefs(tv); } @@ -205,9 +205,9 @@ static void set_high(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgFilesTreeView *tv = TRG_FILES_TREE_VIEW(data); GtkTreeSelection *selection = - gtk_tree_view_get_selection(GTK_TREE_VIEW(data)); + gtk_tree_view_get_selection(GTK_TREE_VIEW(data)); gtk_tree_selection_selected_foreach(selection, - set_high_foreachfunc, NULL); + set_high_foreachfunc, NULL); send_updated_file_prefs(tv); } @@ -215,9 +215,9 @@ static void set_unwanted(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgFilesTreeView *tv = TRG_FILES_TREE_VIEW(data); GtkTreeSelection *selection = - gtk_tree_view_get_selection(GTK_TREE_VIEW(data)); + gtk_tree_view_get_selection(GTK_TREE_VIEW(data)); gtk_tree_selection_selected_foreach(selection, - set_unwanted_foreachfunc, NULL); + set_unwanted_foreachfunc, NULL); send_updated_file_prefs(tv); } @@ -225,15 +225,15 @@ static void set_wanted(GtkWidget * w G_GNUC_UNUSED, gpointer data) { TrgFilesTreeView *tv = TRG_FILES_TREE_VIEW(data); GtkTreeSelection *selection = - gtk_tree_view_get_selection(GTK_TREE_VIEW(data)); + gtk_tree_view_get_selection(GTK_TREE_VIEW(data)); gtk_tree_selection_selected_foreach(selection, - set_wanted_foreachfunc, NULL); + set_wanted_foreachfunc, NULL); send_updated_file_prefs(tv); } static void view_popup_menu(GtkWidget * treeview, GdkEventButton * event, - gpointer data G_GNUC_UNUSED) + gpointer data G_GNUC_UNUSED) { GtkWidget *menu, *menuitem; @@ -245,7 +245,7 @@ view_popup_menu(GtkWidget * treeview, GdkEventButton * event, menuitem = gtk_menu_item_new_with_label("Normal Priority"); g_signal_connect(menuitem, "activate", G_CALLBACK(set_normal), - treeview); + treeview); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); menuitem = gtk_menu_item_new_with_label("Low Priority"); @@ -253,56 +253,56 @@ view_popup_menu(GtkWidget * treeview, GdkEventButton * event, gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), - gtk_separator_menu_item_new()); + gtk_separator_menu_item_new()); menuitem = gtk_image_menu_item_new_with_label(GTK_STOCK_FILE); gtk_image_menu_item_set_use_stock(GTK_IMAGE_MENU_ITEM(menuitem), TRUE); gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM - (menuitem), TRUE); + (menuitem), TRUE); gtk_menu_item_set_label(GTK_MENU_ITEM(menuitem), "Download"); g_signal_connect(menuitem, "activate", G_CALLBACK(set_wanted), - treeview); + treeview); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); menuitem = gtk_image_menu_item_new_with_label(GTK_STOCK_STOP); gtk_image_menu_item_set_use_stock(GTK_IMAGE_MENU_ITEM(menuitem), TRUE); gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM - (menuitem), TRUE); + (menuitem), TRUE); gtk_menu_item_set_label(GTK_MENU_ITEM(menuitem), "Skip"); g_signal_connect(menuitem, "activate", G_CALLBACK(set_unwanted), - treeview); + treeview); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); 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) { 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); - - view_popup_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); + + view_popup_menu(treeview, event, userdata); + return TRUE; + } } return FALSE; @@ -315,32 +315,32 @@ static gboolean view_onPopupMenu(GtkWidget * treeview, gpointer userdata) } static void trg_files_tree_view_add_priority_column(TrgTreeView * tv, - char *title, int index, - int width) + char *title, int index, + int width) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; renderer = trg_cell_renderer_priority_new(); column = gtk_tree_view_column_new_with_attributes(title, renderer, - "priority-value", - index, NULL); + "priority-value", + index, NULL); trg_tree_view_std_column_setup(column, index, width); gtk_tree_view_append_column(GTK_TREE_VIEW(tv), column); } static void trg_files_tree_view_add_wanted_column(TrgTreeView * tv, - char *title, int index, - int width) + char *title, int index, + int width) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; renderer = trg_cell_renderer_wanted_new(); column = gtk_tree_view_column_new_with_attributes(title, renderer, - "wanted-value", - index, NULL); + "wanted-value", + index, NULL); trg_tree_view_std_column_setup(column, index, width); gtk_tree_view_append_column(GTK_TREE_VIEW(tv), column); @@ -349,26 +349,26 @@ static void trg_files_tree_view_add_wanted_column(TrgTreeView * tv, static void trg_files_tree_view_init(TrgFilesTreeView * self) { trg_tree_view_add_pixbuf_text_column(TRG_TREE_VIEW(self), - FILESCOL_ICON, FILESCOL_NAME, - "Name", -1); + FILESCOL_ICON, FILESCOL_NAME, + "Name", -1); trg_tree_view_add_column(TRG_TREE_VIEW(self), "Size", FILESCOL_SIZE); trg_tree_view_add_prog_column(TRG_TREE_VIEW(self), "Progress", - FILESCOL_PROGRESS, -1); + FILESCOL_PROGRESS, -1); trg_files_tree_view_add_wanted_column(TRG_TREE_VIEW(self), - "Wanted", FILESCOL_WANTED, -1); + "Wanted", FILESCOL_WANTED, -1); trg_files_tree_view_add_priority_column(TRG_TREE_VIEW(self), - "Priority", - FILESCOL_PRIORITY, -1); + "Priority", + FILESCOL_PRIORITY, -1); g_signal_connect(self, "button-press-event", - G_CALLBACK(view_onButtonPressed), NULL); + G_CALLBACK(view_onButtonPressed), NULL); g_signal_connect(self, "popup-menu", G_CALLBACK(view_onPopupMenu), - NULL); + NULL); } TrgFilesTreeView *trg_files_tree_view_new(TrgFilesModel * model, - TrgMainWindow * win, - trg_client * client) + TrgMainWindow * win, + trg_client * client) { GObject *obj = g_object_new(TRG_TYPE_FILES_TREE_VIEW, NULL); TrgFilesTreeViewPrivate *priv = TRG_FILES_TREE_VIEW_GET_PRIVATE(obj); diff --git a/src/trg-files-tree-view.h b/src/trg-files-tree-view.h index c957f8a..ac006f9 100644 --- a/src/trg-files-tree-view.h +++ b/src/trg-files-tree-view.h @@ -49,8 +49,8 @@ typedef struct { GType trg_files_tree_view_get_type(void); TrgFilesTreeView *trg_files_tree_view_new(TrgFilesModel * model, - TrgMainWindow * win, - trg_client * client); + TrgMainWindow * win, + trg_client * client); G_END_DECLS -#endif /* TRG_FILES_TREE_VIEW_H_ */ +#endif /* TRG_FILES_TREE_VIEW_H_ */ diff --git a/src/trg-general-panel.c b/src/trg-general-panel.c index b52347f..b98a78b 100644 --- a/src/trg-general-panel.c +++ b/src/trg-general-panel.c @@ -27,7 +27,7 @@ static void gtk_label_clear(GtkLabel * l); static GtkLabel *trg_general_panel_add_label(TrgGeneralPanel * fixed, - char *key, int col, int row); + char *key, int col, int row); G_DEFINE_TYPE(TrgGeneralPanel, trg_general_panel, GTK_TYPE_FIXED) #define TRG_GENERAL_PANEL_GET_PRIVATE(o) \ @@ -79,7 +79,7 @@ static void trg_general_panel_class_init(TrgGeneralPanelClass * klass) } void trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t, - GtkTreeIter * iter) + GtkTreeIter * iter) { TrgGeneralPanelPrivate *priv; gchar buf[32]; @@ -108,8 +108,8 @@ void trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t, gtk_label_set_text(GTK_LABEL(priv->gen_downloaded_label), buf); trg_strlratio(buf, - (double) torrent_get_uploaded(t) / - (double) torrent_get_downloaded(t)); + (double) torrent_get_uploaded(t) / + (double) torrent_get_downloaded(t)); gtk_label_set_text(GTK_LABEL(priv->gen_ratio_label), buf); statusString = torrent_get_status_string(torrent_get_status(t)); @@ -120,20 +120,20 @@ void trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t, gtk_label_set_text(GTK_LABEL(priv->gen_completed_label), buf); gtk_label_set_text(GTK_LABEL(priv->gen_name_label), - torrent_get_name(t)); + torrent_get_name(t)); if ((eta = torrent_get_eta(t)) > 0) { - tr_strltime_long(buf, eta, sizeOfBuf); - gtk_label_set_text(GTK_LABEL(priv->gen_eta_label), buf); + tr_strltime_long(buf, eta, sizeOfBuf); + gtk_label_set_text(GTK_LABEL(priv->gen_eta_label), buf); } else { - gtk_label_set_text(GTK_LABEL(priv->gen_eta_label), "N/A"); + gtk_label_set_text(GTK_LABEL(priv->gen_eta_label), "N/A"); } seeders = 0; leechers = 0; gtk_tree_model_get(GTK_TREE_MODEL(priv->model), iter, - TORRENT_COLUMN_SEEDS, &seeders, - TORRENT_COLUMN_LEECHERS, &leechers, -1); + TORRENT_COLUMN_SEEDS, &seeders, + TORRENT_COLUMN_LEECHERS, &leechers, -1); snprintf(buf, sizeof(buf), "%d", seeders); gtk_label_set_text(GTK_LABEL(priv->gen_seeders_label), buf); @@ -142,7 +142,7 @@ void trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t, } static GtkLabel *trg_general_panel_add_label(TrgGeneralPanel * fixed, - char *key, int col, int row) + char *key, int col, int row) { GtkWidget *keyLabel; GtkWidget *value; @@ -153,12 +153,12 @@ static GtkLabel *trg_general_panel_add_label(TrgGeneralPanel * fixed, gtk_label_set_markup(GTK_LABEL(keyLabel), keyMarkup); g_free(keyMarkup); gtk_fixed_put(GTK_FIXED(fixed), keyLabel, 10 + (col * 280), - 10 + (row * 22)); + 10 + (row * 22)); value = gtk_label_new(NULL); gtk_label_set_selectable(GTK_LABEL(value), TRUE); gtk_fixed_put(GTK_FIXED(fixed), value, 140 + (col * 300), - 10 + (row * 22)); + 10 + (row * 22)); g_object_set_data(G_OBJECT(value), "key-label", keyLabel); return GTK_LABEL(value); @@ -169,32 +169,32 @@ static void trg_general_panel_init(TrgGeneralPanel * self) TrgGeneralPanelPrivate *priv = TRG_GENERAL_PANEL_GET_PRIVATE(self); priv->gen_name_label = - trg_general_panel_add_label(self, "Name:", 0, 0); + trg_general_panel_add_label(self, "Name:", 0, 0); priv->gen_size_label = - trg_general_panel_add_label(self, "Size:", 0, 1); + trg_general_panel_add_label(self, "Size:", 0, 1); priv->gen_eta_label = trg_general_panel_add_label(self, "ETA:", 1, 1); priv->gen_completed_label = - trg_general_panel_add_label(self, "Completed:", 2, 1); + trg_general_panel_add_label(self, "Completed:", 2, 1); priv->gen_seeders_label = - trg_general_panel_add_label(self, "Seeders:", 0, 2); + trg_general_panel_add_label(self, "Seeders:", 0, 2); priv->gen_down_rate_label = - trg_general_panel_add_label(self, "Rate Down:", 1, 2); + trg_general_panel_add_label(self, "Rate Down:", 1, 2); priv->gen_downloaded_label = - trg_general_panel_add_label(self, "Downloaded:", 2, 2); + trg_general_panel_add_label(self, "Downloaded:", 2, 2); priv->gen_leechers_label = - trg_general_panel_add_label(self, "Leechers:", 0, 3); + trg_general_panel_add_label(self, "Leechers:", 0, 3); priv->gen_up_rate_label = - trg_general_panel_add_label(self, "Rate Up:", 1, 3); + trg_general_panel_add_label(self, "Rate Up:", 1, 3); priv->gen_uploaded_label = - trg_general_panel_add_label(self, "Uploaded:", 2, 3); + trg_general_panel_add_label(self, "Uploaded:", 2, 3); priv->gen_status_label = - trg_general_panel_add_label(self, "Status:", 0, 4); + trg_general_panel_add_label(self, "Status:", 0, 4); priv->gen_ratio_label = - trg_general_panel_add_label(self, "Ratio:", 1, 4); + trg_general_panel_add_label(self, "Ratio:", 1, 4); gtk_widget_set_sensitive(GTK_WIDGET(self), FALSE); } diff --git a/src/trg-general-panel.h b/src/trg-general-panel.h index d0adacc..ef20ffd 100644 --- a/src/trg-general-panel.h +++ b/src/trg-general-panel.h @@ -53,7 +53,7 @@ TrgGeneralPanel *trg_general_panel_new(GtkTreeModel * model); G_END_DECLS void trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t, - GtkTreeIter * iter); + GtkTreeIter * iter); void trg_general_panel_clear(TrgGeneralPanel * panel); -#endif /* TRG_GENERAL_PANEL_H_ */ +#endif /* TRG_GENERAL_PANEL_H_ */ diff --git a/src/trg-json-widgets.c b/src/trg-json-widgets.c index bcff5e9..5573602 100644 --- a/src/trg-json-widgets.c +++ b/src/trg-json-widgets.c @@ -25,7 +25,7 @@ void toggle_active_arg_is_sensitive(GtkToggleButton * b, gpointer data) { gtk_widget_set_sensitive(GTK_WIDGET(data), - gtk_toggle_button_get_active(b)); + gtk_toggle_button_get_active(b)); } void gtk_spin_button_json_int_out(GtkSpinButton * spin, JsonObject * out) @@ -42,11 +42,11 @@ void gtk_combo_box_json_string_output(GtkComboBox * c, JsonObject * out) } void gtk_spin_button_json_double_out(GtkSpinButton * spin, - JsonObject * out) + JsonObject * out) { gchar *key = g_object_get_data(G_OBJECT(spin), JSON_OBJECT_KEY); json_object_set_double_member(out, key, - gtk_spin_button_get_value(spin)); + gtk_spin_button_get_value(spin)); } void gtk_entry_json_output(GtkEntry * e, JsonObject * out) @@ -58,11 +58,11 @@ void gtk_entry_json_output(GtkEntry * e, JsonObject * out) void widget_set_json_key(GtkWidget * w, gchar * key) { g_object_set_data_full(G_OBJECT(w), JSON_OBJECT_KEY, - g_strdup(key), g_free); + g_strdup(key), g_free); } gboolean gtk_toggle_button_json_out(GtkToggleButton * button, - JsonObject * out) + JsonObject * out) { gboolean active = gtk_toggle_button_get_active(button); gchar *key = g_object_get_data(G_OBJECT(button), JSON_OBJECT_KEY); diff --git a/src/trg-json-widgets.h b/src/trg-json-widgets.h index 025b629..792c9fb 100644 --- a/src/trg-json-widgets.h +++ b/src/trg-json-widgets.h @@ -30,11 +30,11 @@ void widget_set_json_key(GtkWidget * w, gchar * key); void gtk_spin_button_json_int_out(GtkSpinButton * spin, JsonObject * out); void gtk_spin_button_json_double_out(GtkSpinButton * spin, - JsonObject * out); + JsonObject * out); gboolean gtk_toggle_button_json_out(GtkToggleButton * button, - JsonObject * out); + JsonObject * out); void gtk_entry_json_output(GtkEntry * e, JsonObject * out); void gtk_combo_box_json_string_output(GtkComboBox * c, JsonObject * out); void toggle_active_arg_is_sensitive(GtkToggleButton * b, gpointer data); -#endif /* TRG_JSON_WIDGETS_H_ */ +#endif /* TRG_JSON_WIDGETS_H_ */ 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); } } diff --git a/src/trg-main-window.h b/src/trg-main-window.h index e563088..b461075 100644 --- a/src/trg-main-window.h +++ b/src/trg-main-window.h @@ -57,11 +57,11 @@ GType trg_main_window_get_type(void); gboolean trg_add_from_filename(TrgMainWindow * win, gchar * fileName); void on_session_set(JsonObject * response, int status, gpointer data); void on_generic_interactive_action(JsonObject * response, int status, - gpointer data); + gpointer data); void auto_connect_if_required(TrgMainWindow * win, trg_client * tc); TrgMainWindow *trg_main_window_new(trg_client * tc); void trg_main_window_add_status_icon(TrgMainWindow * win); void trg_main_window_remove_status_icon(TrgMainWindow * win); G_END_DECLS -#endif /* MAIN_WINDOW_H_ */ +#endif /* MAIN_WINDOW_H_ */ diff --git a/src/trg-menu-bar.c b/src/trg-menu-bar.c index e55a2c3..1f59ea1 100644 --- a/src/trg-menu-bar.c +++ b/src/trg-menu-bar.c @@ -82,7 +82,7 @@ void trg_menu_bar_connected_change(TrgMenuBar * mb, gboolean connected) } void trg_menu_bar_torrent_actions_sensitive(TrgMenuBar * mb, - gboolean sensitive) + gboolean sensitive) { TrgMenuBarPrivate *priv = TRG_MENU_BAR_GET_PRIVATE(mb); @@ -97,96 +97,96 @@ void trg_menu_bar_torrent_actions_sensitive(TrgMenuBar * mb, static void trg_menu_bar_get_property(GObject * object, guint property_id, - GValue * value, GParamSpec * pspec) + GValue * value, GParamSpec * pspec) { TrgMenuBarPrivate *priv = TRG_MENU_BAR_GET_PRIVATE(object); switch (property_id) { case PROP_CONNECT_BUTTON: - g_value_set_object(value, priv->mb_connect); - break; + g_value_set_object(value, priv->mb_connect); + break; case PROP_DISCONNECT_BUTTON: - g_value_set_object(value, priv->mb_disconnect); - break; + g_value_set_object(value, priv->mb_disconnect); + break; case PROP_ADD_BUTTON: - g_value_set_object(value, priv->mb_add); - break; + g_value_set_object(value, priv->mb_add); + break; case PROP_ADD_URL_BUTTON: - g_value_set_object(value, priv->mb_add_url); - break; + g_value_set_object(value, priv->mb_add_url); + break; case PROP_REMOVE_BUTTON: - g_value_set_object(value, priv->mb_remove); - break; + g_value_set_object(value, priv->mb_remove); + break; case PROP_DELETE_BUTTON: - g_value_set_object(value, priv->mb_delete); - break; + g_value_set_object(value, priv->mb_delete); + break; case PROP_MOVE_BUTTON: - g_value_set_object(value, priv->mb_move); - break; + g_value_set_object(value, priv->mb_move); + break; case PROP_RESUME_BUTTON: - g_value_set_object(value, priv->mb_resume); - break; + g_value_set_object(value, priv->mb_resume); + break; case PROP_PAUSE_BUTTON: - g_value_set_object(value, priv->mb_pause); - break; + g_value_set_object(value, priv->mb_pause); + break; case PROP_VERIFY_BUTTON: - g_value_set_object(value, priv->mb_verify); - break; + g_value_set_object(value, priv->mb_verify); + break; case PROP_PROPS_BUTTON: - g_value_set_object(value, priv->mb_props); - break; + g_value_set_object(value, priv->mb_props); + break; case PROP_REMOTE_PREFS_BUTTON: - g_value_set_object(value, priv->mb_remote_prefs); - break; + g_value_set_object(value, priv->mb_remote_prefs); + break; case PROP_LOCAL_PREFS_BUTTON: - g_value_set_object(value, priv->mb_local_prefs); - break; + g_value_set_object(value, priv->mb_local_prefs); + break; case PROP_ABOUT_BUTTON: - g_value_set_object(value, priv->mb_about); - break; + g_value_set_object(value, priv->mb_about); + break; case PROP_VIEW_STATES_BUTTON: - g_value_set_object(value, priv->mb_view_states); - break; + g_value_set_object(value, priv->mb_view_states); + break; case PROP_VIEW_NOTEBOOK_BUTTON: - g_value_set_object(value, priv->mb_view_notebook); - break; + g_value_set_object(value, priv->mb_view_notebook); + break; case PROP_VIEW_STATS_BUTTON: - g_value_set_object(value, priv->mb_view_stats); - break; + g_value_set_object(value, priv->mb_view_stats); + break; case PROP_QUIT: - g_value_set_object(value, priv->mb_quit); - break; + g_value_set_object(value, priv->mb_quit); + 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_menu_bar_install_widget_prop(GObjectClass * class, guint propId, - const gchar * name, const gchar * nick) + const gchar * name, const gchar * nick) { g_object_class_install_property(class, - propId, - g_param_spec_object(name, - nick, - nick, - GTK_TYPE_WIDGET, - G_PARAM_READABLE - | - G_PARAM_STATIC_NAME - | - G_PARAM_STATIC_NICK - | - G_PARAM_STATIC_BLURB)); + propId, + g_param_spec_object(name, + nick, + nick, + GTK_TYPE_WIDGET, + G_PARAM_READABLE + | + G_PARAM_STATIC_NAME + | + G_PARAM_STATIC_NICK + | + G_PARAM_STATIC_BLURB)); } GtkWidget *trg_menu_bar_item_new(GtkMenuShell * shell, char *text, - char *stock_id, gboolean sensitive) + char *stock_id, gboolean sensitive) { 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); gtk_widget_set_sensitive(item, sensitive); @@ -202,20 +202,20 @@ static GtkWidget *trg_menu_bar_view_menu_new(TrgMenuBarPrivate * priv) gtk_menu_item_set_submenu(GTK_MENU_ITEM(view), viewMenu); priv->mb_view_states = - gtk_check_menu_item_new_with_label("State selector"); + gtk_check_menu_item_new_with_label("State selector"); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (priv->mb_view_states), TRUE); + (priv->mb_view_states), TRUE); priv->mb_view_notebook = - gtk_check_menu_item_new_with_label("Torrent details"); + gtk_check_menu_item_new_with_label("Torrent details"); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM - (priv->mb_view_notebook), TRUE); + (priv->mb_view_notebook), TRUE); priv->mb_view_stats = gtk_menu_item_new_with_label("Statistics"); gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_states); gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), - priv->mb_view_notebook); + priv->mb_view_notebook); gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_stats); return view; @@ -229,14 +229,14 @@ GtkWidget *trg_menu_bar_options_menu_new(TrgMenuBarPrivate * priv) gtk_menu_item_set_submenu(GTK_MENU_ITEM(opts), optsMenu); priv->mb_local_prefs = - trg_menu_bar_item_new(GTK_MENU_SHELL(optsMenu), - "Local Preferences", - GTK_STOCK_PREFERENCES, TRUE); + trg_menu_bar_item_new(GTK_MENU_SHELL(optsMenu), + "Local Preferences", + GTK_STOCK_PREFERENCES, TRUE); priv->mb_remote_prefs = - trg_menu_bar_item_new(GTK_MENU_SHELL(optsMenu), - "Remote Preferences", - GTK_STOCK_NETWORK, FALSE); + trg_menu_bar_item_new(GTK_MENU_SHELL(optsMenu), + "Remote Preferences", + GTK_STOCK_NETWORK, FALSE); return opts; } @@ -249,20 +249,20 @@ GtkWidget *trg_menu_bar_file_file_menu_new(TrgMenuBarPrivate * priv) gtk_menu_item_set_submenu(GTK_MENU_ITEM(file), fileMenu); priv->mb_connect = - trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), "Connect", - GTK_STOCK_CONNECT, TRUE); + trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), "Connect", + GTK_STOCK_CONNECT, TRUE); priv->mb_disconnect = - trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), "Disconnect", - GTK_STOCK_DISCONNECT, FALSE); + trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), "Disconnect", + GTK_STOCK_DISCONNECT, FALSE); priv->mb_add = - trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), "Add", - GTK_STOCK_ADD, FALSE); + trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), "Add", + GTK_STOCK_ADD, FALSE); priv->mb_add_url = - trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), "Add from URL", - GTK_STOCK_ADD, FALSE); + trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), "Add from URL", + GTK_STOCK_ADD, FALSE); priv->mb_quit = trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), "Quit", - GTK_STOCK_QUIT, TRUE); + GTK_STOCK_QUIT, TRUE); return file; } @@ -275,27 +275,27 @@ GtkWidget *trg_menu_bar_torrent_menu_new(TrgMenuBarPrivate * priv) gtk_menu_item_set_submenu(GTK_MENU_ITEM(torrent), torrentMenu); priv->mb_props = - trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), - "Properties", GTK_STOCK_PROPERTIES, FALSE); + trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), + "Properties", GTK_STOCK_PROPERTIES, FALSE); priv->mb_resume = - trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "Resume", - GTK_STOCK_MEDIA_PLAY, FALSE); + trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "Resume", + GTK_STOCK_MEDIA_PLAY, FALSE); priv->mb_pause = - trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "Pause", - GTK_STOCK_MEDIA_PAUSE, FALSE); + trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "Pause", + GTK_STOCK_MEDIA_PAUSE, FALSE); priv->mb_verify = - trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "Verify", - GTK_STOCK_REFRESH, FALSE); + trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "Verify", + GTK_STOCK_REFRESH, FALSE); priv->mb_move = - trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "Move", - GTK_STOCK_HARDDISK, FALSE); + trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "Move", + GTK_STOCK_HARDDISK, FALSE); priv->mb_remove = - trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "Remove", - GTK_STOCK_REMOVE, FALSE); + trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "Remove", + GTK_STOCK_REMOVE, FALSE); priv->mb_delete = - trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), - "Remove and Delete", GTK_STOCK_DELETE, - FALSE); + trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), + "Remove and Delete", GTK_STOCK_DELETE, + FALSE); return torrent; } @@ -311,8 +311,8 @@ GtkWidget *trg_menu_bar_help_menu_new(TrgMenuBar * menuBar) gtk_menu_shell_append(GTK_MENU_SHELL(menuBar), help); priv->mb_about = - trg_menu_bar_item_new(GTK_MENU_SHELL(helpMenu), "About", - GTK_STOCK_ABOUT, TRUE); + trg_menu_bar_item_new(GTK_MENU_SHELL(helpMenu), "About", + GTK_STOCK_ABOUT, TRUE); return helpMenu; } @@ -325,54 +325,54 @@ static void trg_menu_bar_class_init(TrgMenuBarClass * klass) g_type_class_add_private(klass, sizeof(TrgMenuBarPrivate)); trg_menu_bar_install_widget_prop(object_class, PROP_CONNECT_BUTTON, - "connect-button", "Connect Button"); + "connect-button", "Connect Button"); trg_menu_bar_install_widget_prop(object_class, - PROP_DISCONNECT_BUTTON, - "disconnect-button", - "Disconnect Button"); + PROP_DISCONNECT_BUTTON, + "disconnect-button", + "Disconnect Button"); trg_menu_bar_install_widget_prop(object_class, PROP_ADD_BUTTON, - "add-button", "Add Button"); + "add-button", "Add Button"); trg_menu_bar_install_widget_prop(object_class, PROP_ADD_URL_BUTTON, - "add-url-button", "Add URL Button"); + "add-url-button", "Add URL Button"); trg_menu_bar_install_widget_prop(object_class, PROP_REMOVE_BUTTON, - "remove-button", "Remove Button"); + "remove-button", "Remove Button"); trg_menu_bar_install_widget_prop(object_class, PROP_MOVE_BUTTON, - "move-button", "Move Button"); + "move-button", "Move Button"); trg_menu_bar_install_widget_prop(object_class, PROP_DELETE_BUTTON, - "delete-button", "Delete Button"); + "delete-button", "Delete Button"); trg_menu_bar_install_widget_prop(object_class, PROP_RESUME_BUTTON, - "resume-button", "Resume Button"); + "resume-button", "Resume Button"); trg_menu_bar_install_widget_prop(object_class, PROP_VERIFY_BUTTON, - "verify-button", "Verify Button"); + "verify-button", "Verify Button"); trg_menu_bar_install_widget_prop(object_class, PROP_PAUSE_BUTTON, - "pause-button", "Pause Button"); + "pause-button", "Pause Button"); trg_menu_bar_install_widget_prop(object_class, PROP_PROPS_BUTTON, - "props-button", "Props Button"); + "props-button", "Props Button"); trg_menu_bar_install_widget_prop(object_class, PROP_ABOUT_BUTTON, - "about-button", "About Button"); + "about-button", "About Button"); trg_menu_bar_install_widget_prop(object_class, - PROP_VIEW_STATS_BUTTON, - "view-stats-button", - "View stats button"); + PROP_VIEW_STATS_BUTTON, + "view-stats-button", + "View stats button"); trg_menu_bar_install_widget_prop(object_class, - PROP_VIEW_STATES_BUTTON, - "view-states-button", - "View states Button"); + PROP_VIEW_STATES_BUTTON, + "view-states-button", + "View states Button"); trg_menu_bar_install_widget_prop(object_class, - PROP_VIEW_NOTEBOOK_BUTTON, - "view-notebook-button", - "View notebook Button"); + PROP_VIEW_NOTEBOOK_BUTTON, + "view-notebook-button", + "View notebook Button"); trg_menu_bar_install_widget_prop(object_class, - PROP_REMOTE_PREFS_BUTTON, - "remote-prefs-button", - "Remote Prefs Button"); + PROP_REMOTE_PREFS_BUTTON, + "remote-prefs-button", + "Remote Prefs Button"); trg_menu_bar_install_widget_prop(object_class, - PROP_LOCAL_PREFS_BUTTON, - "local-prefs-button", - "Local Prefs Button"); + PROP_LOCAL_PREFS_BUTTON, + "local-prefs-button", + "Local Prefs Button"); trg_menu_bar_install_widget_prop(object_class, - PROP_QUIT, - "quit-button", "Quit Button"); + PROP_QUIT, + "quit-button", "Quit Button"); } static void trg_menu_bar_init(TrgMenuBar * self) @@ -380,13 +380,13 @@ static void trg_menu_bar_init(TrgMenuBar * self) TrgMenuBarPrivate *priv = TRG_MENU_BAR_GET_PRIVATE(self); gtk_menu_shell_append(GTK_MENU_SHELL(self), - trg_menu_bar_file_file_menu_new(priv)); + trg_menu_bar_file_file_menu_new(priv)); gtk_menu_shell_append(GTK_MENU_SHELL(self), - trg_menu_bar_torrent_menu_new(priv)); + trg_menu_bar_torrent_menu_new(priv)); gtk_menu_shell_append(GTK_MENU_SHELL(self), - trg_menu_bar_options_menu_new(priv)); + trg_menu_bar_options_menu_new(priv)); gtk_menu_shell_append(GTK_MENU_SHELL(self), - trg_menu_bar_view_menu_new(priv)); + trg_menu_bar_view_menu_new(priv)); trg_menu_bar_help_menu_new(TRG_MENU_BAR(self)); } diff --git a/src/trg-menu-bar.h b/src/trg-menu-bar.h index bb98475..cc148be 100644 --- a/src/trg-menu-bar.h +++ b/src/trg-menu-bar.h @@ -49,11 +49,11 @@ GType trg_menu_bar_get_type(void); TrgMenuBar *trg_menu_bar_new(TrgMainWindow * win); GtkWidget *trg_menu_bar_item_new(GtkMenuShell * shell, char *text, - char *stock_id, gboolean sensitive); + char *stock_id, gboolean sensitive); G_END_DECLS void trg_menu_bar_torrent_actions_sensitive(TrgMenuBar * mb, - gboolean sensitive); + gboolean sensitive); void trg_menu_bar_connected_change(TrgMenuBar * mb, gboolean connected); -#endif /* TRG_MENU_BAR_H_ */ +#endif /* TRG_MENU_BAR_H_ */ diff --git a/src/trg-model.c b/src/trg-model.c index 2d1ff67..e41c4b3 100644 --- a/src/trg-model.c +++ b/src/trg-model.c @@ -29,23 +29,23 @@ struct trg_model_remove_removed_foreachfunc_args { gboolean trg_model_remove_removed_foreachfunc(GtkTreeModel * model, - GtkTreePath * path G_GNUC_UNUSED, - GtkTreeIter * iter, gpointer data) + GtkTreePath * path G_GNUC_UNUSED, + GtkTreeIter * iter, gpointer data) { struct trg_model_remove_removed_foreachfunc_args *args = - (struct trg_model_remove_removed_foreachfunc_args *) data; + (struct trg_model_remove_removed_foreachfunc_args *) data; gint64 rowSerial; gtk_tree_model_get(model, iter, args->serial_column, &rowSerial, -1); if (rowSerial != args->currentSerial) - args->toRemove = - g_list_append(args->toRemove, gtk_tree_iter_copy(iter)); + args->toRemove = + g_list_append(args->toRemove, gtk_tree_iter_copy(iter)); return FALSE; } void trg_model_remove_removed(GtkListStore * model, gint serial_column, - gint64 currentSerial) + gint64 currentSerial) { struct trg_model_remove_removed_foreachfunc_args args; GList *li; @@ -54,14 +54,14 @@ trg_model_remove_removed(GtkListStore * model, gint serial_column, args.currentSerial = currentSerial; args.serial_column = serial_column; gtk_tree_model_foreach(GTK_TREE_MODEL(model), - trg_model_remove_removed_foreachfunc, &args); + trg_model_remove_removed_foreachfunc, &args); if (args.toRemove != NULL) { - for (li = g_list_last(args.toRemove); li != NULL; - li = g_list_previous(li)) { - gtk_list_store_remove(model, (GtkTreeIter *) li->data); - gtk_tree_iter_free((GtkTreeIter *) li->data); - } - g_list_free(args.toRemove); + for (li = g_list_last(args.toRemove); li != NULL; + li = g_list_previous(li)) { + gtk_list_store_remove(model, (GtkTreeIter *) li->data); + gtk_tree_iter_free((GtkTreeIter *) li->data); + } + g_list_free(args.toRemove); } } @@ -74,32 +74,32 @@ struct find_existing_item_foreach_args { static gboolean find_existing_item_foreachfunc(GtkTreeModel * model, - GtkTreePath * path G_GNUC_UNUSED, - GtkTreeIter * iter, gpointer data) + GtkTreePath * path G_GNUC_UNUSED, + GtkTreeIter * iter, gpointer data) { - struct find_existing_item_foreach_args *args = (struct find_existing_item_foreach_args *) data; + struct find_existing_item_foreach_args *args = + (struct find_existing_item_foreach_args *) data; gint64 currentId; gtk_tree_model_get(model, iter, args->search_column, ¤tId, -1); if (currentId == args->id) { - args->iter = iter; - return args->found = TRUE; + args->iter = iter; + return args->found = TRUE; } return FALSE; } gboolean -find_existing_model_item(GtkTreeModel * model, gint search_column, gint64 id, - GtkTreeIter * iter) +find_existing_model_item(GtkTreeModel * model, gint search_column, + gint64 id, GtkTreeIter * iter) { struct find_existing_item_foreach_args args; args.id = id; args.found = FALSE; args.search_column = search_column; - gtk_tree_model_foreach(model, - find_existing_item_foreachfunc, &args); + gtk_tree_model_foreach(model, find_existing_item_foreachfunc, &args); if (args.found == TRUE) - *iter = *(args.iter); + *iter = *(args.iter); return args.found; } diff --git a/src/trg-model.h b/src/trg-model.h index e954153..b20cbe4 100644 --- a/src/trg-model.h +++ b/src/trg-model.h @@ -23,10 +23,10 @@ #include <gtk/gtk.h> void trg_model_remove_removed(GtkListStore * model, gint serial_column, - gint64 currentSerial); + gint64 currentSerial); gboolean -find_existing_model_item(GtkTreeModel * model, gint search_column, gint64 id, - GtkTreeIter * iter); +find_existing_model_item(GtkTreeModel * model, gint search_column, + gint64 id, GtkTreeIter * iter); -#endif /* TRG_MODEL_H_ */ +#endif /* TRG_MODEL_H_ */ diff --git a/src/trg-peers-model.c b/src/trg-peers-model.c index 0fb3721..ee48d4d 100644 --- a/src/trg-peers-model.c +++ b/src/trg-peers-model.c @@ -57,8 +57,8 @@ trg_peers_model_class_init(TrgPeersModelClass * klass G_GNUC_UNUSED) gboolean find_existing_peer_item_foreachfunc(GtkTreeModel * model, - GtkTreePath * path G_GNUC_UNUSED, - GtkTreeIter * iter, gpointer data) + GtkTreePath * path G_GNUC_UNUSED, + GtkTreeIter * iter, gpointer data) { struct peerAndIter *pi; gchar *ip; @@ -67,8 +67,8 @@ find_existing_peer_item_foreachfunc(GtkTreeModel * model, gtk_tree_model_get(model, iter, PEERSCOL_IP, &ip, -1); if (g_strcmp0(ip, pi->ip) == 0) { - pi->iter = *iter; - pi->found = TRUE; + pi->iter = *iter; + pi->found = TRUE; } g_free(ip); return pi->found; @@ -76,23 +76,23 @@ find_existing_peer_item_foreachfunc(GtkTreeModel * model, gboolean find_existing_peer_item(TrgPeersModel * model, JsonObject * p, - GtkTreeIter * iter) + GtkTreeIter * iter) { struct peerAndIter pi; pi.ip = peer_get_address(p); pi.found = FALSE; gtk_tree_model_foreach(GTK_TREE_MODEL(model), - find_existing_peer_item_foreachfunc, &pi); + find_existing_peer_item_foreachfunc, &pi); if (pi.found == TRUE) - *iter = pi.iter; + *iter = pi.iter; return pi.found; } static void resolved_dns_cb(GObject * source_object, - GAsyncResult * res, gpointer data) + GAsyncResult * res, gpointer data) { GtkTreeRowReference *treeRef; GtkTreeModel *model; @@ -103,27 +103,27 @@ static void resolved_dns_cb(GObject * source_object, path = gtk_tree_row_reference_get_path(treeRef); if (path != NULL) { - gchar *rdns = - g_resolver_lookup_by_address_finish(G_RESOLVER(source_object), - res, NULL); - if (rdns != NULL) { - GtkTreeIter iter; - if (gtk_tree_model_get_iter(model, &iter, path) == TRUE) { - gdk_threads_enter(); - gtk_list_store_set(GTK_LIST_STORE(model), - &iter, PEERSCOL_HOST, rdns, -1); - gdk_threads_leave(); - } - g_free(rdns); - } - gtk_tree_path_free(path); + gchar *rdns = + g_resolver_lookup_by_address_finish(G_RESOLVER(source_object), + res, NULL); + if (rdns != NULL) { + GtkTreeIter iter; + if (gtk_tree_model_get_iter(model, &iter, path) == TRUE) { + gdk_threads_enter(); + gtk_list_store_set(GTK_LIST_STORE(model), + &iter, PEERSCOL_HOST, rdns, -1); + gdk_threads_leave(); + } + g_free(rdns); + } + gtk_tree_path_free(path); } gtk_tree_row_reference_free(treeRef); } void trg_peers_model_update(TrgPeersModel * model, gint64 updateSerial, - JsonObject * t, gboolean first) + JsonObject * t, gboolean first) { #ifdef HAVE_GEOIP TrgPeersModelPrivate *priv = TRG_PEERS_MODEL_GET_PRIVATE(model); @@ -137,76 +137,76 @@ void trg_peers_model_update(TrgPeersModel * model, gint64 updateSerial, peers = torrent_get_peers(t); if (first == TRUE) - gtk_list_store_clear(GTK_LIST_STORE(model)); + gtk_list_store_clear(GTK_LIST_STORE(model)); for (j = 0; j < json_array_get_length(peers); j++) { - JsonObject *peer; - const gchar *address = NULL, *flagStr; + JsonObject *peer; + const gchar *address = NULL, *flagStr; #ifdef HAVE_GEOIP - const gchar *country = NULL; + const gchar *country = NULL; #endif - peer = json_node_get_object(json_array_get_element(peers, j)); + peer = json_node_get_object(json_array_get_element(peers, j)); - if (first == TRUE - || find_existing_peer_item(model, peer, &peerIter) == FALSE) { - gtk_list_store_append(GTK_LIST_STORE(model), &peerIter); + if (first == TRUE + || find_existing_peer_item(model, peer, &peerIter) == FALSE) { + gtk_list_store_append(GTK_LIST_STORE(model), &peerIter); - address = peer_get_address(peer); + address = peer_get_address(peer); #ifdef HAVE_GEOIP - if (priv->geoip != NULL) - country = GeoIP_country_name_by_addr(priv->geoip, address); + if (priv->geoip != NULL) + country = GeoIP_country_name_by_addr(priv->geoip, address); #endif - gtk_list_store_set(GTK_LIST_STORE(model), &peerIter, - PEERSCOL_ICON, GTK_STOCK_NETWORK, - PEERSCOL_IP, address, + gtk_list_store_set(GTK_LIST_STORE(model), &peerIter, + PEERSCOL_ICON, GTK_STOCK_NETWORK, + PEERSCOL_IP, address, #ifdef HAVE_GEOIP - PEERSCOL_COUNTRY, - country != NULL ? country : "", + PEERSCOL_COUNTRY, + country != NULL ? country : "", #endif - PEERSCOL_CLIENT, peer_get_client_name(peer), - -1); - - isNew = TRUE; - } else { - isNew = FALSE; - } - - flagStr = peer_get_flagstr(peer); - gtk_list_store_set(GTK_LIST_STORE(model), &peerIter, - PEERSCOL_FLAGS, flagStr, - PEERSCOL_PROGRESS, - peer_get_progress(peer), - PEERSCOL_DOWNSPEED, - peer_get_rate_to_client(peer), - PEERSCOL_UPSPEED, - peer_get_rate_to_peer(peer), - PEERSCOL_UPDATESERIAL, updateSerial, -1); - - if (isNew == TRUE) { - GtkTreePath *path; - GtkTreeRowReference *treeRef; - GInetAddress *inetAddr; - GResolver *resolver; - - path = - gtk_tree_model_get_path(GTK_TREE_MODEL(model), &peerIter); - treeRef = - gtk_tree_row_reference_new(GTK_TREE_MODEL(model), path); - gtk_tree_path_free(path); - - inetAddr = g_inet_address_new_from_string(address); - resolver = g_resolver_get_default(); - g_resolver_lookup_by_address_async(resolver, - inetAddr, NULL, - resolved_dns_cb, treeRef); - g_object_unref(resolver); - g_object_unref(inetAddr); - } + PEERSCOL_CLIENT, peer_get_client_name(peer), + -1); + + isNew = TRUE; + } else { + isNew = FALSE; + } + + flagStr = peer_get_flagstr(peer); + gtk_list_store_set(GTK_LIST_STORE(model), &peerIter, + PEERSCOL_FLAGS, flagStr, + PEERSCOL_PROGRESS, + peer_get_progress(peer), + PEERSCOL_DOWNSPEED, + peer_get_rate_to_client(peer), + PEERSCOL_UPSPEED, + peer_get_rate_to_peer(peer), + PEERSCOL_UPDATESERIAL, updateSerial, -1); + + if (isNew == TRUE) { + GtkTreePath *path; + GtkTreeRowReference *treeRef; + GInetAddress *inetAddr; + GResolver *resolver; + + path = + gtk_tree_model_get_path(GTK_TREE_MODEL(model), &peerIter); + treeRef = + gtk_tree_row_reference_new(GTK_TREE_MODEL(model), path); + gtk_tree_path_free(path); + + inetAddr = g_inet_address_new_from_string(address); + resolver = g_resolver_get_default(); + g_resolver_lookup_by_address_async(resolver, + inetAddr, NULL, + resolved_dns_cb, treeRef); + g_object_unref(resolver); + g_object_unref(inetAddr); + } } if (first == FALSE) - trg_model_remove_removed(GTK_LIST_STORE(model), - PEERSCOL_UPDATESERIAL, updateSerial); + trg_model_remove_removed(GTK_LIST_STORE(model), + PEERSCOL_UPDATESERIAL, updateSerial); } static void trg_peers_model_init(TrgPeersModel * self) @@ -231,13 +231,13 @@ static void trg_peers_model_init(TrgPeersModel * self) column_types[PEERSCOL_UPDATESERIAL] = G_TYPE_INT64; gtk_list_store_set_column_types(GTK_LIST_STORE(self), - PEERSCOL_COLUMNS, column_types); + PEERSCOL_COLUMNS, column_types); #ifdef HAVE_GEOIP if (g_file_test(TRG_GEOIP_DATABASE, G_FILE_TEST_EXISTS) == TRUE) - priv->geoip = - GeoIP_open(TRG_GEOIP_DATABASE, - GEOIP_STANDARD | GEOIP_CHECK_CACHE); + priv->geoip = + GeoIP_open(TRG_GEOIP_DATABASE, + GEOIP_STANDARD | GEOIP_CHECK_CACHE); #endif } diff --git a/src/trg-peers-model.h b/src/trg-peers-model.h index c08598b..95dcce2 100644 --- a/src/trg-peers-model.h +++ b/src/trg-peers-model.h @@ -79,8 +79,8 @@ enum { }; void trg_peers_model_update(TrgPeersModel * model, gint64 updateSerial, - JsonObject * t, gboolean first); + JsonObject * t, gboolean first); -#endif /* TRG_PEERS_MODEL_H_ */ +#endif /* TRG_PEERS_MODEL_H_ */ #define TRG_GEOIP_DATABASE "/usr/share/GeoIP/GeoIP.dat" diff --git a/src/trg-peers-tree-view.c b/src/trg-peers-tree-view.c index 2bd624b..6d75331 100644 --- a/src/trg-peers-tree-view.c +++ b/src/trg-peers-tree-view.c @@ -42,24 +42,24 @@ trg_peers_tree_view_class_init(TrgPeersTreeViewClass * klass G_GNUC_UNUSED) static void trg_peers_tree_view_init(TrgPeersTreeView * self) { trg_tree_view_add_pixbuf_text_column(TRG_TREE_VIEW - (self), - PEERSCOL_ICON, - PEERSCOL_IP, "IP", 160); + (self), + PEERSCOL_ICON, + PEERSCOL_IP, "IP", 160); trg_tree_view_add_column_fixed_width(TRG_TREE_VIEW(self), "Host", - PEERSCOL_HOST, 250); + PEERSCOL_HOST, 250); #ifdef HAVE_GEOIP trg_tree_view_add_column(TRG_TREE_VIEW(self), "Country", - PEERSCOL_COUNTRY); + PEERSCOL_COUNTRY); #endif trg_tree_view_add_speed_column(TRG_TREE_VIEW(self), "Down Speed", - PEERSCOL_DOWNSPEED, -1); + PEERSCOL_DOWNSPEED, -1); trg_tree_view_add_speed_column(TRG_TREE_VIEW(self), "Up Speed", - PEERSCOL_UPSPEED, -1); + PEERSCOL_UPSPEED, -1); trg_tree_view_add_prog_column(TRG_TREE_VIEW(self), "Progress", - PEERSCOL_PROGRESS, -1); + PEERSCOL_PROGRESS, -1); trg_tree_view_add_column(TRG_TREE_VIEW(self), "Flags", PEERSCOL_FLAGS); trg_tree_view_add_column(TRG_TREE_VIEW(self), "Client", - PEERSCOL_CLIENT); + PEERSCOL_CLIENT); } TrgPeersTreeView *trg_peers_tree_view_new(TrgPeersModel * model) diff --git a/src/trg-peers-tree-view.h b/src/trg-peers-tree-view.h index a62e602..ce1a8a0 100644 --- a/src/trg-peers-tree-view.h +++ b/src/trg-peers-tree-view.h @@ -51,4 +51,4 @@ GType trg_peers_tree_view_get_type(void); TrgPeersTreeView *trg_peers_tree_view_new(TrgPeersModel * model); G_END_DECLS -#endif /* TRG_PEERS_TREE_VIEW_H_ */ +#endif /* TRG_PEERS_TREE_VIEW_H_ */ diff --git a/src/trg-preferences-dialog.c b/src/trg-preferences-dialog.c index 141fb8c..ef5ab10 100644 --- a/src/trg-preferences-dialog.c +++ b/src/trg-preferences-dialog.c @@ -36,7 +36,7 @@ (G_TYPE_INSTANCE_GET_PRIVATE ((object), TRG_TYPE_PREFERENCES_DIALOG, TrgPreferencesDialogPrivate)) G_DEFINE_TYPE(TrgPreferencesDialog, trg_preferences_dialog, - GTK_TYPE_DIALOG) + GTK_TYPE_DIALOG) enum { PROP_0, @@ -57,53 +57,53 @@ static GObject *instance = NULL; static void trg_preferences_dialog_set_property(GObject * object, - guint prop_id, - const GValue * value, - GParamSpec * pspec G_GNUC_UNUSED) + guint prop_id, + const GValue * value, + GParamSpec * pspec G_GNUC_UNUSED) { TrgPreferencesDialogPrivate *priv = - TRG_PREFERENCES_DIALOG_GET_PRIVATE(object); + TRG_PREFERENCES_DIALOG_GET_PRIVATE(object); switch (prop_id) { case PROP_GCONF_CLIENT: - priv->gconf = g_value_get_object(value); - break; + priv->gconf = g_value_get_object(value); + break; case PROP_MAIN_WINDOW: - priv->win = g_value_get_object(value); - break; + priv->win = g_value_get_object(value); + break; case PROP_TRG_CLIENT: - priv->client = g_value_get_pointer(value); - break; + priv->client = g_value_get_pointer(value); + break; } } static void trg_preferences_response_cb(GtkDialog * dlg, gint res_id, - gpointer data G_GNUC_UNUSED) + gpointer data G_GNUC_UNUSED) { - gtk_widget_destroy(GTK_WIDGET(dlg)); - instance = NULL; + gtk_widget_destroy(GTK_WIDGET(dlg)); + instance = NULL; } static void trg_preferences_dialog_get_property(GObject * object, - guint prop_id, - GValue * value, - GParamSpec * pspec G_GNUC_UNUSED) + guint prop_id, + GValue * value, + GParamSpec * pspec G_GNUC_UNUSED) { TrgPreferencesDialogPrivate *priv = - TRG_PREFERENCES_DIALOG_GET_PRIVATE(object); + TRG_PREFERENCES_DIALOG_GET_PRIVATE(object); switch (prop_id) { case PROP_GCONF_CLIENT: - g_value_set_object(value, priv->gconf); - break; + g_value_set_object(value, priv->gconf); + break; case PROP_MAIN_WINDOW: - g_value_set_object(value, priv->win); - break; + g_value_set_object(value, priv->win); + break; case PROP_TRG_CLIENT: - g_value_set_pointer(value, priv->client); - break; + g_value_set_pointer(value, priv->client); + break; } } @@ -119,23 +119,24 @@ static void toggled_cb(GtkToggleButton * w, gpointer gconf) } static GtkWidget *new_check_button(GConfClient * gconf, - const char *mnemonic, const char *key) + const char *mnemonic, const char *key) { GtkWidget *w = gtk_check_button_new_with_mnemonic(mnemonic); g_object_set_data_full(G_OBJECT(w), GCONF_OBJECT_KEY, - g_strdup(key), g_free); + g_strdup(key), g_free); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), - gconf_client_get_bool(gconf, key, NULL)); + gconf_client_get_bool(gconf, key, NULL)); g_signal_connect(w, "toggled", G_CALLBACK(toggled_cb), gconf); return w; } -static void interval_changed_cb(GtkWidget *w, gpointer data) +static void interval_changed_cb(GtkWidget * w, gpointer data) { - trg_client *client = (trg_client*)data; - client->interval = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(w)); + trg_client *client = (trg_client *) data; + client->interval = + gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(w)); } static void spun_cb_int(GtkWidget * widget, gpointer gconf) @@ -145,14 +146,14 @@ static void spun_cb_int(GtkWidget * widget, gpointer gconf) key = g_object_get_data(G_OBJECT(widget), GCONF_OBJECT_KEY); gconf_client_set_int(GCONF_CLIENT(gconf), - key, - gtk_spin_button_get_value_as_int - (GTK_SPIN_BUTTON(widget)), NULL); + key, + gtk_spin_button_get_value_as_int + (GTK_SPIN_BUTTON(widget)), NULL); } static GtkWidget *new_spin_button(GConfClient * gconf, - const char *key, - int low, int high, int step) + const char *key, + int low, int high, int step) { GtkWidget *w; gint currentValue; @@ -160,17 +161,17 @@ static GtkWidget *new_spin_button(GConfClient * gconf, w = gtk_spin_button_new_with_range(low, high, step); g_object_set_data_full(G_OBJECT(w), GCONF_OBJECT_KEY, - g_strdup(key), g_free); + g_strdup(key), g_free); gtk_spin_button_set_digits(GTK_SPIN_BUTTON(w), 0); currentValue = gconf_client_get_int(gconf, key, &error); if (error != NULL) { - g_error_free(error); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), 9091); + g_error_free(error); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), 9091); } else { - gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), currentValue); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), currentValue); } g_signal_connect(w, "value-changed", G_CALLBACK(spun_cb_int), gconf); @@ -197,12 +198,12 @@ static GtkWidget *new_entry(GConfClient * gconf, const char *key) value = gconf_client_get_string(gconf, key, NULL); if (value != NULL) { - gtk_entry_set_text(GTK_ENTRY(w), value); - g_free((gpointer) value); + gtk_entry_set_text(GTK_ENTRY(w), value); + g_free((gpointer) value); } g_object_set_data_full(G_OBJECT(w), GCONF_OBJECT_KEY, - g_strdup(key), g_free); + g_strdup(key), g_free); g_signal_connect(w, "changed", G_CALLBACK(entry_changed_cb), gconf); return w; @@ -211,13 +212,13 @@ static GtkWidget *new_entry(GConfClient * gconf, const char *key) static void toggle_tray_icon(GtkToggleButton * w, gpointer win) { if (gtk_toggle_button_get_active(w)) - trg_main_window_add_status_icon(TRG_MAIN_WINDOW(win)); + trg_main_window_add_status_icon(TRG_MAIN_WINDOW(win)); else - trg_main_window_remove_status_icon(TRG_MAIN_WINDOW(win)); + trg_main_window_remove_status_icon(TRG_MAIN_WINDOW(win)); } static GtkWidget *trg_prefs_desktopPage(GConfClient * gconf, - TrgMainWindow * win) + TrgMainWindow * win) { GtkWidget *tray, *w, *t; gint row = 0; @@ -227,42 +228,43 @@ static GtkWidget *trg_prefs_desktopPage(GConfClient * gconf, hig_workarea_add_section_title(t, &row, "System Tray"); tray = new_check_button(gconf, "Show in system tray", - TRG_GCONF_KEY_SYSTEM_TRAY); + TRG_GCONF_KEY_SYSTEM_TRAY); g_signal_connect(G_OBJECT(tray), "toggled", - G_CALLBACK(toggle_tray_icon), win); + G_CALLBACK(toggle_tray_icon), win); hig_workarea_add_wide_control(t, &row, tray); w = new_check_button(gconf, "Minimise to system tray", - TRG_GCONF_KEY_SYSTEM_TRAY_MINIMISE); + TRG_GCONF_KEY_SYSTEM_TRAY_MINIMISE); gtk_widget_set_sensitive(w, - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON - (tray))); + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON + (tray))); g_signal_connect(G_OBJECT(tray), "toggled", - G_CALLBACK(toggle_active_arg_is_sensitive), w); + G_CALLBACK(toggle_active_arg_is_sensitive), w); hig_workarea_add_wide_control(t, &row, w); w = new_check_button(gconf, "Torrent added notifications", - TRG_GCONF_KEY_ADD_NOTIFY); + TRG_GCONF_KEY_ADD_NOTIFY); gtk_widget_set_sensitive(w, - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON - (tray))); + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON + (tray))); g_signal_connect(G_OBJECT(tray), "toggled", - G_CALLBACK(toggle_active_arg_is_sensitive), w); + G_CALLBACK(toggle_active_arg_is_sensitive), w); hig_workarea_add_wide_control(t, &row, w); w = new_check_button(gconf, "Torrent complete notifications", - TRG_GCONF_KEY_COMPLETE_NOTIFY); + TRG_GCONF_KEY_COMPLETE_NOTIFY); gtk_widget_set_sensitive(w, - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON - (tray))); + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON + (tray))); g_signal_connect(G_OBJECT(tray), "toggled", - G_CALLBACK(toggle_active_arg_is_sensitive), w); + G_CALLBACK(toggle_active_arg_is_sensitive), w); hig_workarea_add_wide_control(t, &row, w); return t; } -static GtkWidget *trg_prefs_serverPage(GConfClient * gconf, trg_client *client) +static GtkWidget *trg_prefs_serverPage(GConfClient * gconf, + trg_client * client) { GtkWidget *w, *t; gint row = 0; @@ -278,14 +280,15 @@ static GtkWidget *trg_prefs_serverPage(GConfClient * gconf, trg_client *client) hig_workarea_add_row(t, &row, "Port:", w, NULL); w = new_check_button(gconf, "Automatically connect", - TRG_GCONF_KEY_AUTO_CONNECT); + TRG_GCONF_KEY_AUTO_CONNECT); hig_workarea_add_wide_control(t, &row, w); w = new_check_button(gconf, "SSL", TRG_GCONF_KEY_SSL); hig_workarea_add_wide_control(t, &row, w); w = new_spin_button(gconf, TRG_GCONF_KEY_UPDATE_INTERVAL, 1, 60, 1); - g_signal_connect(w, "value-changed", G_CALLBACK(interval_changed_cb), client); + g_signal_connect(w, "value-changed", G_CALLBACK(interval_changed_cb), + client); hig_workarea_add_row(t, &row, "Update interval:", w, NULL); hig_workarea_add_section_divider(t, &row); @@ -302,48 +305,49 @@ static GtkWidget *trg_prefs_serverPage(GConfClient * gconf, trg_client *client) } static GObject *trg_preferences_dialog_constructor(GType type, - guint - n_construct_properties, - GObjectConstructParam * - construct_params) + guint + n_construct_properties, + GObjectConstructParam * + construct_params) { GObject *object; TrgPreferencesDialogPrivate *priv; GtkWidget *notebook; object = - G_OBJECT_CLASS - (trg_preferences_dialog_parent_class)->constructor(type, - n_construct_properties, - construct_params); + G_OBJECT_CLASS + (trg_preferences_dialog_parent_class)->constructor(type, + n_construct_properties, + construct_params); priv = TRG_PREFERENCES_DIALOG_GET_PRIVATE(object); gtk_window_set_transient_for(GTK_WINDOW(object), - GTK_WINDOW(priv->win)); + GTK_WINDOW(priv->win)); gtk_window_set_destroy_with_parent(GTK_WINDOW(object), TRUE); gtk_dialog_add_button(GTK_DIALOG(object), GTK_STOCK_CLOSE, - GTK_RESPONSE_CLOSE); + GTK_RESPONSE_CLOSE); gtk_window_set_title(GTK_WINDOW(object), "Local Preferences"); gtk_container_set_border_width(GTK_CONTAINER(object), GUI_PAD); g_signal_connect(G_OBJECT(object), - "response", - G_CALLBACK(trg_preferences_response_cb), NULL); + "response", + G_CALLBACK(trg_preferences_response_cb), NULL); notebook = gtk_notebook_new(); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), - trg_prefs_serverPage(priv->gconf, priv->client), - gtk_label_new("Connection")); + trg_prefs_serverPage(priv->gconf, + priv->client), + gtk_label_new("Connection")); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), - trg_prefs_desktopPage(priv->gconf, priv->win), - gtk_label_new("Desktop")); + trg_prefs_desktopPage(priv->gconf, priv->win), + gtk_label_new("Desktop")); gtk_container_set_border_width(GTK_CONTAINER(notebook), GUI_PAD); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(object)->vbox), notebook, - TRUE, TRUE, 0); + TRUE, TRUE, 0); gtk_widget_show_all(GTK_DIALOG(object)->vbox); @@ -360,45 +364,45 @@ trg_preferences_dialog_class_init(TrgPreferencesDialogClass * class) g_object_class->get_property = trg_preferences_dialog_get_property; g_object_class_install_property(g_object_class, - PROP_TRG_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_TRG_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)); g_object_class_install_property(g_object_class, - PROP_GCONF_CLIENT, - g_param_spec_object("gconf-client", - "GConf Client", - "GConf Client", - GCONF_TYPE_CLIENT, - G_PARAM_READWRITE - | - G_PARAM_CONSTRUCT_ONLY - | - G_PARAM_STATIC_NAME - | - G_PARAM_STATIC_NICK - | - G_PARAM_STATIC_BLURB)); + PROP_GCONF_CLIENT, + g_param_spec_object("gconf-client", + "GConf Client", + "GConf Client", + GCONF_TYPE_CLIENT, + G_PARAM_READWRITE + | + G_PARAM_CONSTRUCT_ONLY + | + G_PARAM_STATIC_NAME + | + G_PARAM_STATIC_NICK + | + G_PARAM_STATIC_BLURB)); g_object_class_install_property(g_object_class, - PROP_MAIN_WINDOW, - g_param_spec_object - ("main-window", "Main Window", - "Main Window", TRG_TYPE_MAIN_WINDOW, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + PROP_MAIN_WINDOW, + g_param_spec_object + ("main-window", "Main Window", + "Main Window", TRG_TYPE_MAIN_WINDOW, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_type_class_add_private(g_object_class, - sizeof(TrgPreferencesDialogPrivate)); + sizeof(TrgPreferencesDialogPrivate)); } static void trg_preferences_dialog_init(TrgPreferencesDialog * pref_dlg) @@ -406,13 +410,13 @@ static void trg_preferences_dialog_init(TrgPreferencesDialog * pref_dlg) } GtkWidget *trg_preferences_dialog_get_instance(TrgMainWindow * win, - GConfClient * client) + GConfClient * client) { if (instance == NULL) { - instance = g_object_new(TRG_TYPE_PREFERENCES_DIALOG, - "main-window", win, - "trg-client", client, - "gconf-client", client, NULL); + instance = g_object_new(TRG_TYPE_PREFERENCES_DIALOG, + "main-window", win, + "trg-client", client, + "gconf-client", client, NULL); } return GTK_WIDGET(instance); diff --git a/src/trg-preferences-dialog.h b/src/trg-preferences-dialog.h index 04c8c3c..5a493b4 100644 --- a/src/trg-preferences-dialog.h +++ b/src/trg-preferences-dialog.h @@ -50,6 +50,6 @@ struct _TrgPreferencesDialogClass { GType trg_preferences_dialog_get_type(void); GtkWidget *trg_preferences_dialog_get_instance(TrgMainWindow * win, - GConfClient * client); + GConfClient * client); G_END_DECLS -#endif /* TRG_PREFERENCES_WINDOW_H_ */ +#endif /* TRG_PREFERENCES_WINDOW_H_ */ diff --git a/src/trg-preferences.h b/src/trg-preferences.h index b43f85b..b27bdfb 100644 --- a/src/trg-preferences.h +++ b/src/trg-preferences.h @@ -34,4 +34,4 @@ #define TRG_GCONF_KEY_SYSTEM_TRAY "/apps/transmission-remote-gtk/system-tray" #define TRG_GCONF_KEY_SYSTEM_TRAY_MINIMISE "/apps/transmission-remote-gtk/system-tray-minimise" -#endif /* TRG_PREFERENCES_H_ */ +#endif /* TRG_PREFERENCES_H_ */ diff --git a/src/trg-remote-prefs-dialog.c b/src/trg-remote-prefs-dialog.c index 5d5d8a5..4157ecc 100644 --- a/src/trg-remote-prefs-dialog.c +++ b/src/trg-remote-prefs-dialog.c @@ -30,7 +30,7 @@ #include "session-get.h" G_DEFINE_TYPE(TrgRemotePrefsDialog, trg_remote_prefs_dialog, - GTK_TYPE_DIALOG) + GTK_TYPE_DIALOG) #define TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_REMOTE_PREFS_DIALOG, TrgRemotePrefsDialogPrivate)) enum { @@ -77,7 +77,7 @@ static GObject *instance = NULL; static void update_session(GtkDialog * dlg) { TrgRemotePrefsDialogPrivate *priv = - TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(dlg); + TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(dlg); JsonNode *request = session_set(); JsonObject *args = node_get_arguments(request); gchar *encryption; @@ -87,60 +87,60 @@ static void update_session(GtkDialog * dlg) gtk_entry_json_output(GTK_ENTRY(priv->download_dir_entry), args); gtk_entry_json_output(GTK_ENTRY(priv->incomplete_dir_entry), args); gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->done_script_enabled_check), args); + (priv->done_script_enabled_check), args); gtk_entry_json_output(GTK_ENTRY(priv->done_script_entry), args); gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->rename_partial_files_check), args); + (priv->rename_partial_files_check), args); gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->incomplete_dir_check), args); + (priv->incomplete_dir_check), args); gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->trash_original_torrent_files_check), - args); + (priv->trash_original_torrent_files_check), + args); gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->start_added_torrent_check), args); + (priv->start_added_torrent_check), args); if (priv->cache_size_mb_spin != NULL) - gtk_spin_button_json_int_out(GTK_SPIN_BUTTON - (priv->cache_size_mb_spin), args); + gtk_spin_button_json_int_out(GTK_SPIN_BUTTON + (priv->cache_size_mb_spin), args); /* Connection */ encryption = - g_ascii_strdown(gtk_combo_box_get_active_text - (GTK_COMBO_BOX(priv->encryption_combo)), -1); + g_ascii_strdown(gtk_combo_box_get_active_text + (GTK_COMBO_BOX(priv->encryption_combo)), -1); json_object_set_string_member(args, SGET_ENCRYPTION, encryption); gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->peer_port_random_check), args); + (priv->peer_port_random_check), args); gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->peer_port_forwarding_check), args); + (priv->peer_port_forwarding_check), args); gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->pex_enabled_check), args); + (priv->pex_enabled_check), args); gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->lpd_enabled_check), args); + (priv->lpd_enabled_check), args); gtk_spin_button_json_int_out(GTK_SPIN_BUTTON(priv->peer_port_spin), - args); + args); /* Limits */ gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->seed_ratio_limit_check), args); + (priv->seed_ratio_limit_check), args); gtk_spin_button_json_double_out(GTK_SPIN_BUTTON - (priv->seed_ratio_limit_spin), args); + (priv->seed_ratio_limit_spin), args); gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->speed_limit_down_check), args); + (priv->speed_limit_down_check), args); gtk_spin_button_json_int_out(GTK_SPIN_BUTTON - (priv->speed_limit_down_spin), args); + (priv->speed_limit_down_spin), args); gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->speed_limit_up_check), args); + (priv->speed_limit_up_check), args); gtk_spin_button_json_int_out(GTK_SPIN_BUTTON - (priv->speed_limit_up_spin), args); + (priv->speed_limit_up_spin), args); gtk_spin_button_json_int_out(GTK_SPIN_BUTTON - (priv->peer_limit_global_spin), args); + (priv->peer_limit_global_spin), args); gtk_spin_button_json_int_out(GTK_SPIN_BUTTON - (priv->peer_limit_per_torrent_spin), - args); + (priv->peer_limit_per_torrent_spin), + args); g_free(encryption); @@ -149,10 +149,10 @@ static void update_session(GtkDialog * dlg) static void trg_remote_prefs_response_cb(GtkDialog * dlg, gint res_id, - gpointer data G_GNUC_UNUSED) + gpointer data G_GNUC_UNUSED) { if (res_id == GTK_RESPONSE_ACCEPT) { - update_session(dlg); + update_session(dlg); } gtk_widget_destroy(GTK_WIDGET(dlg)); instance = NULL; @@ -160,46 +160,46 @@ trg_remote_prefs_response_cb(GtkDialog * dlg, gint res_id, static void trg_remote_prefs_dialog_get_property(GObject * object, guint property_id, - GValue * value, GParamSpec * pspec) + GValue * value, GParamSpec * pspec) { TrgRemotePrefsDialogPrivate *priv = - TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(object); + TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(object); switch (property_id) { case PROP_PARENT: - g_value_set_object(value, priv->parent); - break; + g_value_set_object(value, priv->parent); + break; 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_remote_prefs_dialog_set_property(GObject * object, guint property_id, - const GValue * value, - GParamSpec * pspec) + const GValue * value, + GParamSpec * pspec) { TrgRemotePrefsDialogPrivate *priv = - TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(object); + TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(object); switch (property_id) { case PROP_PARENT: - priv->parent = g_value_get_object(value); - break; + priv->parent = g_value_get_object(value); + break; 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); } } static GtkWidget *trg_rprefs_limitsPage(TrgRemotePrefsDialog * win, - JsonObject * json) + JsonObject * json) { TrgRemotePrefsDialogPrivate *priv = - TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(win); + TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(win); GtkWidget *w, *tb, *t; gint row = 0; @@ -208,86 +208,86 @@ static GtkWidget *trg_rprefs_limitsPage(TrgRemotePrefsDialog * win, hig_workarea_add_section_title(t, &row, "Bandwidth"); tb = priv->speed_limit_down_check = gtk_check_button_new_with_mnemonic - ("Limit download speed (KB/s)"); + ("Limit download speed (KB/s)"); widget_set_json_key(tb, SGET_SPEED_LIMIT_DOWN_ENABLED); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tb), - session_get_speed_limit_down_enabled - (json)); + session_get_speed_limit_down_enabled + (json)); w = priv->speed_limit_down_spin = - gtk_spin_button_new_with_range(0, INT_MAX, 5); + gtk_spin_button_new_with_range(0, INT_MAX, 5); widget_set_json_key(w, SGET_SPEED_LIMIT_DOWN); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), - session_get_speed_limit_down(json)); + session_get_speed_limit_down(json)); g_signal_connect(G_OBJECT(tb), "toggled", - G_CALLBACK(toggle_active_arg_is_sensitive), w); + G_CALLBACK(toggle_active_arg_is_sensitive), w); gtk_widget_set_sensitive(w, - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON - (tb))); + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON + (tb))); hig_workarea_add_row_w(t, &row, tb, w, NULL); tb = priv->speed_limit_up_check = gtk_check_button_new_with_mnemonic - ("Limit upload speed (KB/s)"); + ("Limit upload speed (KB/s)"); widget_set_json_key(tb, SGET_SPEED_LIMIT_UP_ENABLED); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tb), - session_get_speed_limit_up_enabled(json)); + session_get_speed_limit_up_enabled(json)); w = priv->speed_limit_up_spin = - gtk_spin_button_new_with_range(0, INT_MAX, 5); + gtk_spin_button_new_with_range(0, INT_MAX, 5); widget_set_json_key(w, SGET_SPEED_LIMIT_UP); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), - session_get_speed_limit_up(json)); + session_get_speed_limit_up(json)); g_signal_connect(G_OBJECT(tb), "toggled", - G_CALLBACK(toggle_active_arg_is_sensitive), w); + G_CALLBACK(toggle_active_arg_is_sensitive), w); gtk_widget_set_sensitive(w, - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON - (tb))); + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON + (tb))); hig_workarea_add_row_w(t, &row, tb, w, NULL); hig_workarea_add_section_title(t, &row, "Seeding"); tb = priv->seed_ratio_limit_check = gtk_check_button_new_with_mnemonic - ("Seed ratio limit"); + ("Seed ratio limit"); widget_set_json_key(tb, SGET_SEED_RATIO_LIMITED); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tb), - session_get_seed_ratio_limited(json)); + session_get_seed_ratio_limited(json)); w = priv->seed_ratio_limit_spin = - gtk_spin_button_new_with_range(0, INT_MAX, 0.1); + gtk_spin_button_new_with_range(0, INT_MAX, 0.1); widget_set_json_key(w, SGET_SEED_RATIO_LIMIT); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), - session_get_seed_ratio_limit(json)); + session_get_seed_ratio_limit(json)); gtk_widget_set_sensitive(w, - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON - (tb))); + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON + (tb))); g_signal_connect(G_OBJECT(tb), "toggled", - G_CALLBACK(toggle_active_arg_is_sensitive), w); + G_CALLBACK(toggle_active_arg_is_sensitive), w); hig_workarea_add_row_w(t, &row, tb, w, NULL); hig_workarea_add_section_title(t, &row, "Peers"); w = priv->peer_limit_global_spin = - gtk_spin_button_new_with_range(0, INT_MAX, 5); + gtk_spin_button_new_with_range(0, INT_MAX, 5); widget_set_json_key(GTK_WIDGET(w), SGET_PEER_LIMIT_GLOBAL); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), - session_get_peer_limit_global(json)); + session_get_peer_limit_global(json)); hig_workarea_add_row(t, &row, "Global peer limit", w, w); w = priv->peer_limit_per_torrent_spin = - gtk_spin_button_new_with_range(0, INT_MAX, 5); + gtk_spin_button_new_with_range(0, INT_MAX, 5); widget_set_json_key(GTK_WIDGET(w), SGET_PEER_LIMIT_PER_TORRENT); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), - session_get_peer_limit_per_torrent(json)); + session_get_peer_limit_per_torrent(json)); hig_workarea_add_row(t, &row, "Per torrent peer limit", w, w); return t; } static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win, - JsonObject * s) + JsonObject * s) { TrgRemotePrefsDialogPrivate *priv = - TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(win); + TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(win); GtkWidget *w, *t; const gchar *encryption; @@ -302,53 +302,53 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win, gtk_combo_box_append_text(GTK_COMBO_BOX(w), "Tolerated"); encryption = session_get_encryption(s); if (g_strcmp0(encryption, "required") == 0) { - gtk_combo_box_set_active(GTK_COMBO_BOX(w), 0); + gtk_combo_box_set_active(GTK_COMBO_BOX(w), 0); } else if (g_strcmp0(encryption, "tolerated") == 0) { - gtk_combo_box_set_active(GTK_COMBO_BOX(w), 2); + gtk_combo_box_set_active(GTK_COMBO_BOX(w), 2); } else { - gtk_combo_box_set_active(GTK_COMBO_BOX(w), 1); + gtk_combo_box_set_active(GTK_COMBO_BOX(w), 1); } hig_workarea_add_row(t, &row, "Encryption", w, NULL); w = priv->peer_port_spin = gtk_spin_button_new_with_range(0, 65535, 1); widget_set_json_key(w, SGET_PEER_PORT); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), - session_get_peer_port(s)); + session_get_peer_port(s)); hig_workarea_add_row(t, &row, "Peer port", w, w); w = priv->peer_port_random_check = - hig_workarea_add_wide_checkbutton(t, &row, - "Random peer port on start", - session_get_peer_port_random(s)); + hig_workarea_add_wide_checkbutton(t, &row, + "Random peer port on start", + session_get_peer_port_random(s)); widget_set_json_key(w, SGET_PEER_PORT_RANDOM_ON_START); w = priv->peer_port_forwarding_check = - hig_workarea_add_wide_checkbutton(t, &row, - "Peer port forwarding", - session_get_port_forwarding_enabled - (s)); + hig_workarea_add_wide_checkbutton(t, &row, + "Peer port forwarding", + session_get_port_forwarding_enabled + (s)); widget_set_json_key(w, SGET_PORT_FORWARDING_ENABLED); w = priv->pex_enabled_check = - hig_workarea_add_wide_checkbutton(t, &row, - "Peer exchange (PEX)", - session_get_pex_enabled(s)); + hig_workarea_add_wide_checkbutton(t, &row, + "Peer exchange (PEX)", + session_get_pex_enabled(s)); widget_set_json_key(w, SGET_PEX_ENABLED); w = priv->lpd_enabled_check = - hig_workarea_add_wide_checkbutton(t, &row, - "Local peer discovery", - session_get_lpd_enabled(s)); + hig_workarea_add_wide_checkbutton(t, &row, + "Local peer discovery", + session_get_lpd_enabled(s)); widget_set_json_key(w, SGET_LPD_ENABLED); return t; } static GtkWidget *trg_rprefs_generalPage(TrgRemotePrefsDialog * win, - JsonObject * s) + JsonObject * s) { TrgRemotePrefsDialogPrivate *priv = - TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(win); + TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(win); GtkWidget *w, *tb, *t; gint row = 0; @@ -362,75 +362,75 @@ static GtkWidget *trg_rprefs_generalPage(TrgRemotePrefsDialog * win, hig_workarea_add_row(t, &row, "Download directory", w, NULL); tb = priv->incomplete_dir_check = - gtk_check_button_new_with_mnemonic("Incomplete download dir"); + gtk_check_button_new_with_mnemonic("Incomplete download dir"); widget_set_json_key(tb, SGET_INCOMPLETE_DIR_ENABLED); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tb), - session_get_incomplete_dir_enabled(s)); + session_get_incomplete_dir_enabled(s)); w = priv->incomplete_dir_entry = gtk_entry_new(); widget_set_json_key(w, SGET_INCOMPLETE_DIR); gtk_entry_set_text(GTK_ENTRY(w), session_get_incomplete_dir(s)); gtk_widget_set_sensitive(w, - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON - (tb))); + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON + (tb))); g_signal_connect(G_OBJECT(tb), "toggled", - G_CALLBACK(toggle_active_arg_is_sensitive), w); + G_CALLBACK(toggle_active_arg_is_sensitive), w); hig_workarea_add_row_w(t, &row, tb, w, NULL); tb = priv->done_script_enabled_check = - gtk_check_button_new_with_mnemonic("Torrent done script"); + gtk_check_button_new_with_mnemonic("Torrent done script"); widget_set_json_key(tb, SGET_SCRIPT_TORRENT_DONE_ENABLED); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tb), - session_get_torrent_done_enabled(s)); + session_get_torrent_done_enabled(s)); w = priv->done_script_entry = gtk_entry_new(); widget_set_json_key(w, SGET_SCRIPT_TORRENT_DONE_FILENAME); gtk_entry_set_text(GTK_ENTRY(w), session_get_torrent_done_filename(s)); gtk_widget_set_sensitive(w, - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON - (tb))); + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON + (tb))); g_signal_connect(G_OBJECT(tb), "toggled", - G_CALLBACK(toggle_active_arg_is_sensitive), w); + G_CALLBACK(toggle_active_arg_is_sensitive), w); hig_workarea_add_row_w(t, &row, tb, w, NULL); cache_size_mb = session_get_cache_size_mb(s); if (cache_size_mb >= 0) { - w = priv->cache_size_mb_spin = - gtk_spin_button_new_with_range(0, INT_MAX, 1); - widget_set_json_key(w, SGET_CACHE_SIZE_MB); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), cache_size_mb); - hig_workarea_add_row(t, &row, "Cache size (MB)", w, w); + w = priv->cache_size_mb_spin = + gtk_spin_button_new_with_range(0, INT_MAX, 1); + widget_set_json_key(w, SGET_CACHE_SIZE_MB); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), cache_size_mb); + hig_workarea_add_row(t, &row, "Cache size (MB)", w, w); } w = priv->rename_partial_files_check = - hig_workarea_add_wide_checkbutton(t, &row, - "Rename partial files", - session_get_rename_partial_files - (s)); + hig_workarea_add_wide_checkbutton(t, &row, + "Rename partial files", + session_get_rename_partial_files + (s)); widget_set_json_key(w, SGET_RENAME_PARTIAL_FILES); w = priv->trash_original_torrent_files_check = - hig_workarea_add_wide_checkbutton(t, &row, - "Trash original torrent files", - session_get_trash_original_torrent_files - (s)); + hig_workarea_add_wide_checkbutton(t, &row, + "Trash original torrent files", + session_get_trash_original_torrent_files + (s)); widget_set_json_key(w, SGET_TRASH_ORIGINAL_TORRENT_FILES); w = priv->start_added_torrent_check = - hig_workarea_add_wide_checkbutton(t, &row, - "Start added torrents", - session_get_start_added_torrents - (s)); + hig_workarea_add_wide_checkbutton(t, &row, + "Start added torrents", + session_get_start_added_torrents + (s)); widget_set_json_key(w, SGET_START_ADDED_TORRENTS); return t; } static GObject *trg_remote_prefs_dialog_constructor(GType type, - guint - n_construct_properties, - GObjectConstructParam - * construct_params) + guint + n_construct_properties, + GObjectConstructParam + * construct_params) { GObject *object; TrgRemotePrefsDialogPrivate *priv; @@ -438,56 +438,56 @@ static GObject *trg_remote_prefs_dialog_constructor(GType type, GtkWidget *notebook; object = G_OBJECT_CLASS - (trg_remote_prefs_dialog_parent_class)->constructor(type, - n_construct_properties, - construct_params); + (trg_remote_prefs_dialog_parent_class)->constructor(type, + n_construct_properties, + construct_params); priv = TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(object); session = priv->client->session; gtk_window_set_title(GTK_WINDOW(object), "Remote Preferences"); gtk_window_set_transient_for(GTK_WINDOW(object), - GTK_WINDOW(priv->parent)); + GTK_WINDOW(priv->parent)); gtk_window_set_destroy_with_parent(GTK_WINDOW(object), TRUE); gtk_dialog_add_button(GTK_DIALOG(object), GTK_STOCK_CLOSE, - GTK_RESPONSE_CLOSE); + GTK_RESPONSE_CLOSE); gtk_dialog_add_button(GTK_DIALOG(object), GTK_STOCK_APPLY, - GTK_RESPONSE_ACCEPT); + GTK_RESPONSE_ACCEPT); gtk_container_set_border_width(GTK_CONTAINER(object), GUI_PAD); gtk_dialog_set_default_response(GTK_DIALOG(object), - GTK_RESPONSE_CLOSE); + GTK_RESPONSE_CLOSE); gtk_dialog_set_alternative_button_order(GTK_DIALOG(object), - GTK_RESPONSE_ACCEPT, - GTK_RESPONSE_CLOSE, -1); + GTK_RESPONSE_ACCEPT, + GTK_RESPONSE_CLOSE, -1); g_signal_connect(G_OBJECT(object), - "response", - G_CALLBACK(trg_remote_prefs_response_cb), NULL); + "response", + G_CALLBACK(trg_remote_prefs_response_cb), NULL); notebook = gtk_notebook_new(); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), - trg_rprefs_generalPage - (TRG_REMOTE_PREFS_DIALOG(object), - session), gtk_label_new("General")); + trg_rprefs_generalPage + (TRG_REMOTE_PREFS_DIALOG(object), + session), gtk_label_new("General")); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), - trg_rprefs_connPage - (TRG_REMOTE_PREFS_DIALOG(object), - session), gtk_label_new("Connections")); + trg_rprefs_connPage + (TRG_REMOTE_PREFS_DIALOG(object), + session), gtk_label_new("Connections")); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), - trg_rprefs_limitsPage - (TRG_REMOTE_PREFS_DIALOG(object), - session), gtk_label_new("Limits")); + trg_rprefs_limitsPage + (TRG_REMOTE_PREFS_DIALOG(object), + session), gtk_label_new("Limits")); gtk_container_set_border_width(GTK_CONTAINER(notebook), GUI_PAD); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(object)->vbox), notebook, - TRUE, TRUE, 0); + TRUE, TRUE, 0); return object; } @@ -504,27 +504,27 @@ trg_remote_prefs_dialog_class_init(TrgRemotePrefsDialogClass * klass) object_class->set_property = trg_remote_prefs_dialog_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)); g_object_class_install_property(object_class, - PROP_PARENT, - g_param_spec_object - ("parent-window", "Parent window", - "Parent window", - TRG_TYPE_MAIN_WINDOW, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + PROP_PARENT, + g_param_spec_object + ("parent-window", "Parent window", + "Parent window", + TRG_TYPE_MAIN_WINDOW, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); } static void @@ -533,14 +533,14 @@ trg_remote_prefs_dialog_init(TrgRemotePrefsDialog * self G_GNUC_UNUSED) } TrgRemotePrefsDialog *trg_remote_prefs_dialog_get_instance(TrgMainWindow * - parent, - trg_client * - client) + parent, + trg_client * + client) { if (instance == NULL) { - instance = g_object_new(TRG_TYPE_REMOTE_PREFS_DIALOG, - "parent-window", parent, - "trg-client", client, NULL); + instance = g_object_new(TRG_TYPE_REMOTE_PREFS_DIALOG, + "parent-window", parent, + "trg-client", client, NULL); } return TRG_REMOTE_PREFS_DIALOG(instance); diff --git a/src/trg-remote-prefs-dialog.h b/src/trg-remote-prefs-dialog.h index a124350..a6af9ea 100644 --- a/src/trg-remote-prefs-dialog.h +++ b/src/trg-remote-prefs-dialog.h @@ -49,9 +49,9 @@ typedef struct { GType trg_remote_prefs_dialog_get_type(void); TrgRemotePrefsDialog *trg_remote_prefs_dialog_get_instance(TrgMainWindow * - parent, - trg_client * - client); + parent, + trg_client * + client); G_END_DECLS -#endif /* TRG_REMOTE_PREFS_DIALOG_H_ */ +#endif /* TRG_REMOTE_PREFS_DIALOG_H_ */ diff --git a/src/trg-state-selector.c b/src/trg-state-selector.c index 8d6d7f3..deb3301 100644 --- a/src/trg-state-selector.c +++ b/src/trg-state-selector.c @@ -50,19 +50,19 @@ static void trg_state_selector_class_init(TrgStateSelectorClass * klass) GObjectClass *object_class = G_OBJECT_CLASS(klass); signals[SELECTOR_STATE_CHANGED] = - g_signal_new("torrent-state-changed", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET(TrgStateSelectorClass, - torrent_state_changed), NULL, - NULL, g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, - 1, G_TYPE_UINT); + g_signal_new("torrent-state-changed", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET(TrgStateSelectorClass, + torrent_state_changed), NULL, + NULL, g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, + 1, G_TYPE_UINT); g_type_class_add_private(klass, sizeof(TrgStateSelectorPrivate)); } static void state_selection_changed(GtkTreeSelection * selection, - gpointer data) + gpointer data) { TrgStateSelectorPrivate *priv; GtkTreeIter iter; @@ -75,24 +75,24 @@ static void state_selection_changed(GtkTreeSelection * selection, stateModel = gtk_tree_view_get_model(tv); if (gtk_tree_selection_get_selected(selection, &stateModel, &iter)) - gtk_tree_model_get(stateModel, &iter, STATE_SELECTOR_BIT, - &(priv->flag), -1); + gtk_tree_model_get(stateModel, &iter, STATE_SELECTOR_BIT, + &(priv->flag), -1); else - priv->flag = 0; + priv->flag = 0; g_signal_emit(TRG_STATE_SELECTOR(data), - signals[SELECTOR_STATE_CHANGED], 0, priv->flag); + signals[SELECTOR_STATE_CHANGED], 0, priv->flag); } static void trg_state_selector_add_state(GtkListStore * model, - GtkTreeIter * iter, gchar * icon, - gchar * name, guint32 flag) + GtkTreeIter * iter, gchar * icon, + gchar * name, guint32 flag) { gtk_list_store_append(model, iter); gtk_list_store_set(model, iter, - STATE_SELECTOR_ICON, icon, - STATE_SELECTOR_NAME, name, - STATE_SELECTOR_BIT, flag, -1); + STATE_SELECTOR_ICON, icon, + STATE_SELECTOR_NAME, name, + STATE_SELECTOR_BIT, flag, -1); } static void trg_state_selector_init(TrgStateSelector * self) @@ -115,7 +115,7 @@ static void trg_state_selector_init(TrgStateSelector * self) gtk_tree_view_column_pack_start(column, renderer, FALSE); g_object_set(renderer, "stock-size", 4, NULL); gtk_tree_view_column_set_attributes(column, renderer, "stock-id", - 0, NULL); + 0, NULL); renderer = gtk_cell_renderer_text_new(); gtk_tree_view_column_pack_start(column, renderer, TRUE); @@ -124,25 +124,25 @@ static void trg_state_selector_init(TrgStateSelector * self) gtk_tree_view_append_column(GTK_TREE_VIEW(self), column); store = - gtk_list_store_new(STATE_SELECTOR_COLUMNS, G_TYPE_STRING, - G_TYPE_STRING, G_TYPE_UINT); + gtk_list_store_new(STATE_SELECTOR_COLUMNS, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_UINT); trg_state_selector_add_state(store, &iter, GTK_STOCK_ABOUT, "All", 0); trg_state_selector_add_state(store, &iter, GTK_STOCK_GO_DOWN, - "Downloading", TORRENT_FLAG_DOWNLOADING); + "Downloading", TORRENT_FLAG_DOWNLOADING); trg_state_selector_add_state(store, &iter, GTK_STOCK_MEDIA_PAUSE, - "Paused", TORRENT_FLAG_PAUSED); + "Paused", TORRENT_FLAG_PAUSED); trg_state_selector_add_state(store, &iter, GTK_STOCK_REFRESH, - "Checking", TORRENT_FLAG_CHECKING); + "Checking", TORRENT_FLAG_CHECKING); trg_state_selector_add_state(store, &iter, GTK_STOCK_APPLY, - "Complete", TORRENT_FLAG_COMPLETE); + "Complete", TORRENT_FLAG_COMPLETE); trg_state_selector_add_state(store, &iter, GTK_STOCK_SELECT_ALL, - "Incomplete", TORRENT_FLAG_INCOMPLETE); + "Incomplete", TORRENT_FLAG_INCOMPLETE); trg_state_selector_add_state(store, &iter, GTK_STOCK_GO_UP, - "Seeding", TORRENT_FLAG_SEEDING); + "Seeding", TORRENT_FLAG_SEEDING); trg_state_selector_add_state(store, &iter, - GTK_STOCK_DIALOG_WARNING, "Error", - TORRENT_FLAG_ERROR); + GTK_STOCK_DIALOG_WARNING, "Error", + TORRENT_FLAG_ERROR); gtk_tree_view_set_model(GTK_TREE_VIEW(self), GTK_TREE_MODEL(store)); gtk_tree_view_set_rubber_banding(GTK_TREE_VIEW(self), TRUE); @@ -152,7 +152,7 @@ static void trg_state_selector_init(TrgStateSelector * self) selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); g_signal_connect(G_OBJECT(selection), "changed", - G_CALLBACK(state_selection_changed), self); + G_CALLBACK(state_selection_changed), self); } TrgStateSelector *trg_state_selector_new(void) diff --git a/src/trg-state-selector.h b/src/trg-state-selector.h index 0df22cf..944647a 100644 --- a/src/trg-state-selector.h +++ b/src/trg-state-selector.h @@ -52,7 +52,7 @@ typedef struct { /* SIGNALS */ void (*torrent_state_changed) (TrgStateSelector * selector, - guint flag, gpointer data); + guint flag, gpointer data); } TrgStateSelectorClass; GType trg_state_selector_get_type(void); @@ -60,4 +60,4 @@ TrgStateSelector *trg_state_selector_new(void); G_END_DECLS guint32 trg_state_selector_get_flag(TrgStateSelector * s); -#endif /* TRG_STATE_LIST_H_ */ +#endif /* TRG_STATE_LIST_H_ */ diff --git a/src/trg-stats-dialog.c b/src/trg-stats-dialog.c index 4c1d08c..c7d94b9 100644 --- a/src/trg-stats-dialog.c +++ b/src/trg-stats-dialog.c @@ -55,38 +55,38 @@ struct _TrgStatsDialogPrivate { GtkWidget *tv; GtkListStore *model; GtkTreeRowReference *rr_up, *rr_down, *rr_files_added, - *rr_session_count, *rr_active; + *rr_session_count, *rr_active; }; static GObject *instance = NULL; static gboolean trg_update_stats_timerfunc(gpointer data); static void on_stats_reply(JsonObject * response, int status, - gpointer data); + gpointer data); static void trg_stats_dialog_get_property(GObject * object, guint property_id, - GValue * value, GParamSpec * pspec) + GValue * value, GParamSpec * pspec) { switch (property_id) { default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); } } static void trg_stats_dialog_set_property(GObject * object, guint property_id, - const GValue * value, GParamSpec * pspec) + const GValue * value, GParamSpec * pspec) { TrgStatsDialogPrivate *priv = TRG_STATS_DIALOG_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; case PROP_PARENT: - priv->parent = g_value_get_object(value); - break; + priv->parent = g_value_get_object(value); + break; default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); } } @@ -100,14 +100,14 @@ trg_stats_dialog_dispose (GObject *object) static void trg_stats_response_cb(GtkDialog * dlg, gint res_id, - gpointer data G_GNUC_UNUSED) + gpointer data G_GNUC_UNUSED) { gtk_widget_destroy(GTK_WIDGET(dlg)); instance = NULL; } static GtkTreeRowReference *stats_dialog_add_statistic(GtkListStore * - model, gchar * name) + model, gchar * name) { GtkTreeIter iter; GtkTreePath *path; @@ -124,7 +124,7 @@ static GtkTreeRowReference *stats_dialog_add_statistic(GtkListStore * } static void update_statistic(GtkTreeRowReference * rr, gchar * session, - gchar * cumulat) + gchar * cumulat) { GtkTreePath *path = gtk_tree_row_reference_get_path(rr); GtkTreeModel *model = gtk_tree_row_reference_get_model(rr); @@ -133,7 +133,7 @@ static void update_statistic(GtkTreeRowReference * rr, gchar * session, gtk_tree_model_get_iter(model, &iter, path); gtk_list_store_set(GTK_LIST_STORE(model), &iter, STATCOL_SESSION, - session, STATCOL_CUMULAT, cumulat, -1); + session, STATCOL_CUMULAT, cumulat, -1); gtk_tree_path_free(path); } @@ -149,89 +149,88 @@ static JsonObject *get_cumulat_arg(JsonObject * args) } static void update_int_stat(JsonObject * args, GtkTreeRowReference * rr, - gchar * jsonKey) + gchar * jsonKey) { gchar session_val[32]; gchar cumulat_val[32]; g_snprintf(session_val, sizeof(session_val), "%ld", - json_object_get_int_member(get_session_arg(args), jsonKey)); + json_object_get_int_member(get_session_arg(args), jsonKey)); g_snprintf(cumulat_val, sizeof(cumulat_val), "%ld", - json_object_get_int_member(get_cumulat_arg(args), jsonKey)); + json_object_get_int_member(get_cumulat_arg(args), jsonKey)); update_statistic(rr, session_val, cumulat_val); } static void update_size_stat(JsonObject * args, GtkTreeRowReference * rr, - gchar * jsonKey) + gchar * jsonKey) { gchar session_val[32]; gchar cumulat_val[32]; trg_strlsize(cumulat_val, - json_object_get_int_member(get_cumulat_arg(args), - jsonKey)); + json_object_get_int_member(get_cumulat_arg(args), + jsonKey)); trg_strlsize(session_val, - json_object_get_int_member(get_session_arg(args), - jsonKey)); + json_object_get_int_member(get_session_arg(args), + jsonKey)); update_statistic(rr, session_val, cumulat_val); } static void update_time_stat(JsonObject * args, GtkTreeRowReference * rr, - gchar * jsonKey) + gchar * jsonKey) { gchar session_val[32]; gchar cumulat_val[32]; tr_strltime_long(session_val, - json_object_get_int_member(get_session_arg(args), - jsonKey), - sizeof(session_val)); + json_object_get_int_member(get_session_arg(args), + jsonKey), + sizeof(session_val)); tr_strltime_long(cumulat_val, - json_object_get_int_member(get_cumulat_arg(args), - jsonKey), - sizeof(cumulat_val)); + json_object_get_int_member(get_cumulat_arg(args), + jsonKey), + sizeof(cumulat_val)); update_statistic(rr, session_val, cumulat_val); } static void on_stats_reply(JsonObject * response, int status, - gpointer data) + gpointer data) { TrgStatsDialogPrivate *priv; JsonObject *args; - if (!TRG_IS_STATS_DIALOG(data)) - { - response_unref(response); - return; + if (!TRG_IS_STATS_DIALOG(data)) { + response_unref(response); + return; } priv = TRG_STATS_DIALOG_GET_PRIVATE(data); if (status == CURLE_OK) { - args = get_arguments(response); + args = get_arguments(response); - update_size_stat(args, priv->rr_up, "uploadedBytes"); - update_size_stat(args, priv->rr_down, "downloadedBytes"); - update_int_stat(args, priv->rr_files_added, "filesAdded"); - update_int_stat(args, priv->rr_session_count, "sessionCount"); - update_time_stat(args, priv->rr_active, "secondsActive"); + update_size_stat(args, priv->rr_up, "uploadedBytes"); + update_size_stat(args, priv->rr_down, "downloadedBytes"); + update_int_stat(args, priv->rr_files_added, "filesAdded"); + update_int_stat(args, priv->rr_session_count, "sessionCount"); + update_time_stat(args, priv->rr_active, "secondsActive"); - if (priv->client->session != NULL) - g_timeout_add_seconds(5, trg_update_stats_timerfunc, data); + if (priv->client->session != NULL) + g_timeout_add_seconds(5, trg_update_stats_timerfunc, data); } else { - const gchar *msg = make_error_message(response, status); - GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(data), - 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); + const gchar *msg = make_error_message(response, status); + GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(data), + 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); } response_unref(response); @@ -242,21 +241,21 @@ static gboolean trg_update_stats_timerfunc(gpointer data) TrgStatsDialogPrivate *priv; if (TRG_IS_STATS_DIALOG(data)) { - priv = TRG_STATS_DIALOG_GET_PRIVATE(data); - dispatch_async(priv->client, session_stats(), on_stats_reply, - data); + priv = TRG_STATS_DIALOG_GET_PRIVATE(data); + dispatch_async(priv->client, session_stats(), on_stats_reply, + data); } return FALSE; } static void trg_stats_add_column(GtkTreeView * tv, gint index, - gchar * title, gint width) + gchar * title, gint width) { GtkCellRenderer *renderer = gtk_cell_renderer_text_new(); GtkTreeViewColumn *column = - gtk_tree_view_column_new_with_attributes(title, renderer, - "text", index, NULL); + gtk_tree_view_column_new_with_attributes(title, renderer, + "text", index, NULL); gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_fixed_width(column, width); @@ -264,59 +263,59 @@ static void trg_stats_add_column(GtkTreeView * tv, gint index, } static GObject *trg_stats_dialog_constructor(GType type, - guint - n_construct_properties, - GObjectConstructParam - * construct_params) + guint + n_construct_properties, + GObjectConstructParam + * construct_params) { GtkWidget *tv; GObject *obj = G_OBJECT_CLASS - (trg_stats_dialog_parent_class)->constructor(type, - n_construct_properties, - construct_params); + (trg_stats_dialog_parent_class)->constructor(type, + n_construct_properties, + construct_params); TrgStatsDialogPrivate *priv = TRG_STATS_DIALOG_GET_PRIVATE(obj); gtk_window_set_title(GTK_WINDOW(obj), "Statistics"); gtk_window_set_transient_for(GTK_WINDOW(obj), - GTK_WINDOW(priv->parent)); + GTK_WINDOW(priv->parent)); gtk_window_set_destroy_with_parent(GTK_WINDOW(obj), TRUE); gtk_dialog_add_button(GTK_DIALOG(obj), GTK_STOCK_CLOSE, - GTK_RESPONSE_CLOSE); + GTK_RESPONSE_CLOSE); gtk_container_set_border_width(GTK_CONTAINER(obj), GUI_PAD); gtk_dialog_set_default_response(GTK_DIALOG(obj), GTK_RESPONSE_CLOSE); g_signal_connect(G_OBJECT(obj), - "response", G_CALLBACK(trg_stats_response_cb), NULL); + "response", G_CALLBACK(trg_stats_response_cb), NULL); priv->model = - gtk_list_store_new(STATCOL_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_STRING); + gtk_list_store_new(STATCOL_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_STRING); priv->rr_down = - stats_dialog_add_statistic(priv->model, "Download Total"); + stats_dialog_add_statistic(priv->model, "Download Total"); priv->rr_up = stats_dialog_add_statistic(priv->model, "Upload Total"); priv->rr_files_added = - stats_dialog_add_statistic(priv->model, "Files Added"); + stats_dialog_add_statistic(priv->model, "Files Added"); priv->rr_session_count = - stats_dialog_add_statistic(priv->model, "Session Count"); + stats_dialog_add_statistic(priv->model, "Session Count"); priv->rr_active = - stats_dialog_add_statistic(priv->model, "Time Active"); + stats_dialog_add_statistic(priv->model, "Time Active"); tv = priv->tv = trg_tree_view_new(); gtk_widget_set_sensitive(tv, TRUE); trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_STAT, "Statistic", - 170); + 170); trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_SESSION, "Session", - 100); + 100); trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_CUMULAT, "Cumulative", - 100); + 100); gtk_tree_view_set_model(GTK_TREE_VIEW(tv), - GTK_TREE_MODEL(priv->model)); + GTK_TREE_MODEL(priv->model)); gtk_container_set_border_width(GTK_CONTAINER(tv), GUI_PAD); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(obj)->vbox), tv, TRUE, TRUE, 0); @@ -338,27 +337,27 @@ static void trg_stats_dialog_class_init(TrgStatsDialogClass * klass) object_class->constructor = trg_stats_dialog_constructor; g_object_class_install_property(object_class, - PROP_PARENT, - g_param_spec_object - ("parent-window", "Parent window", - "Parent window", - TRG_TYPE_MAIN_WINDOW, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + PROP_PARENT, + g_param_spec_object + ("parent-window", "Parent window", + "Parent window", + TRG_TYPE_MAIN_WINDOW, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); 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)); } static void trg_stats_dialog_init(TrgStatsDialog * self) @@ -366,12 +365,12 @@ static void trg_stats_dialog_init(TrgStatsDialog * self) } TrgStatsDialog *trg_stats_dialog_get_instance(TrgMainWindow * parent, - trg_client * client) + trg_client * client) { if (instance == NULL) { - instance = g_object_new(TRG_TYPE_STATS_DIALOG, - "trg-client", client, - "parent-window", parent, NULL); + instance = g_object_new(TRG_TYPE_STATS_DIALOG, + "trg-client", client, + "parent-window", parent, NULL); } return TRG_STATS_DIALOG(instance); diff --git a/src/trg-stats-dialog.h b/src/trg-stats-dialog.h index 0547467..acdbc55 100644 --- a/src/trg-stats-dialog.h +++ b/src/trg-stats-dialog.h @@ -50,7 +50,7 @@ typedef struct { GType trg_stats_dialog_get_type(void); TrgStatsDialog *trg_stats_dialog_get_instance(TrgMainWindow * parent, - trg_client * client); + trg_client * client); G_END_DECLS -#endif /* TRG_STATS_DIALOG_H_ */ +#endif /* TRG_STATS_DIALOG_H_ */ diff --git a/src/trg-status-bar.c b/src/trg-status-bar.c index 056bae0..7f21412 100644 --- a/src/trg-status-bar.c +++ b/src/trg-status-bar.c @@ -45,14 +45,14 @@ static void trg_status_bar_init(TrgStatusBar * self) TrgStatusBarPrivate *priv = TRG_STATUS_BAR_GET_PRIVATE(self); priv->connectionCtx = - gtk_statusbar_get_context_id(GTK_STATUSBAR(self), "connection"); + gtk_statusbar_get_context_id(GTK_STATUSBAR(self), "connection"); priv->countSpeedsCtx = - gtk_statusbar_get_context_id(GTK_STATUSBAR(self), - "counts and speeds"); + gtk_statusbar_get_context_id(GTK_STATUSBAR(self), + "counts and speeds"); } void trg_status_bar_push_connection_msg(TrgStatusBar * sb, - const gchar * msg) + const gchar * msg) { TrgStatusBarPrivate *priv; @@ -69,15 +69,15 @@ void trg_status_bar_connect(TrgStatusBar * sb, JsonObject * session) session_get_version(session, &version); statusMsg = - g_strdup_printf - ("Connected to Transmission %g, getting torrents...", version); + g_strdup_printf + ("Connected to Transmission %g, getting torrents...", version); g_printf("%s\n", statusMsg); trg_status_bar_push_connection_msg(sb, statusMsg); g_free(statusMsg); } void trg_status_bar_update(TrgStatusBar * sb, - trg_torrent_model_update_stats * stats) + trg_torrent_model_update_stats * stats) { TrgStatusBarPrivate *priv; gchar *statusBarUpdate; @@ -86,18 +86,18 @@ void trg_status_bar_update(TrgStatusBar * sb, priv = TRG_STATUS_BAR_GET_PRIVATE(sb); trg_strlspeed(downRateTotalString, - stats->downRateTotal / KILOBYTE_FACTOR); + stats->downRateTotal / KILOBYTE_FACTOR); trg_strlspeed(upRateTotalString, stats->upRateTotal / KILOBYTE_FACTOR); statusBarUpdate = - g_strdup_printf - ("%d torrents .. Down %s, Up %s .. %d seeding, %d downloading, %d paused", - stats->count, - downRateTotalString, upRateTotalString, - stats->seeding, stats->down, stats->paused); + g_strdup_printf + ("%d torrents .. Down %s, Up %s .. %d seeding, %d downloading, %d paused", + stats->count, + downRateTotalString, upRateTotalString, + stats->seeding, stats->down, stats->paused); gtk_statusbar_pop(GTK_STATUSBAR(sb), priv->countSpeedsCtx); gtk_statusbar_push(GTK_STATUSBAR(sb), - priv->countSpeedsCtx, statusBarUpdate); + priv->countSpeedsCtx, statusBarUpdate); g_free(statusBarUpdate); } diff --git a/src/trg-status-bar.h b/src/trg-status-bar.h index 90e0133..5908c9f 100644 --- a/src/trg-status-bar.h +++ b/src/trg-status-bar.h @@ -52,9 +52,9 @@ TrgStatusBar *trg_status_bar_new(); G_END_DECLS void trg_status_bar_update(TrgStatusBar * sb, - trg_torrent_model_update_stats * stats); + trg_torrent_model_update_stats * stats); void trg_status_bar_connect(TrgStatusBar * sb, JsonObject * session); void trg_status_bar_push_connection_msg(TrgStatusBar * sb, - const gchar * msg); + const gchar * msg); -#endif /* TRG_STATUS_BAR_H_ */ +#endif /* TRG_STATUS_BAR_H_ */ diff --git a/src/trg-toolbar.c b/src/trg-toolbar.c index f7b6c27..4924db1 100644 --- a/src/trg-toolbar.c +++ b/src/trg-toolbar.c @@ -58,69 +58,69 @@ struct _TrgToolbarPrivate { static void trg_toolbar_get_property(GObject * object, guint property_id, - GValue * value, GParamSpec * pspec) + GValue * value, GParamSpec * pspec) { TrgToolbarPrivate *priv = TRG_TOOLBAR_GET_PRIVATE(object); switch (property_id) { case PROP_CONNECT_BUTTON: - g_value_set_object(value, priv->tb_connect); - break; + g_value_set_object(value, priv->tb_connect); + break; case PROP_DISCONNECT_BUTTON: - g_value_set_object(value, priv->tb_disconnect); - break; + g_value_set_object(value, priv->tb_disconnect); + break; case PROP_ADD_BUTTON: - g_value_set_object(value, priv->tb_add); - break; + g_value_set_object(value, priv->tb_add); + break; /* case PROP_ADD_URL_BUTTON: g_value_set_object(value, priv->tb_add_url); break;*/ case PROP_REMOVE_BUTTON: - g_value_set_object(value, priv->tb_remove); - break; + g_value_set_object(value, priv->tb_remove); + break; case PROP_DELETE_BUTTON: - g_value_set_object(value, priv->tb_delete); - break; + g_value_set_object(value, priv->tb_delete); + break; case PROP_RESUME_BUTTON: - g_value_set_object(value, priv->tb_resume); - break; + g_value_set_object(value, priv->tb_resume); + break; case PROP_PAUSE_BUTTON: - g_value_set_object(value, priv->tb_pause); - break; - /*case PROP_VERIFY_BUTTON: - g_value_set_object(value, priv->tb_verify); - break; */ + g_value_set_object(value, priv->tb_pause); + break; + /*case PROP_VERIFY_BUTTON: + g_value_set_object(value, priv->tb_verify); + break; */ case PROP_PROPS_BUTTON: - g_value_set_object(value, priv->tb_props); - break; + g_value_set_object(value, priv->tb_props); + break; case PROP_REMOTE_PREFS_BUTTON: - g_value_set_object(value, priv->tb_remote_prefs); - break; + g_value_set_object(value, priv->tb_remote_prefs); + break; case PROP_LOCAL_PREFS_BUTTON: - g_value_set_object(value, priv->tb_local_prefs); - break; + g_value_set_object(value, priv->tb_local_prefs); + 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_toolbar_install_widget_prop(GObjectClass * class, guint propId, - const gchar * name, const gchar * nick) + const gchar * name, const gchar * nick) { g_object_class_install_property(class, - propId, - g_param_spec_object(name, - nick, - nick, - GTK_TYPE_WIDGET, - G_PARAM_READABLE - | - G_PARAM_STATIC_NAME - | - G_PARAM_STATIC_NICK - | - G_PARAM_STATIC_BLURB)); + propId, + g_param_spec_object(name, + nick, + nick, + GTK_TYPE_WIDGET, + G_PARAM_READABLE + | + G_PARAM_STATIC_NAME + | + G_PARAM_STATIC_NICK + | + G_PARAM_STATIC_BLURB)); } static void trg_toolbar_class_init(TrgToolbarClass * klass) @@ -129,44 +129,44 @@ static void trg_toolbar_class_init(TrgToolbarClass * klass) object_class->get_property = trg_toolbar_get_property; trg_toolbar_install_widget_prop(object_class, PROP_CONNECT_BUTTON, - "connect-button", "Connect Button"); + "connect-button", "Connect Button"); trg_toolbar_install_widget_prop(object_class, - PROP_DISCONNECT_BUTTON, - "disconnect-button", - "Disconnect Button"); + PROP_DISCONNECT_BUTTON, + "disconnect-button", + "Disconnect Button"); trg_toolbar_install_widget_prop(object_class, PROP_ADD_BUTTON, - "add-button", "Add Button"); + "add-button", "Add Button"); trg_toolbar_install_widget_prop(object_class, PROP_ADD_URL_BUTTON, - "add-url-button", "Add URL Button"); + "add-url-button", "Add URL Button"); trg_toolbar_install_widget_prop(object_class, PROP_REMOVE_BUTTON, - "remove-button", "Remove Button"); + "remove-button", "Remove Button"); trg_toolbar_install_widget_prop(object_class, PROP_DELETE_BUTTON, - "delete-button", "Delete Button"); + "delete-button", "Delete Button"); trg_toolbar_install_widget_prop(object_class, PROP_RESUME_BUTTON, - "resume-button", "Resume Button"); + "resume-button", "Resume Button"); trg_toolbar_install_widget_prop(object_class, PROP_PAUSE_BUTTON, - "pause-button", "Pause Button"); + "pause-button", "Pause Button"); /*trg_toolbar_install_widget_prop(object_class, PROP_VERIFY_BUTTON, "verify-button", "Verify Button"); */ trg_toolbar_install_widget_prop(object_class, PROP_PROPS_BUTTON, - "props-button", "Props Button"); + "props-button", "Props Button"); trg_toolbar_install_widget_prop(object_class, - PROP_REMOTE_PREFS_BUTTON, - "remote-prefs-button", - "Remote Prefs Button"); + PROP_REMOTE_PREFS_BUTTON, + "remote-prefs-button", + "Remote Prefs Button"); trg_toolbar_install_widget_prop(object_class, - PROP_LOCAL_PREFS_BUTTON, - "local-prefs-button", - "Local Prefs Button"); + PROP_LOCAL_PREFS_BUTTON, + "local-prefs-button", + "Local Prefs Button"); g_type_class_add_private(klass, sizeof(TrgToolbarPrivate)); } static GtkWidget *trg_toolbar_item_new(TrgToolbar * toolbar, - gchar * text G_GNUC_UNUSED, - int *index, gchar * icon, - gboolean sensitive) + gchar * text G_GNUC_UNUSED, + int *index, gchar * icon, + gboolean sensitive) { GtkToolItem *w = gtk_tool_button_new_from_stock(icon); gtk_widget_set_sensitive(GTK_WIDGET(w), sensitive); @@ -186,7 +186,7 @@ void trg_toolbar_connected_change(TrgToolbar * tb, gboolean connected) } void trg_toolbar_torrent_actions_sensitive(TrgToolbar * tb, - gboolean sensitive) + gboolean sensitive) { TrgToolbarPrivate *priv = TRG_TOOLBAR_GET_PRIVATE(tb); @@ -207,19 +207,19 @@ static void trg_toolbar_init(TrgToolbar * self) priv = TRG_TOOLBAR_GET_PRIVATE(self); gtk_orientable_set_orientation(GTK_ORIENTABLE(self), - GTK_ORIENTATION_HORIZONTAL); + GTK_ORIENTATION_HORIZONTAL); gtk_toolbar_set_icon_size(GTK_TOOLBAR(self), - GTK_ICON_SIZE_LARGE_TOOLBAR); + GTK_ICON_SIZE_LARGE_TOOLBAR); gtk_toolbar_set_style(GTK_TOOLBAR(self), GTK_TOOLBAR_ICONS); priv->tb_connect = - trg_toolbar_item_new(self, "Connect", &position, - GTK_STOCK_CONNECT, TRUE); + trg_toolbar_item_new(self, "Connect", &position, + GTK_STOCK_CONNECT, TRUE); priv->tb_disconnect = - trg_toolbar_item_new(self, "Disconnect", &position, - GTK_STOCK_DISCONNECT, FALSE); + trg_toolbar_item_new(self, "Disconnect", &position, + GTK_STOCK_DISCONNECT, FALSE); priv->tb_add = - trg_toolbar_item_new(self, "Add", &position, GTK_STOCK_ADD, FALSE); + trg_toolbar_item_new(self, "Add", &position, GTK_STOCK_ADD, FALSE); /*priv->tb_add_url = trg_toolbar_item_new(self, "Add URL", 3, GTK_STOCK_ADD, FALSE); */ @@ -228,23 +228,23 @@ static void trg_toolbar_init(TrgToolbar * self) gtk_toolbar_insert(GTK_TOOLBAR(self), separator, position++); priv->tb_resume = - trg_toolbar_item_new(self, "Resume", &position, - GTK_STOCK_MEDIA_PLAY, FALSE); + trg_toolbar_item_new(self, "Resume", &position, + GTK_STOCK_MEDIA_PLAY, FALSE); priv->tb_pause = - trg_toolbar_item_new(self, "Pause", &position, - GTK_STOCK_MEDIA_PAUSE, FALSE); + trg_toolbar_item_new(self, "Pause", &position, + GTK_STOCK_MEDIA_PAUSE, FALSE); priv->tb_props = - trg_toolbar_item_new(self, "Properties", &position, - GTK_STOCK_PROPERTIES, FALSE); + trg_toolbar_item_new(self, "Properties", &position, + GTK_STOCK_PROPERTIES, FALSE); priv->tb_remove = - trg_toolbar_item_new(self, "Remove", &position, - GTK_STOCK_REMOVE, FALSE); + trg_toolbar_item_new(self, "Remove", &position, + GTK_STOCK_REMOVE, FALSE); priv->tb_delete = - trg_toolbar_item_new(self, "Remove with data", - &position, GTK_STOCK_DELETE, FALSE); + trg_toolbar_item_new(self, "Remove with data", + &position, GTK_STOCK_DELETE, FALSE); /*priv->tb_verify = trg_toolbar_item_new(self, "Verify", 11, @@ -254,12 +254,12 @@ static void trg_toolbar_init(TrgToolbar * self) gtk_toolbar_insert(GTK_TOOLBAR(self), separator, position++); priv->tb_local_prefs = - trg_toolbar_item_new(self, "Local Preferences", &position, - GTK_STOCK_PREFERENCES, TRUE); + trg_toolbar_item_new(self, "Local Preferences", &position, + GTK_STOCK_PREFERENCES, TRUE); priv->tb_remote_prefs = - trg_toolbar_item_new(self, "Remote Preferences", - &position, GTK_STOCK_NETWORK, FALSE); + trg_toolbar_item_new(self, "Remote Preferences", + &position, GTK_STOCK_NETWORK, FALSE); } TrgToolbar *trg_toolbar_new(void) diff --git a/src/trg-toolbar.h b/src/trg-toolbar.h index 2aaa094..c63d353 100644 --- a/src/trg-toolbar.h +++ b/src/trg-toolbar.h @@ -50,7 +50,7 @@ TrgToolbar *trg_toolbar_new(void); G_END_DECLS void trg_toolbar_torrent_actions_sensitive(TrgToolbar * mb, - gboolean sensitive); + gboolean sensitive); void trg_toolbar_connected_change(TrgToolbar * mb, gboolean connected); -#endif /* TRG_TOOLBAR_H_ */ +#endif /* TRG_TOOLBAR_H_ */ diff --git a/src/trg-torrent-add-url-dialog.c b/src/trg-torrent-add-url-dialog.c index 3844813..a2b35df 100644 --- a/src/trg-torrent-add-url-dialog.c +++ b/src/trg-torrent-add-url-dialog.c @@ -28,7 +28,7 @@ #include "dispatch.h" G_DEFINE_TYPE(TrgTorrentAddUrlDialog, trg_torrent_add_url_dialog, - GTK_TYPE_DIALOG) + GTK_TYPE_DIALOG) #define TRG_TORRENT_ADD_URL_DIALOG_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_TORRENT_ADD_URL_DIALOG, TrgTorrentAddUrlDialogPrivate)) typedef struct _TrgTorrentAddUrlDialogPrivate @@ -48,17 +48,17 @@ trg_torrent_add_url_dialog_class_init(TrgTorrentAddUrlDialogClass * klass) static void trg_torrent_add_url_response_cb(GtkDialog * dlg, gint res_id, - gpointer data) + gpointer data) { TrgTorrentAddUrlDialogPrivate *priv = - TRG_TORRENT_ADD_URL_DIALOG_GET_PRIVATE(dlg); + TRG_TORRENT_ADD_URL_DIALOG_GET_PRIVATE(dlg); if (res_id == GTK_RESPONSE_ACCEPT) { - JsonNode *request = - torrent_add_url(gtk_entry_get_text(GTK_ENTRY(priv->urlEntry)), - gtk_toggle_button_get_active - (GTK_TOGGLE_BUTTON(priv->startCheck))); - dispatch_async(priv->client, request, - on_generic_interactive_action, data); + JsonNode *request = + torrent_add_url(gtk_entry_get_text(GTK_ENTRY(priv->urlEntry)), + gtk_toggle_button_get_active + (GTK_TOGGLE_BUTTON(priv->startCheck))); + dispatch_async(priv->client, request, + on_generic_interactive_action, data); } gtk_widget_destroy(GTK_WIDGET(dlg)); } @@ -66,15 +66,15 @@ trg_torrent_add_url_response_cb(GtkDialog * dlg, gint res_id, static void url_entry_changed(GtkWidget * w, gpointer data) { TrgTorrentAddUrlDialogPrivate *priv = - TRG_TORRENT_ADD_URL_DIALOG_GET_PRIVATE(data); + TRG_TORRENT_ADD_URL_DIALOG_GET_PRIVATE(data); gtk_widget_set_sensitive(priv->addButton, - gtk_entry_get_text_length(GTK_ENTRY(w)) > 0); + gtk_entry_get_text_length(GTK_ENTRY(w)) > 0); } static void trg_torrent_add_url_dialog_init(TrgTorrentAddUrlDialog * self) { TrgTorrentAddUrlDialogPrivate *priv = - TRG_TORRENT_ADD_URL_DIALOG_GET_PRIVATE(self); + TRG_TORRENT_ADD_URL_DIALOG_GET_PRIVATE(self); GtkWidget *w, *t; gint row = 0; @@ -85,16 +85,16 @@ static void trg_torrent_add_url_dialog_init(TrgTorrentAddUrlDialog * self) w = hig_workarea_add_row(t, &row, "URL:", w, NULL); priv->startCheck = - hig_workarea_add_wide_checkbutton(t, &row, "Start Paused", FALSE); + hig_workarea_add_wide_checkbutton(t, &row, "Start Paused", FALSE); gtk_window_set_title(GTK_WINDOW(self), "Add torrent from URL"); gtk_window_set_destroy_with_parent(GTK_WINDOW(self), TRUE); gtk_dialog_add_button(GTK_DIALOG(self), GTK_STOCK_CLOSE, - GTK_RESPONSE_CANCEL); + GTK_RESPONSE_CANCEL); priv->addButton = - gtk_dialog_add_button(GTK_DIALOG(self), GTK_STOCK_ADD, - GTK_RESPONSE_ACCEPT); + gtk_dialog_add_button(GTK_DIALOG(self), GTK_STOCK_ADD, + GTK_RESPONSE_ACCEPT); gtk_widget_set_sensitive(priv->addButton, FALSE); gtk_container_set_border_width(GTK_CONTAINER(self), GUI_PAD); @@ -102,8 +102,8 @@ static void trg_torrent_add_url_dialog_init(TrgTorrentAddUrlDialog * self) gtk_dialog_set_default_response(GTK_DIALOG(self), GTK_RESPONSE_ACCEPT); gtk_dialog_set_alternative_button_order(GTK_DIALOG(self), - GTK_RESPONSE_ACCEPT, - GTK_RESPONSE_CANCEL, -1); + GTK_RESPONSE_ACCEPT, + GTK_RESPONSE_CANCEL, -1); gtk_container_set_border_width(GTK_CONTAINER(t), GUI_PAD); @@ -111,19 +111,19 @@ static void trg_torrent_add_url_dialog_init(TrgTorrentAddUrlDialog * self) } TrgTorrentAddUrlDialog *trg_torrent_add_url_dialog_new(TrgMainWindow * win, - trg_client * client) + trg_client * client) { GObject *obj = g_object_new(TRG_TYPE_TORRENT_ADD_URL_DIALOG, NULL); TrgTorrentAddUrlDialogPrivate *priv = - TRG_TORRENT_ADD_URL_DIALOG_GET_PRIVATE(obj); + TRG_TORRENT_ADD_URL_DIALOG_GET_PRIVATE(obj); priv->client = client; priv->win = win; gtk_window_set_transient_for(GTK_WINDOW(obj), GTK_WINDOW(win)); g_signal_connect(G_OBJECT(obj), - "response", - G_CALLBACK(trg_torrent_add_url_response_cb), win); + "response", + G_CALLBACK(trg_torrent_add_url_response_cb), win); return TRG_TORRENT_ADD_URL_DIALOG(obj); } diff --git a/src/trg-torrent-add-url-dialog.h b/src/trg-torrent-add-url-dialog.h index d089169..8e2fb26 100644 --- a/src/trg-torrent-add-url-dialog.h +++ b/src/trg-torrent-add-url-dialog.h @@ -49,8 +49,8 @@ typedef struct { GType trg_torrent_add_url_dialog_get_type(void); TrgTorrentAddUrlDialog *trg_torrent_add_url_dialog_new(TrgMainWindow * win, - trg_client * - client); + trg_client * + client); G_END_DECLS -#endif /* TRG_TORRENT_ADD_URL_DIALOG_H_ */ +#endif /* TRG_TORRENT_ADD_URL_DIALOG_H_ */ diff --git a/src/trg-torrent-model.c b/src/trg-torrent-model.c index 3bfe20c..c201fa2 100644 --- a/src/trg-torrent-model.c +++ b/src/trg-torrent-model.c @@ -41,39 +41,39 @@ static guint signals[TMODEL_SIGNAL_COUNT] = { 0 }; G_DEFINE_TYPE(TrgTorrentModel, trg_torrent_model, GTK_TYPE_LIST_STORE) static guint32 torrent_get_flags(JsonObject * t, gint64 status, - trg_torrent_model_update_stats * stats); + trg_torrent_model_update_stats * stats); static void update_torrent_iter(gint64 serial, TrgTorrentModel * model, - GtkTreeIter * iter, JsonObject * t, - trg_torrent_model_update_stats * stats); + GtkTreeIter * iter, JsonObject * t, + trg_torrent_model_update_stats * stats); static void trg_torrent_model_class_init(TrgTorrentModelClass * klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); signals[TMODEL_TORRENT_COMPLETED] = - g_signal_new("torrent-completed", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET(TrgTorrentModelClass, - torrent_completed), NULL, - NULL, g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, G_TYPE_POINTER); + g_signal_new("torrent-completed", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET(TrgTorrentModelClass, + torrent_completed), NULL, + NULL, g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, G_TYPE_POINTER); signals[TMODEL_TORRENT_ADDED] = - g_signal_new("torrent-added", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET(TrgTorrentModelClass, - torrent_added), NULL, - NULL, g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, G_TYPE_POINTER); + g_signal_new("torrent-added", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET(TrgTorrentModelClass, + torrent_added), NULL, + NULL, g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, G_TYPE_POINTER); } static void trg_torrent_model_count_peers(TrgTorrentModel * model, - GtkTreeIter * iter, - JsonObject * t) + GtkTreeIter * iter, + JsonObject * t) { JsonArray *peers; gint seeders, leechers; @@ -85,20 +85,20 @@ static void trg_torrent_model_count_peers(TrgTorrentModel * model, leechers = 0; for (j = 0; j < json_array_get_length(peers); j++) { - JsonObject *peer; + JsonObject *peer; - peer = json_node_get_object(json_array_get_element(peers, j)); + peer = json_node_get_object(json_array_get_element(peers, j)); - if (peer_get_is_downloading_from(peer)) - seeders++; + if (peer_get_is_downloading_from(peer)) + seeders++; - if (peer_get_is_uploading_to(peer)) - leechers++; + if (peer_get_is_uploading_to(peer)) + leechers++; } gtk_list_store_set(GTK_LIST_STORE(model), iter, - TORRENT_COLUMN_SEEDS, seeders, - TORRENT_COLUMN_LEECHERS, leechers, -1); + TORRENT_COLUMN_SEEDS, seeders, + TORRENT_COLUMN_LEECHERS, leechers, -1); } static void trg_torrent_model_init(TrgTorrentModel * self) @@ -124,50 +124,50 @@ static void trg_torrent_model_init(TrgTorrentModel * self) column_types[TORRENT_COLUMN_FLAGS] = G_TYPE_INT; gtk_list_store_set_column_types(GTK_LIST_STORE(self), - TORRENT_COLUMN_COLUMNS, column_types); + TORRENT_COLUMN_COLUMNS, column_types); } static guint32 torrent_get_flags(JsonObject * t, gint64 status, - trg_torrent_model_update_stats * stats) + trg_torrent_model_update_stats * stats) { guint32 flags = 0; switch (status) { case STATUS_DOWNLOADING: - flags |= TORRENT_FLAG_DOWNLOADING; - stats->down++; - break; + flags |= TORRENT_FLAG_DOWNLOADING; + stats->down++; + break; case STATUS_PAUSED: - flags |= TORRENT_FLAG_PAUSED; - stats->paused++; - break; + flags |= TORRENT_FLAG_PAUSED; + stats->paused++; + break; case STATUS_SEEDING: - flags |= TORRENT_FLAG_SEEDING; - stats->seeding++; - break; + flags |= TORRENT_FLAG_SEEDING; + stats->seeding++; + break; case STATUS_CHECKING: - flags |= TORRENT_FLAG_CHECKING; - break; + flags |= TORRENT_FLAG_CHECKING; + break; case STATUS_WAITING_TO_CHECK: - flags |= TORRENT_FLAG_WAITING_CHECK; - flags |= TORRENT_FLAG_CHECKING; - break; + flags |= TORRENT_FLAG_WAITING_CHECK; + flags |= TORRENT_FLAG_CHECKING; + break; } if (torrent_get_is_finished(t) == TRUE) - flags |= TORRENT_FLAG_COMPLETE; + flags |= TORRENT_FLAG_COMPLETE; else - flags |= TORRENT_FLAG_INCOMPLETE; + flags |= TORRENT_FLAG_INCOMPLETE; if (strlen(torrent_get_errorstr(t)) > 0) - flags |= TORRENT_FLAG_ERROR; + flags |= TORRENT_FLAG_ERROR; return flags; } static void update_torrent_iter(gint64 serial, TrgTorrentModel * model, - GtkTreeIter * iter, JsonObject * t, - trg_torrent_model_update_stats * stats) + GtkTreeIter * iter, JsonObject * t, + trg_torrent_model_update_stats * stats) { guint lastFlags, newFlags; gchar *statusString, *statusIcon; @@ -190,69 +190,69 @@ update_torrent_iter(gint64 serial, TrgTorrentModel * model, statusIcon = torrent_get_status_icon(newFlags); gtk_tree_model_get(GTK_TREE_MODEL(model), iter, - TORRENT_COLUMN_FLAGS, &lastFlags, -1); + TORRENT_COLUMN_FLAGS, &lastFlags, -1); #ifdef DEBUG gtk_list_store_set(GTK_LIST_STORE(model), iter, - TORRENT_COLUMN_ICON, statusIcon, -1); + TORRENT_COLUMN_ICON, statusIcon, -1); gtk_list_store_set(GTK_LIST_STORE(model), iter, - TORRENT_COLUMN_NAME, torrent_get_name(t), -1); + TORRENT_COLUMN_NAME, torrent_get_name(t), -1); gtk_list_store_set(GTK_LIST_STORE(model), iter, - TORRENT_COLUMN_SIZE, torrent_get_size(t), -1); + TORRENT_COLUMN_SIZE, torrent_get_size(t), -1); gtk_list_store_set(GTK_LIST_STORE(model), iter, - TORRENT_COLUMN_DONE, torrent_get_percent_done(t), - -1); + TORRENT_COLUMN_DONE, torrent_get_percent_done(t), + -1); gtk_list_store_set(GTK_LIST_STORE(model), iter, TORRENT_COLUMN_STATUS, - statusString, -1); + statusString, -1); gtk_list_store_set(GTK_LIST_STORE(model), iter, - TORRENT_COLUMN_DOWNSPEED, downRate, -1); + TORRENT_COLUMN_DOWNSPEED, downRate, -1); gtk_list_store_set(GTK_LIST_STORE(model), iter, TORRENT_COLUMN_FLAGS, - newFlags, -1); + newFlags, -1); gtk_list_store_set(GTK_LIST_STORE(model), iter, TORRENT_COLUMN_UPSPEED, - upRate, -1); + upRate, -1); gtk_list_store_set(GTK_LIST_STORE(model), iter, TORRENT_COLUMN_ETA, - torrent_get_eta(t), -1); + torrent_get_eta(t), -1); gtk_list_store_set(GTK_LIST_STORE(model), iter, - TORRENT_COLUMN_UPLOADED, uploaded, -1); + TORRENT_COLUMN_UPLOADED, uploaded, -1); gtk_list_store_set(GTK_LIST_STORE(model), iter, - TORRENT_COLUMN_DOWNLOADED, downloaded, -1); + TORRENT_COLUMN_DOWNLOADED, downloaded, -1); gtk_list_store_set(GTK_LIST_STORE(model), iter, TORRENT_COLUMN_RATIO, - uploaded > 0 - && downloaded > - 0 ? (double) uploaded / (double) downloaded : 0, - -1); + uploaded > 0 + && downloaded > + 0 ? (double) uploaded / (double) downloaded : 0, + -1); gtk_list_store_set(GTK_LIST_STORE(model), iter, TORRENT_COLUMN_ID, id, - -1); + -1); gtk_list_store_set(GTK_LIST_STORE(model), iter, TORRENT_COLUMN_JSON, t, - -1); + -1); gtk_list_store_set(GTK_LIST_STORE(model), iter, - TORRENT_COLUMN_UPDATESERIAL, serial, -1); + TORRENT_COLUMN_UPDATESERIAL, serial, -1); #else gtk_list_store_set(GTK_LIST_STORE(model), iter, - TORRENT_COLUMN_ICON, statusIcon, - TORRENT_COLUMN_NAME, torrent_get_name(t), - TORRENT_COLUMN_SIZE, torrent_get_size(t), - TORRENT_COLUMN_DONE, - torrent_get_percent_done(t), - TORRENT_COLUMN_STATUS, statusString, - TORRENT_COLUMN_DOWNSPEED, downRate, - TORRENT_COLUMN_FLAGS, newFlags, - TORRENT_COLUMN_UPSPEED, upRate, - TORRENT_COLUMN_ETA, torrent_get_eta(t), - TORRENT_COLUMN_UPLOADED, uploaded, - TORRENT_COLUMN_DOWNLOADED, downloaded, - TORRENT_COLUMN_RATIO, - uploaded > - 0 - && downloaded > - 0 ? (double) uploaded / (double) downloaded : 0, - TORRENT_COLUMN_ID, id, TORRENT_COLUMN_JSON, t, - TORRENT_COLUMN_UPDATESERIAL, serial, -1); + TORRENT_COLUMN_ICON, statusIcon, + TORRENT_COLUMN_NAME, torrent_get_name(t), + TORRENT_COLUMN_SIZE, torrent_get_size(t), + TORRENT_COLUMN_DONE, + torrent_get_percent_done(t), + TORRENT_COLUMN_STATUS, statusString, + TORRENT_COLUMN_DOWNSPEED, downRate, + TORRENT_COLUMN_FLAGS, newFlags, + TORRENT_COLUMN_UPSPEED, upRate, + TORRENT_COLUMN_ETA, torrent_get_eta(t), + TORRENT_COLUMN_UPLOADED, uploaded, + TORRENT_COLUMN_DOWNLOADED, downloaded, + TORRENT_COLUMN_RATIO, + uploaded > + 0 + && downloaded > + 0 ? (double) uploaded / (double) downloaded : 0, + TORRENT_COLUMN_ID, id, TORRENT_COLUMN_JSON, t, + TORRENT_COLUMN_UPDATESERIAL, serial, -1); #endif if ((lastFlags & TORRENT_FLAG_DOWNLOADING) - && (newFlags & TORRENT_FLAG_COMPLETE)) - g_signal_emit(model, signals[TMODEL_TORRENT_COMPLETED], 0, iter); + && (newFlags & TORRENT_FLAG_COMPLETE)) + g_signal_emit(model, signals[TMODEL_TORRENT_COMPLETED], 0, iter); trg_torrent_model_count_peers(model, iter, t); @@ -266,9 +266,9 @@ TrgTorrentModel *trg_torrent_model_new(void) } void trg_torrent_model_update(TrgTorrentModel * model, trg_client * tc, - JsonObject * response, - trg_torrent_model_update_stats * stats, - gboolean first) + JsonObject * response, + trg_torrent_model_update_stats * stats, + gboolean first) { int i; JsonArray *newTorrents; @@ -277,31 +277,34 @@ void trg_torrent_model_update(TrgTorrentModel * model, trg_client * tc, stats->count = json_array_get_length(newTorrents); for (i = 0; i < stats->count; i++) { - GtkTreeIter iter; - JsonObject *t; - - t = json_array_get_object_element(newTorrents, i); - - if (first == TRUE - || find_existing_model_item(GTK_TREE_MODEL(model), TORRENT_COLUMN_ID, torrent_get_id(t), &iter) == FALSE) { - gtk_list_store_append(GTK_LIST_STORE(model), &iter); - update_torrent_iter(tc->updateSerial, model, &iter, t, stats); - if (!first) - g_signal_emit(model, signals[TMODEL_TORRENT_ADDED], 0, - &iter); - } else { - update_torrent_iter(tc->updateSerial, model, &iter, t, stats); - } + GtkTreeIter iter; + JsonObject *t; + + t = json_array_get_object_element(newTorrents, i); + + if (first == TRUE + || find_existing_model_item(GTK_TREE_MODEL(model), + TORRENT_COLUMN_ID, + torrent_get_id(t), + &iter) == FALSE) { + gtk_list_store_append(GTK_LIST_STORE(model), &iter); + update_torrent_iter(tc->updateSerial, model, &iter, t, stats); + if (!first) + g_signal_emit(model, signals[TMODEL_TORRENT_ADDED], 0, + &iter); + } else { + update_torrent_iter(tc->updateSerial, model, &iter, t, stats); + } } json_array_ref(newTorrents); if (tc->torrents != NULL) - json_array_unref(tc->torrents); + json_array_unref(tc->torrents); tc->torrents = newTorrents; trg_model_remove_removed(GTK_LIST_STORE(model), - TORRENT_COLUMN_UPDATESERIAL, - tc->updateSerial); + TORRENT_COLUMN_UPDATESERIAL, + tc->updateSerial); } diff --git a/src/trg-torrent-model.h b/src/trg-torrent-model.h index b486737..cc8c695 100644 --- a/src/trg-torrent-model.h +++ b/src/trg-torrent-model.h @@ -45,11 +45,11 @@ G_BEGIN_DECLS typedef struct { GtkListStoreClass parent_class; void (*torrent_completed) (TrgTorrentModel * model, - GtkTreeIter * iter, JsonObject * t, - gpointer data); + GtkTreeIter * iter, JsonObject * t, + gpointer data); void (*torrent_added) (TrgTorrentModel * model, - GtkTreeIter * iter, JsonObject * t, - gpointer data); + GtkTreeIter * iter, JsonObject * t, + gpointer data); } TrgTorrentModelClass; typedef struct { @@ -68,12 +68,12 @@ TrgTorrentModel *trg_torrent_model_new(); G_END_DECLS gboolean find_existing_peer_item(GtkListStore * model, JsonObject * p, - GtkTreeIter * iter); + GtkTreeIter * iter); void trg_torrent_model_update(TrgTorrentModel * model, trg_client * tc, - JsonObject * response, - trg_torrent_model_update_stats * stats, - gboolean first); + JsonObject * response, + trg_torrent_model_update_stats * stats, + gboolean first); enum { TORRENT_COLUMN_ICON, @@ -96,4 +96,4 @@ enum { TORRENT_COLUMN_COLUMNS }; -#endif /* TRG_TORRENT_MODEL_H_ */ +#endif /* TRG_TORRENT_MODEL_H_ */ diff --git a/src/trg-torrent-move-dialog.c b/src/trg-torrent-move-dialog.c index 895b269..9e5df10 100644 --- a/src/trg-torrent-move-dialog.c +++ b/src/trg-torrent-move-dialog.c @@ -29,7 +29,7 @@ #include "dispatch.h" G_DEFINE_TYPE(TrgTorrentMoveDialog, trg_torrent_move_dialog, - GTK_TYPE_DIALOG) + GTK_TYPE_DIALOG) #define TRG_TORRENT_MOVE_DIALOG_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_TORRENT_MOVE_DIALOG, TrgTorrentMoveDialogPrivate)) typedef struct _TrgTorrentMoveDialogPrivate @@ -52,20 +52,20 @@ static void trg_torrent_move_response_cb(GtkDialog * dlg, gint res_id, gpointer data) { TrgTorrentMoveDialogPrivate *priv = - TRG_TORRENT_MOVE_DIALOG_GET_PRIVATE(dlg); + TRG_TORRENT_MOVE_DIALOG_GET_PRIVATE(dlg); if (res_id == GTK_RESPONSE_ACCEPT) { - gchar *location = - gtk_combo_box_get_active_text(GTK_COMBO_BOX - (priv->location_combo)); - JsonNode *request = torrent_set_location(priv->ids, location, - gtk_toggle_button_get_active - (GTK_TOGGLE_BUTTON - (priv->move_check))); - g_free(location); - dispatch_async(priv->client, request, - on_generic_interactive_action, data); + gchar *location = + gtk_combo_box_get_active_text(GTK_COMBO_BOX + (priv->location_combo)); + JsonNode *request = torrent_set_location(priv->ids, location, + gtk_toggle_button_get_active + (GTK_TOGGLE_BUTTON + (priv->move_check))); + g_free(location); + dispatch_async(priv->client, request, + on_generic_interactive_action, data); } else { - json_array_unref(priv->ids); + json_array_unref(priv->ids); } gtk_widget_destroy(GTK_WIDGET(dlg)); } @@ -73,9 +73,9 @@ trg_torrent_move_response_cb(GtkDialog * dlg, gint res_id, gpointer data) static void location_changed(GtkWidget * w, gpointer data) { TrgTorrentMoveDialogPrivate *priv = - TRG_TORRENT_MOVE_DIALOG_GET_PRIVATE(data); + TRG_TORRENT_MOVE_DIALOG_GET_PRIVATE(data); gchar *location = - gtk_combo_box_get_active_text(GTK_COMBO_BOX(priv->location_combo)); + gtk_combo_box_get_active_text(GTK_COMBO_BOX(priv->location_combo)); gtk_widget_set_sensitive(priv->move_button, strlen(location) > 0); g_free(location); } @@ -83,7 +83,7 @@ static void location_changed(GtkWidget * w, gpointer data) static void trg_torrent_move_dialog_init(TrgTorrentMoveDialog * self) { TrgTorrentMoveDialogPrivate *priv = - TRG_TORRENT_MOVE_DIALOG_GET_PRIVATE(self); + TRG_TORRENT_MOVE_DIALOG_GET_PRIVATE(self); GtkWidget *w, *t; gint row = 0; @@ -94,15 +94,15 @@ static void trg_torrent_move_dialog_init(TrgTorrentMoveDialog * self) w = hig_workarea_add_row(t, &row, "Location:", w, NULL); priv->move_check = - hig_workarea_add_wide_checkbutton(t, &row, "Move", TRUE); + hig_workarea_add_wide_checkbutton(t, &row, "Move", TRUE); gtk_window_set_destroy_with_parent(GTK_WINDOW(self), TRUE); gtk_dialog_add_button(GTK_DIALOG(self), GTK_STOCK_CLOSE, - GTK_RESPONSE_CANCEL); + GTK_RESPONSE_CANCEL); priv->move_button = - gtk_dialog_add_button(GTK_DIALOG(self), "Move", - GTK_RESPONSE_ACCEPT); + gtk_dialog_add_button(GTK_DIALOG(self), "Move", + GTK_RESPONSE_ACCEPT); gtk_widget_set_sensitive(priv->move_button, FALSE); gtk_container_set_border_width(GTK_CONTAINER(self), GUI_PAD); @@ -110,8 +110,8 @@ static void trg_torrent_move_dialog_init(TrgTorrentMoveDialog * self) gtk_dialog_set_default_response(GTK_DIALOG(self), GTK_RESPONSE_ACCEPT); gtk_dialog_set_alternative_button_order(GTK_DIALOG(self), - GTK_RESPONSE_ACCEPT, - GTK_RESPONSE_CANCEL, -1); + GTK_RESPONSE_ACCEPT, + GTK_RESPONSE_CANCEL, -1); gtk_container_set_border_width(GTK_CONTAINER(t), GUI_PAD); @@ -119,12 +119,12 @@ static void trg_torrent_move_dialog_init(TrgTorrentMoveDialog * self) } TrgTorrentMoveDialog *trg_torrent_move_dialog_new(TrgMainWindow * win, - trg_client * client, - TrgTorrentTreeView * ttv) + trg_client * client, + TrgTorrentTreeView * ttv) { GObject *obj = g_object_new(TRG_TYPE_TORRENT_MOVE_DIALOG, NULL); TrgTorrentMoveDialogPrivate *priv = - TRG_TORRENT_MOVE_DIALOG_GET_PRIVATE(obj); + TRG_TORRENT_MOVE_DIALOG_GET_PRIVATE(obj); gint count; gchar *msg; @@ -134,33 +134,33 @@ TrgTorrentMoveDialog *trg_torrent_move_dialog_new(TrgMainWindow * win, priv->ids = build_json_id_array(ttv); count = - gtk_tree_selection_count_selected_rows(gtk_tree_view_get_selection - (GTK_TREE_VIEW(ttv))); + gtk_tree_selection_count_selected_rows(gtk_tree_view_get_selection + (GTK_TREE_VIEW(ttv))); if (count == 1) { - GtkTreeIter iter; - JsonObject *json; - gchar *name; - const gchar *current_location; - get_first_selected(client, ttv, &iter, &json); - gtk_tree_model_get(gtk_tree_view_get_model(GTK_TREE_VIEW(ttv)), - &iter, TORRENT_COLUMN_NAME, &name, -1); - current_location = torrent_get_download_dir(json); - gtk_combo_box_append_text(GTK_COMBO_BOX(priv->location_combo), - current_location); - gtk_combo_box_set_active(GTK_COMBO_BOX(priv->location_combo), 0); - msg = g_strdup_printf("Move %s", name); - g_free(name); + GtkTreeIter iter; + JsonObject *json; + gchar *name; + const gchar *current_location; + get_first_selected(client, ttv, &iter, &json); + gtk_tree_model_get(gtk_tree_view_get_model(GTK_TREE_VIEW(ttv)), + &iter, TORRENT_COLUMN_NAME, &name, -1); + current_location = torrent_get_download_dir(json); + gtk_combo_box_append_text(GTK_COMBO_BOX(priv->location_combo), + current_location); + gtk_combo_box_set_active(GTK_COMBO_BOX(priv->location_combo), 0); + msg = g_strdup_printf("Move %s", name); + g_free(name); } else { - msg = g_strdup_printf("Move %d torrents", count); + msg = g_strdup_printf("Move %d torrents", count); } gtk_window_set_transient_for(GTK_WINDOW(obj), GTK_WINDOW(win)); gtk_window_set_title(GTK_WINDOW(obj), msg); g_signal_connect(G_OBJECT(obj), - "response", - G_CALLBACK(trg_torrent_move_response_cb), win); + "response", + G_CALLBACK(trg_torrent_move_response_cb), win); return TRG_TORRENT_MOVE_DIALOG(obj); } diff --git a/src/trg-torrent-move-dialog.h b/src/trg-torrent-move-dialog.h index 3791b1d..34ed63c 100644 --- a/src/trg-torrent-move-dialog.h +++ b/src/trg-torrent-move-dialog.h @@ -49,9 +49,9 @@ typedef struct { GType trg_torrent_move_dialog_get_type(void); TrgTorrentMoveDialog *trg_torrent_move_dialog_new(TrgMainWindow * win, - trg_client * client, - TrgTorrentTreeView * - ttv); + trg_client * client, + TrgTorrentTreeView * + ttv); G_END_DECLS -#endif /* TRG_TORRENT_MOVE_DIALOG_H_ */ +#endif /* TRG_TORRENT_MOVE_DIALOG_H_ */ diff --git a/src/trg-torrent-props-dialog.c b/src/trg-torrent-props-dialog.c index 827e643..266360e 100644 --- a/src/trg-torrent-props-dialog.c +++ b/src/trg-torrent-props-dialog.c @@ -34,7 +34,7 @@ #include "hig.h" G_DEFINE_TYPE(TrgTorrentPropsDialog, trg_torrent_props_dialog, - GTK_TYPE_DIALOG) + GTK_TYPE_DIALOG) enum { PROP_0, @@ -63,51 +63,51 @@ struct _TrgTorrentPropsDialogPrivate { static void trg_torrent_props_dialog_set_property(GObject * object, - guint prop_id, - const GValue * value, - GParamSpec * pspec G_GNUC_UNUSED) + guint prop_id, + const GValue * value, + GParamSpec * pspec G_GNUC_UNUSED) { TrgTorrentPropsDialogPrivate *priv = - TRG_TORRENT_PROPS_DIALOG_GET_PRIVATE(object); + TRG_TORRENT_PROPS_DIALOG_GET_PRIVATE(object); switch (prop_id) { case PROP_PARENT_WINDOW: - priv->parent = g_value_get_object(value); - break; + priv->parent = g_value_get_object(value); + break; case PROP_TREEVIEW: - priv->tv = g_value_get_object(value); - break; + priv->tv = g_value_get_object(value); + break; case PROP_CLIENT: - priv->client = g_value_get_pointer(value); - break; + priv->client = g_value_get_pointer(value); + break; } } static void trg_torrent_props_dialog_get_property(GObject * object, - guint prop_id, - GValue * value, - GParamSpec * pspec G_GNUC_UNUSED) + guint prop_id, + GValue * value, + GParamSpec * pspec G_GNUC_UNUSED) { TrgTorrentPropsDialogPrivate *priv = - TRG_TORRENT_PROPS_DIALOG_GET_PRIVATE(object); + TRG_TORRENT_PROPS_DIALOG_GET_PRIVATE(object); switch (prop_id) { case PROP_TREEVIEW: - g_value_set_object(value, priv->tv); - break; + g_value_set_object(value, priv->tv); + break; case PROP_PARENT_WINDOW: - g_value_set_object(value, priv->parent); - break; + g_value_set_object(value, priv->parent); + break; case PROP_CLIENT: - g_value_set_pointer(value, priv->client); - break; + g_value_set_pointer(value, priv->client); + break; } } static void trg_torrent_props_response_cb(GtkDialog * dlg, gint res_id, - gpointer data G_GNUC_UNUSED) + gpointer data G_GNUC_UNUSED) { TrgTorrentPropsDialogPrivate *priv; JsonNode *request; @@ -116,38 +116,40 @@ trg_torrent_props_response_cb(GtkDialog * dlg, gint res_id, priv = TRG_TORRENT_PROPS_DIALOG_GET_PRIVATE(dlg); if (res_id != GTK_RESPONSE_ACCEPT) { - gtk_widget_destroy(GTK_WIDGET(dlg)); - return; + gtk_widget_destroy(GTK_WIDGET(dlg)); + return; } request = torrent_set(priv->targetIds); args = node_get_arguments(request); gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->honor_limits_check), args); + (priv->honor_limits_check), args); gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->down_limited_check), args); + (priv->down_limited_check), args); gtk_toggle_button_json_out(GTK_TOGGLE_BUTTON - (priv->up_limited_check), args); + (priv->up_limited_check), args); gtk_spin_button_json_int_out(GTK_SPIN_BUTTON - (priv->down_limit_spin), args); + (priv->down_limit_spin), args); gtk_spin_button_json_int_out(GTK_SPIN_BUTTON(priv->up_limit_spin), - args); + args); gtk_spin_button_json_double_out(GTK_SPIN_BUTTON - (priv->seedRatioLimit), args); + (priv->seedRatioLimit), args); json_object_set_int_member(args, FIELD_SEED_RATIO_MODE, - gtk_combo_box_get_active(GTK_COMBO_BOX - (priv->seedRatioMode))); + gtk_combo_box_get_active(GTK_COMBO_BOX + (priv-> + seedRatioMode))); json_object_set_int_member(args, FIELD_BANDWIDTH_PRIORITY, - gtk_combo_box_get_active(GTK_COMBO_BOX - (priv->bandwidthPriorityCombo)) - + 1); + gtk_combo_box_get_active(GTK_COMBO_BOX + (priv-> + bandwidthPriorityCombo)) + + 1); gtk_spin_button_json_int_out(GTK_SPIN_BUTTON - (priv->peer_limit_spin), args); + (priv->peer_limit_spin), args); dispatch_async(priv->client, request, - on_generic_interactive_action, priv->parent); + on_generic_interactive_action, priv->parent); gtk_widget_destroy(GTK_WIDGET(dlg)); } @@ -155,15 +157,15 @@ trg_torrent_props_response_cb(GtkDialog * dlg, gint res_id, static void seed_ratio_mode_changed_cb(GtkWidget * w, gpointer data) { gtk_widget_set_sensitive(GTK_WIDGET(data), - gtk_combo_box_get_active(GTK_COMBO_BOX(w)) - == 1 ? TRUE : FALSE); + gtk_combo_box_get_active(GTK_COMBO_BOX(w)) + == 1 ? TRUE : FALSE); } static GtkWidget *trg_props_limitsPage(TrgTorrentPropsDialog * win, - JsonObject * json) + JsonObject * json) { TrgTorrentPropsDialogPrivate *priv = - TRG_TORRENT_PROPS_DIALOG_GET_PRIVATE(win); + TRG_TORRENT_PROPS_DIALOG_GET_PRIVATE(win); GtkWidget *w, *tb, *t; gint row = 0; @@ -172,10 +174,10 @@ static GtkWidget *trg_props_limitsPage(TrgTorrentPropsDialog * win, hig_workarea_add_section_title(t, &row, "Bandwidth"); w = priv->honor_limits_check = - hig_workarea_add_wide_checkbutton(t, &row, - "Honor global limits", - torrent_get_honors_session_limits - (json)); + hig_workarea_add_wide_checkbutton(t, &row, + "Honor global limits", + torrent_get_honors_session_limits + (json)); widget_set_json_key(w, FIELD_HONORS_SESSION_LIMITS); w = priv->bandwidthPriorityCombo = gtk_combo_box_new_text(); @@ -184,33 +186,33 @@ static GtkWidget *trg_props_limitsPage(TrgTorrentPropsDialog * win, gtk_combo_box_append_text(GTK_COMBO_BOX(w), "Normal"); gtk_combo_box_append_text(GTK_COMBO_BOX(w), "High"); gtk_combo_box_set_active(GTK_COMBO_BOX(w), - torrent_get_bandwidth_priority(json) + 1); + torrent_get_bandwidth_priority(json) + 1); hig_workarea_add_row(t, &row, "Torrent priority:", w, NULL); tb = priv->down_limited_check = gtk_check_button_new_with_mnemonic - ("Limit download speed (Kbps)"); + ("Limit download speed (Kbps)"); widget_set_json_key(tb, FIELD_DOWNLOAD_LIMITED); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tb), - torrent_get_download_limited(json)); + torrent_get_download_limited(json)); w = priv->down_limit_spin = - gtk_spin_button_new_with_range(0, INT_MAX, 5); + gtk_spin_button_new_with_range(0, INT_MAX, 5); widget_set_json_key(w, FIELD_DOWNLOAD_LIMIT); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), - torrent_get_download_limit(json)); + torrent_get_download_limit(json)); hig_workarea_add_row_w(t, &row, tb, w, NULL); tb = priv->up_limited_check = gtk_check_button_new_with_mnemonic - ("Limit upload speed (Kbps)"); + ("Limit upload speed (Kbps)"); widget_set_json_key(tb, FIELD_UPLOAD_LIMITED); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tb), - torrent_get_upload_limited(json)); + torrent_get_upload_limited(json)); w = priv->up_limit_spin = - gtk_spin_button_new_with_range(0, INT_MAX, 5); + gtk_spin_button_new_with_range(0, INT_MAX, 5); widget_set_json_key(w, FIELD_UPLOAD_LIMIT); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), - torrent_get_upload_limit(json)); + torrent_get_upload_limit(json)); hig_workarea_add_row_w(t, &row, tb, w, NULL); hig_workarea_add_section_title(t, &row, "Seeding"); @@ -220,38 +222,38 @@ static GtkWidget *trg_props_limitsPage(TrgTorrentPropsDialog * win, gtk_combo_box_append_text(GTK_COMBO_BOX(w), "Use global settings"); gtk_combo_box_append_text(GTK_COMBO_BOX(w), "Stop seeding at ratio"); gtk_combo_box_append_text(GTK_COMBO_BOX(w), - "Seed regardless of ratio"); + "Seed regardless of ratio"); gtk_combo_box_set_active(GTK_COMBO_BOX(w), - torrent_get_seed_ratio_mode(json)); + torrent_get_seed_ratio_mode(json)); hig_workarea_add_row(t, &row, "Seed ratio mode:", w, NULL); w = priv->seedRatioLimit = - gtk_spin_button_new_with_range(0, INT_MAX, 0.2); + gtk_spin_button_new_with_range(0, INT_MAX, 0.2); gtk_widget_set_sensitive(GTK_WIDGET(w), FALSE); widget_set_json_key(GTK_WIDGET(w), FIELD_SEED_RATIO_LIMIT); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), - torrent_get_seed_ratio_limit(json)); + torrent_get_seed_ratio_limit(json)); hig_workarea_add_row(t, &row, "Seed ratio limit:", w, w); g_signal_connect(G_OBJECT(priv->seedRatioMode), "changed", - G_CALLBACK(seed_ratio_mode_changed_cb), w); + G_CALLBACK(seed_ratio_mode_changed_cb), w); hig_workarea_add_section_title(t, &row, "Peers"); w = priv->peer_limit_spin = - gtk_spin_button_new_with_range(0, INT_MAX, 5); + gtk_spin_button_new_with_range(0, INT_MAX, 5); widget_set_json_key(GTK_WIDGET(w), FIELD_PEER_LIMIT); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), - torrent_get_peer_limit(json)); + torrent_get_peer_limit(json)); hig_workarea_add_row(t, &row, "Peer limit:", w, w); return t; } static GObject *trg_torrent_props_dialog_constructor(GType type, - guint - n_construct_properties, - GObjectConstructParam - * construct_params) + guint + n_construct_properties, + GObjectConstructParam + * construct_params) { GObject *object; TrgTorrentPropsDialogPrivate *priv; @@ -262,9 +264,9 @@ static GObject *trg_torrent_props_dialog_constructor(GType type, GtkWidget *notebook; object = G_OBJECT_CLASS - (trg_torrent_props_dialog_parent_class)->constructor(type, - n_construct_properties, - construct_params); + (trg_torrent_props_dialog_parent_class)->constructor(type, + n_construct_properties, + construct_params); priv = TRG_TORRENT_PROPS_DIALOG_GET_PRIVATE(object); @@ -274,47 +276,47 @@ static GObject *trg_torrent_props_dialog_constructor(GType type, priv->targetIds = build_json_id_array(priv->tv); if (rowCount > 1) { - gchar *windowTitle = - g_strdup_printf("Multiple (%d) torrent properties", - rowCount); - gtk_window_set_title(GTK_WINDOW(object), windowTitle); - g_free(windowTitle); + gchar *windowTitle = + g_strdup_printf("Multiple (%d) torrent properties", + rowCount); + gtk_window_set_title(GTK_WINDOW(object), windowTitle); + g_free(windowTitle); } else if (rowCount == 1) { - gtk_window_set_title(GTK_WINDOW(object), torrent_get_name(json)); + gtk_window_set_title(GTK_WINDOW(object), torrent_get_name(json)); } gtk_window_set_transient_for(GTK_WINDOW(object), priv->parent); gtk_window_set_destroy_with_parent(GTK_WINDOW(object), TRUE); gtk_dialog_add_button(GTK_DIALOG(object), GTK_STOCK_CLOSE, - GTK_RESPONSE_CLOSE); + GTK_RESPONSE_CLOSE); gtk_dialog_add_button(GTK_DIALOG(object), GTK_STOCK_APPLY, - GTK_RESPONSE_ACCEPT); + GTK_RESPONSE_ACCEPT); gtk_container_set_border_width(GTK_CONTAINER(object), GUI_PAD); gtk_dialog_set_default_response(GTK_DIALOG(object), - GTK_RESPONSE_CLOSE); + GTK_RESPONSE_CLOSE); gtk_dialog_set_alternative_button_order(GTK_DIALOG(object), - GTK_RESPONSE_ACCEPT, - GTK_RESPONSE_CLOSE, -1); + GTK_RESPONSE_ACCEPT, + GTK_RESPONSE_CLOSE, -1); g_signal_connect(G_OBJECT(object), - "response", - G_CALLBACK(trg_torrent_props_response_cb), NULL); + "response", + G_CALLBACK(trg_torrent_props_response_cb), NULL); notebook = gtk_notebook_new(); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), - trg_props_limitsPage - (TRG_TORRENT_PROPS_DIALOG(object), json), - gtk_label_new("Limits")); + trg_props_limitsPage + (TRG_TORRENT_PROPS_DIALOG(object), json), + gtk_label_new("Limits")); gtk_container_set_border_width(GTK_CONTAINER(notebook), GUI_PAD); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(object)->vbox), notebook, - TRUE, TRUE, 0); + TRUE, TRUE, 0); return object; } @@ -331,39 +333,39 @@ trg_torrent_props_dialog_class_init(TrgTorrentPropsDialogClass * klass) g_type_class_add_private(klass, sizeof(TrgTorrentPropsDialogPrivate)); g_object_class_install_property(object_class, - PROP_TREEVIEW, - g_param_spec_object - ("torrent-tree-view", - "TrgTorrentTreeView", - "TrgTorrentTreeView", - TRG_TYPE_TORRENT_TREE_VIEW, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + PROP_TREEVIEW, + g_param_spec_object + ("torrent-tree-view", + "TrgTorrentTreeView", + "TrgTorrentTreeView", + TRG_TYPE_TORRENT_TREE_VIEW, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_object_class_install_property(object_class, - PROP_PARENT_WINDOW, - g_param_spec_object - ("parent-window", "Parent window", - "Parent window", GTK_TYPE_WINDOW, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + PROP_PARENT_WINDOW, + g_param_spec_object + ("parent-window", "Parent window", + "Parent window", GTK_TYPE_WINDOW, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); 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)); } static void @@ -373,12 +375,12 @@ trg_torrent_props_dialog_init(TrgTorrentPropsDialog * self G_GNUC_UNUSED) } TrgTorrentPropsDialog *trg_torrent_props_dialog_new(GtkWindow * window, - TrgTorrentTreeView * - treeview, - trg_client * client) + TrgTorrentTreeView * + treeview, + trg_client * client) { return g_object_new(TRG_TYPE_TORRENT_PROPS_DIALOG, - "parent-window", window, - "torrent-tree-view", treeview, - "trg-client", client, NULL); + "parent-window", window, + "torrent-tree-view", treeview, + "trg-client", client, NULL); } diff --git a/src/trg-torrent-props-dialog.h b/src/trg-torrent-props-dialog.h index f1bda78..e8bce84 100644 --- a/src/trg-torrent-props-dialog.h +++ b/src/trg-torrent-props-dialog.h @@ -49,9 +49,9 @@ typedef struct { GType trg_torrent_props_dialog_get_type(void); TrgTorrentPropsDialog *trg_torrent_props_dialog_new(GtkWindow * window, - TrgTorrentTreeView * - treeview, - trg_client * client); + TrgTorrentTreeView * + treeview, + trg_client * client); G_END_DECLS -#endif /* TRG_TORRENT_PROPS_DIALOG_H_ */ +#endif /* TRG_TORRENT_PROPS_DIALOG_H_ */ diff --git a/src/trg-torrent-tree-view.c b/src/trg-torrent-tree-view.c index 8f9e8c4..4f9110a 100644 --- a/src/trg-torrent-tree-view.c +++ b/src/trg-torrent-tree-view.c @@ -24,45 +24,45 @@ #include "trg-torrent-tree-view.h" G_DEFINE_TYPE(TrgTorrentTreeView, trg_torrent_tree_view, - TRG_TYPE_TREE_VIEW) + TRG_TYPE_TREE_VIEW) static void trg_torrent_tree_view_class_init(TrgTorrentTreeViewClass * - klass G_GNUC_UNUSED) + klass G_GNUC_UNUSED) { } static void trg_torrent_tree_view_init(TrgTorrentTreeView * tv) { trg_tree_view_add_pixbuf_text_column(TRG_TREE_VIEW(tv), - TORRENT_COLUMN_ICON, - TORRENT_COLUMN_NAME, "Name", 300); + TORRENT_COLUMN_ICON, + TORRENT_COLUMN_NAME, "Name", 300); trg_tree_view_add_size_column(TRG_TREE_VIEW(tv), "Size", - TORRENT_COLUMN_SIZE, -1); + TORRENT_COLUMN_SIZE, -1); trg_tree_view_add_prog_column(TRG_TREE_VIEW(tv), "Done", - TORRENT_COLUMN_DONE, 70); + TORRENT_COLUMN_DONE, 70); trg_tree_view_add_column(TRG_TREE_VIEW(tv), "Status", - TORRENT_COLUMN_STATUS); + TORRENT_COLUMN_STATUS); trg_tree_view_add_column(TRG_TREE_VIEW(tv), "Seeds", - TORRENT_COLUMN_SEEDS); + TORRENT_COLUMN_SEEDS); trg_tree_view_add_column(TRG_TREE_VIEW(tv), "Leechers", - TORRENT_COLUMN_LEECHERS); + TORRENT_COLUMN_LEECHERS); trg_tree_view_add_speed_column(TRG_TREE_VIEW(tv), "Down Speed", - TORRENT_COLUMN_DOWNSPEED, -1); + TORRENT_COLUMN_DOWNSPEED, -1); trg_tree_view_add_speed_column(TRG_TREE_VIEW(tv), "Up Speed", - TORRENT_COLUMN_UPSPEED, -1); + TORRENT_COLUMN_UPSPEED, -1); trg_tree_view_add_eta_column(TRG_TREE_VIEW(tv), "ETA", - TORRENT_COLUMN_ETA, -1); + TORRENT_COLUMN_ETA, -1); trg_tree_view_add_size_column(TRG_TREE_VIEW(tv), "Uploaded", - TORRENT_COLUMN_UPLOADED, -1); + TORRENT_COLUMN_UPLOADED, -1); trg_tree_view_add_size_column(TRG_TREE_VIEW(tv), "Downloaded", - TORRENT_COLUMN_DOWNLOADED, -1); + TORRENT_COLUMN_DOWNLOADED, -1); trg_tree_view_add_ratio_column(TRG_TREE_VIEW(tv), "Ratio", - TORRENT_COLUMN_RATIO, -1); + TORRENT_COLUMN_RATIO, -1); } gint get_first_selected(trg_client * client, TrgTorrentTreeView * view, - GtkTreeIter * iter, JsonObject ** json) + GtkTreeIter * iter, JsonObject ** json) { GtkTreeModel *model; GtkTreeSelection *selection; @@ -77,16 +77,16 @@ gint get_first_selected(trg_client * client, TrgTorrentTreeView * view, selectionList = gtk_tree_selection_get_selected_rows(selection, NULL); if ((firstNode = g_list_first(selectionList)) != NULL) { - if (gtk_tree_model_get_iter(model, iter, firstNode->data) == TRUE) { - gtk_tree_model_get(model, iter, - TORRENT_COLUMN_JSON, json, - TORRENT_COLUMN_ID, &id, - TORRENT_COLUMN_UPDATESERIAL, &updateSerial, - -1); - - if (updateSerial < client->updateSerial) - id = -1; - } + if (gtk_tree_model_get_iter(model, iter, firstNode->data) == TRUE) { + gtk_tree_model_get(model, iter, + TORRENT_COLUMN_JSON, json, + TORRENT_COLUMN_ID, &id, + TORRENT_COLUMN_UPDATESERIAL, &updateSerial, + -1); + + if (updateSerial < client->updateSerial) + id = -1; + } } g_list_free(selectionList); @@ -96,10 +96,10 @@ gint get_first_selected(trg_client * client, TrgTorrentTreeView * view, static void trg_torrent_model_get_json_id_array_foreach(GtkTreeModel * model, - GtkTreePath * - path G_GNUC_UNUSED, - GtkTreeIter * iter, - gpointer data) + GtkTreePath * + path G_GNUC_UNUSED, + GtkTreeIter * iter, + gpointer data) { JsonArray *output = (JsonArray *) data; gint64 id; @@ -110,13 +110,13 @@ trg_torrent_model_get_json_id_array_foreach(GtkTreeModel * model, JsonArray *build_json_id_array(TrgTorrentTreeView * tv) { GtkTreeSelection *selection = - gtk_tree_view_get_selection(GTK_TREE_VIEW(tv)); + gtk_tree_view_get_selection(GTK_TREE_VIEW(tv)); JsonArray *ids = json_array_new(); gtk_tree_selection_selected_foreach(selection, - (GtkTreeSelectionForeachFunc) - trg_torrent_model_get_json_id_array_foreach, - ids); + (GtkTreeSelectionForeachFunc) + trg_torrent_model_get_json_id_array_foreach, + ids); return ids; } diff --git a/src/trg-torrent-tree-view.h b/src/trg-torrent-tree-view.h index 50f3f82..bb6aa8e 100644 --- a/src/trg-torrent-tree-view.h +++ b/src/trg-torrent-tree-view.h @@ -52,7 +52,7 @@ GType trg_torrent_tree_view_get_type(void); TrgTorrentTreeView *trg_torrent_tree_view_new(GtkTreeModel * model); JsonArray *build_json_id_array(TrgTorrentTreeView * tv); gint get_first_selected(trg_client * client, TrgTorrentTreeView * view, - GtkTreeIter * iter, JsonObject ** json); + GtkTreeIter * iter, JsonObject ** json); G_END_DECLS -#endif /* _TRG_TORRENT_TREE_VIEW_H_ */ +#endif /* _TRG_TORRENT_TREE_VIEW_H_ */ diff --git a/src/trg-trackers-model.c b/src/trg-trackers-model.c index 500adcd..6e2a888 100644 --- a/src/trg-trackers-model.c +++ b/src/trg-trackers-model.c @@ -19,7 +19,6 @@ #include <gtk/gtk.h> #include <json-glib/json-glib.h> -#include <glib/gprintf.h> #include "config.h" #include "torrent.h" @@ -27,7 +26,6 @@ #include "trg-trackers-model.h" G_DEFINE_TYPE(TrgTrackersModel, trg_trackers_model, GTK_TYPE_LIST_STORE) - #define TRG_TRACKERS_MODEL_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRG_TYPE_TRACKERS_MODEL, TrgTrackersModelPrivate)) typedef struct _TrgTrackersModelPrivate TrgTrackersModelPrivate; @@ -39,8 +37,8 @@ struct _TrgTrackersModelPrivate { void trg_trackers_model_set_no_selection(TrgTrackersModel * model) { - TrgTrackersModelPrivate *priv = TRG_TRACKERS_MODEL_GET_PRIVATE(model); - priv->torrentId = -1; + TrgTrackersModelPrivate *priv = TRG_TRACKERS_MODEL_GET_PRIVATE(model); + priv->torrentId = -1; } gint64 trg_trackers_model_get_torrent_id(TrgTrackersModel * model) @@ -49,9 +47,11 @@ gint64 trg_trackers_model_get_torrent_id(TrgTrackersModel * model) return priv->torrentId; } -void trg_trackers_model_update(TrgTrackersModel * model, gint64 updateSerial, JsonObject * t, gboolean first) +void trg_trackers_model_update(TrgTrackersModel * model, + gint64 updateSerial, JsonObject * t, + gboolean first) { - TrgTrackersModelPrivate *priv = TRG_TRACKERS_MODEL_GET_PRIVATE(model); + TrgTrackersModelPrivate *priv = TRG_TRACKERS_MODEL_GET_PRIVATE(model); guint j; JsonArray *trackers; @@ -59,62 +59,67 @@ void trg_trackers_model_update(TrgTrackersModel * model, gint64 updateSerial, Js const gchar *scrape; if (first) { - gtk_list_store_clear(GTK_LIST_STORE(model)); - priv->torrentId = torrent_get_id(t); - } else if (priv->updateBarrier == TRACKERS_UPDATE_BARRIER_FULL || (priv->updateBarrier >= 0 && priv->updateBarrier > updateSerial)) { - return; + gtk_list_store_clear(GTK_LIST_STORE(model)); + priv->torrentId = torrent_get_id(t); + } else if (priv->updateBarrier == TRACKERS_UPDATE_BARRIER_FULL + || (priv->updateBarrier >= 0 + && priv->updateBarrier > updateSerial)) { + return; } trackers = torrent_get_trackers(t); for (j = 0; j < json_array_get_length(trackers); j++) { - GtkTreeIter trackIter; - JsonObject *tracker = - json_node_get_object(json_array_get_element(trackers, j)); - gint64 trackerId = tracker_get_id(tracker); + GtkTreeIter trackIter; + JsonObject *tracker = + json_node_get_object(json_array_get_element(trackers, j)); + gint64 trackerId = tracker_get_id(tracker); - announce = tracker_get_announce(tracker); - scrape = tracker_get_scrape(tracker); + announce = tracker_get_announce(tracker); + scrape = tracker_get_scrape(tracker); - if (first || find_existing_model_item(GTK_TREE_MODEL(model), TRACKERCOL_ID, trackerId, &trackIter) == FALSE) - gtk_list_store_append(GTK_LIST_STORE(model), &trackIter); + if (first + || find_existing_model_item(GTK_TREE_MODEL(model), + TRACKERCOL_ID, trackerId, + &trackIter) == FALSE) + gtk_list_store_append(GTK_LIST_STORE(model), &trackIter); #ifdef DEBUG - gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, - TRACKERCOL_ICON, GTK_STOCK_NETWORK, -1); - gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, - TRACKERCOL_TIER, tracker_get_tier(tracker), -1); - gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, - TRACKERCOL_ANNOUNCE, announce, -1); - gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, - TRACKERCOL_SCRAPE, scrape, -1); - gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, TRACKERCOL_ID, trackerId, -1); - gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, TRACKERCOL_UPDATESERIAL, updateSerial, -1); + gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, + TRACKERCOL_ICON, GTK_STOCK_NETWORK, -1); + gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, + TRACKERCOL_TIER, tracker_get_tier(tracker), -1); + gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, + TRACKERCOL_ANNOUNCE, announce, -1); + gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, + TRACKERCOL_SCRAPE, scrape, -1); + gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, + TRACKERCOL_ID, trackerId, -1); + gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, + TRACKERCOL_UPDATESERIAL, updateSerial, -1); #else - gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, - TRACKERCOL_ICON, GTK_STOCK_NETWORK, - TRACKERCOL_ID, trackerId, - TRACKERCOL_UPDATESERIAL, updateSerial, - TRACKERCOL_TIER, - tracker_get_tier(tracker), - TRACKERCOL_ANNOUNCE, - announce, TRACKERCOL_SCRAPE, scrape, -1); + gtk_list_store_set(GTK_LIST_STORE(model), &trackIter, + TRACKERCOL_ICON, GTK_STOCK_NETWORK, + TRACKERCOL_ID, trackerId, + TRACKERCOL_UPDATESERIAL, updateSerial, + TRACKERCOL_TIER, + tracker_get_tier(tracker), + TRACKERCOL_ANNOUNCE, + announce, TRACKERCOL_SCRAPE, scrape, -1); #endif } trg_model_remove_removed(GTK_LIST_STORE(model), - TRACKERCOL_UPDATESERIAL, - updateSerial); + TRACKERCOL_UPDATESERIAL, updateSerial); } -static void -trg_trackers_model_class_init(TrgTrackersModelClass * klass) +static void trg_trackers_model_class_init(TrgTrackersModelClass * klass) { - g_type_class_add_private(klass, sizeof(TrgTrackersModelPrivate)); + g_type_class_add_private(klass, sizeof(TrgTrackersModelPrivate)); } void trg_trackers_model_set_update_barrier(TrgTrackersModel * model, - gint64 barrier) + gint64 barrier) { TrgTrackersModelPrivate *priv = TRG_TRACKERS_MODEL_GET_PRIVATE(model); priv->updateBarrier = barrier; @@ -122,7 +127,7 @@ void trg_trackers_model_set_update_barrier(TrgTrackersModel * model, static void trg_trackers_model_init(TrgTrackersModel * self) { - TrgTrackersModelPrivate *priv = TRG_TRACKERS_MODEL_GET_PRIVATE(self); + TrgTrackersModelPrivate *priv = TRG_TRACKERS_MODEL_GET_PRIVATE(self); GType column_types[TRACKERCOL_COLUMNS]; @@ -137,7 +142,7 @@ static void trg_trackers_model_init(TrgTrackersModel * self) priv->torrentId = -1; gtk_list_store_set_column_types(GTK_LIST_STORE(self), - TRACKERCOL_COLUMNS, column_types); + TRACKERCOL_COLUMNS, column_types); } TrgTrackersModel *trg_trackers_model_new(void) diff --git a/src/trg-trackers-model.h b/src/trg-trackers-model.h index 735249b..ab60eff 100644 --- a/src/trg-trackers-model.h +++ b/src/trg-trackers-model.h @@ -51,10 +51,11 @@ GType trg_trackers_model_get_type(void); TrgTrackersModel *trg_trackers_model_new(void); G_END_DECLS - -void trg_trackers_model_update(TrgTrackersModel * model, gint64 updateSerial, JsonObject * t, gboolean first); + void trg_trackers_model_update(TrgTrackersModel * model, + gint64 updateSerial, JsonObject * t, + gboolean first); void trg_trackers_model_set_update_barrier(TrgTrackersModel * model, - gint64 serial); + gint64 serial); gint64 trg_trackers_model_get_torrent_id(TrgTrackersModel * model); void trg_trackers_model_set_no_selection(TrgTrackersModel * model); @@ -68,4 +69,4 @@ enum { TRACKERCOL_COLUMNS }; -#endif /* TRG_TRACKERS_MODEL_H_ */ +#endif /* TRG_TRACKERS_MODEL_H_ */ diff --git a/src/trg-trackers-tree-view.c b/src/trg-trackers-tree-view.c index 6d9bbdd..3ed4d4d 100644 --- a/src/trg-trackers-tree-view.c +++ b/src/trg-trackers-tree-view.c @@ -30,31 +30,30 @@ #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; struct _TrgTrackersTreeViewPrivate { trg_client *client; GtkCellRenderer *announceRenderer; + GtkTreeViewColumn *announceColumn; TrgMainWindow *win; }; static void -trg_trackers_tree_view_class_init(TrgTrackersTreeViewClass *klass) +trg_trackers_tree_view_class_init(TrgTrackersTreeViewClass * klass) { - g_type_class_add_private(klass, sizeof(TrgTrackersTreeViewPrivate)); + g_type_class_add_private(klass, sizeof(TrgTrackersTreeViewPrivate)); } static void trg_trackers_tree_view_json_id_array_foreach(GtkTreeModel * model, - GtkTreePath * - path G_GNUC_UNUSED, - GtkTreeIter * iter, - gpointer data) + GtkTreePath * + path G_GNUC_UNUSED, + GtkTreeIter * iter, + gpointer data) { JsonArray *output = (JsonArray *) data; gint64 id; @@ -65,205 +64,271 @@ trg_trackers_tree_view_json_id_array_foreach(GtkTreeModel * model, static JsonArray *trackers_build_json_id_array(TrgTrackersTreeView * tv) { GtkTreeSelection *selection = - gtk_tree_view_get_selection(GTK_TREE_VIEW(tv)); + gtk_tree_view_get_selection(GTK_TREE_VIEW(tv)); JsonArray *ids = json_array_new(); gtk_tree_selection_selected_foreach(selection, - (GtkTreeSelectionForeachFunc) - trg_trackers_tree_view_json_id_array_foreach, - ids); - - if (json_array_get_length(ids) < 1) - { - json_array_unref(ids); - return NULL; + (GtkTreeSelectionForeachFunc) + trg_trackers_tree_view_json_id_array_foreach, + ids); + + if (json_array_get_length(ids) < 1) { + json_array_unref(ids); + return NULL; } return ids; } -void trg_trackers_tree_view_new_connection(TrgTrackersTreeView *tv, trg_client *tc) +void trg_trackers_tree_view_new_connection(TrgTrackersTreeView * tv, + trg_client * tc) { - TrgTrackersTreeViewPrivate *priv = TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(tv); - gboolean editable = trg_client_supports_tracker_edit(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); + TrgTrackersTreeViewPrivate *priv = + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(tv); + gboolean editable = trg_client_supports_tracker_edit(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); } -static void trg_tracker_announce_edited(GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - gpointer user_data) +static void trg_tracker_announce_edited(GtkCellRendererText * renderer, + gchar * path, + gchar * new_text, + gpointer user_data) { - TrgTrackersTreeViewPrivate *priv = TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(user_data); - GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(user_data)); - gint64 torrentId = trg_trackers_model_get_torrent_id(TRG_TRACKERS_MODEL(model)); - JsonArray *torrentIds = json_array_new(); - JsonArray *modPairs = json_array_new(); - - gint64 trackerId; - JsonNode *req; - JsonObject *args; - GtkTreeIter iter; - - gtk_tree_model_get_iter_from_string(model, &iter, path); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, TRACKERCOL_ANNOUNCE, new_text, -1); - gtk_tree_model_get(model, &iter, TRACKERCOL_ID, &trackerId, -1); - - json_array_add_int_element(torrentIds, torrentId); - - req = torrent_set(torrentIds); - args = node_get_arguments(req); - - json_array_add_int_element(modPairs, trackerId); - json_array_add_string_element(modPairs, new_text); + TrgTrackersTreeViewPrivate *priv = + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(user_data); + GtkTreeModel *model = + gtk_tree_view_get_model(GTK_TREE_VIEW(user_data)); + gint64 torrentId = + trg_trackers_model_get_torrent_id(TRG_TRACKERS_MODEL(model)); + JsonArray *torrentIds = json_array_new(); + JsonArray *trackerModifiers = json_array_new(); + + gint64 trackerId; + JsonNode *req; + JsonObject *args; + GtkTreeIter iter; + gchar *icon; + + gtk_tree_model_get_iter_from_string(model, &iter, path); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, TRACKERCOL_ANNOUNCE, + new_text, -1); + gtk_tree_model_get(model, &iter, TRACKERCOL_ID, &trackerId, + TRACKERCOL_ICON, &icon, -1); + + json_array_add_int_element(torrentIds, torrentId); + + req = torrent_set(torrentIds); + args = node_get_arguments(req); + + if (g_strcmp0(icon, GTK_STOCK_ADD) == 0) { + 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_object_set_array_member(args, "trackerReplace", modPairs); + g_free(icon); - trg_trackers_model_set_update_barrier(TRG_TRACKERS_MODEL(model), priv->client->updateSerial+1); + trg_trackers_model_set_update_barrier(TRG_TRACKERS_MODEL(model), + priv->client->updateSerial + 1); - dispatch_async(priv->client, req, on_generic_interactive_action, priv->win); + dispatch_async(priv->client, req, on_generic_interactive_action, + priv->win); } -static void trg_tracker_announce_editing_started(GtkCellRenderer *renderer, - GtkCellEditable *editable, - gchar *path, - gpointer user_data) +static void trg_tracker_announce_editing_started(GtkCellRenderer * + renderer, + GtkCellEditable * + editable, gchar * path, + gpointer user_data) { - TrgTrackersModel *model = TRG_TRACKERS_MODEL(gtk_tree_view_get_model(GTK_TREE_VIEW(user_data))); - trg_trackers_model_set_update_barrier(model, TRACKERS_UPDATE_BARRIER_FULL); + TrgTrackersModel *model = + TRG_TRACKERS_MODEL(gtk_tree_view_get_model + (GTK_TREE_VIEW(user_data))); + trg_trackers_model_set_update_barrier(model, + TRACKERS_UPDATE_BARRIER_FULL); } -static void trg_tracker_announce_editing_canceled(GtkWidget *w, gpointer data) +static void trg_tracker_announce_editing_canceled(GtkWidget * w, + gpointer data) { - TrgTrackersTreeViewPrivate *priv = TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(data); - TrgTrackersModel *model = TRG_TRACKERS_MODEL(gtk_tree_view_get_model(GTK_TREE_VIEW(data))); + TrgTrackersTreeViewPrivate *priv = + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(data); + TrgTrackersModel *model = + TRG_TRACKERS_MODEL(gtk_tree_view_get_model(GTK_TREE_VIEW(data))); - trg_trackers_model_set_update_barrier(model, priv->client->updateSerial+1); + trg_trackers_model_set_update_barrier(model, + priv->client->updateSerial + 1); } static void trg_trackers_tree_view_init(TrgTrackersTreeView * self) { - TrgTrackersTreeViewPrivate *priv = TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(self); + TrgTrackersTreeViewPrivate *priv = + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(self); trg_tree_view_add_pixbuf_text_column(TRG_TREE_VIEW(self), - TRACKERCOL_ICON, - TRACKERCOL_TIER, "Tier", -1); - - priv->announceRenderer = trg_tree_view_add_column(TRG_TREE_VIEW(self), "Announce URL", - TRACKERCOL_ANNOUNCE); - g_signal_connect(priv->announceRenderer, "edited", G_CALLBACK(trg_tracker_announce_edited), self); - g_signal_connect(priv->announceRenderer, "editing-canceled", G_CALLBACK(trg_tracker_announce_editing_canceled), self); - g_signal_connect(priv->announceRenderer, "editing-started", G_CALLBACK(trg_tracker_announce_editing_started), self); + TRACKERCOL_ICON, + TRACKERCOL_TIER, "Tier", -1); + + priv->announceRenderer = gtk_cell_renderer_text_new(); + g_signal_connect(priv->announceRenderer, "edited", + G_CALLBACK(trg_tracker_announce_edited), self); + g_signal_connect(priv->announceRenderer, "editing-canceled", + G_CALLBACK(trg_tracker_announce_editing_canceled), + self); + g_signal_connect(priv->announceRenderer, "editing-started", + G_CALLBACK(trg_tracker_announce_editing_started), + self); + + priv->announceColumn = + gtk_tree_view_column_new_with_attributes("Announce URL", + priv->announceRenderer, + "text", + TRACKERCOL_ANNOUNCE, + NULL); + + trg_tree_view_std_column_setup(priv->announceColumn, + TRACKERCOL_ANNOUNCE, -1); + gtk_tree_view_append_column(GTK_TREE_VIEW(self), priv->announceColumn); trg_tree_view_add_column(TRG_TREE_VIEW(self), "Scrape URL", - TRACKERCOL_SCRAPE); + TRACKERCOL_SCRAPE); } -static void add_tracker(GtkWidget *w, gpointer data) +static void add_tracker(GtkWidget * w, gpointer data) { - GtkTreeView *tv = GTK_TREE_VIEW(data); - GtkTreeModel *model = gtk_tree_view_get_model(tv); - GtkTreeIter iter; + GtkTreeView *tv = GTK_TREE_VIEW(data); + TrgTrackersTreeViewPrivate *priv = + 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_append(GTK_LIST_STORE(model), &iter); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, TRACKERCOL_ICON, + GTK_STOCK_ADD, -1); + + path = gtk_tree_model_get_path(model, &iter); + gtk_tree_view_set_cursor(tv, path, priv->announceColumn, TRUE); + gtk_tree_path_free(path); } -static void delete_tracker(GtkWidget *w, gpointer data) +static void delete_tracker(GtkWidget * w, gpointer data) { - TrgTrackersTreeViewPrivate *priv = TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(data); - TrgTrackersTreeView *tv = TRG_TRACKERS_TREE_VIEW(data); - TrgTrackersModel *model = TRG_TRACKERS_MODEL(gtk_tree_view_get_model(GTK_TREE_VIEW(data))); - - JsonArray *trackerIds, *torrentIds; - JsonNode *req; - JsonObject *args; + TrgTrackersTreeViewPrivate *priv = + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(data); + TrgTrackersTreeView *tv = TRG_TRACKERS_TREE_VIEW(data); + TrgTrackersModel *model = + TRG_TRACKERS_MODEL(gtk_tree_view_get_model(GTK_TREE_VIEW(data))); - if ((trackerIds = trackers_build_json_id_array(tv)) == NULL) - return; + JsonArray *trackerIds, *torrentIds; + JsonNode *req; + JsonObject *args; - torrentIds = json_array_new(); - json_array_add_int_element(torrentIds, trg_trackers_model_get_torrent_id(model)); + if ((trackerIds = trackers_build_json_id_array(tv)) == NULL) + return; - req = torrent_set(torrentIds); + torrentIds = json_array_new(); + json_array_add_int_element(torrentIds, + trg_trackers_model_get_torrent_id(model)); - args = node_get_arguments(req); + req = torrent_set(torrentIds); + args = node_get_arguments(req); - json_object_set_array_member(args, "trackerRemove", trackerIds); + json_object_set_array_member(args, "trackerRemove", trackerIds); - dispatch_async(priv->client, req, on_generic_interactive_action, priv->win); + dispatch_async(priv->client, req, on_generic_interactive_action, + priv->win); } 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); - g_signal_connect(menuitem, "activate", G_CALLBACK(add_tracker), treeview); + menuitem = + trg_menu_bar_item_new(GTK_MENU_SHELL(menu), "Add", GTK_STOCK_ADD, + TRUE); + g_signal_connect(menuitem, "activate", G_CALLBACK(add_tracker), + 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); - g_signal_connect(menuitem, "activate", G_CALLBACK(delete_tracker), treeview); + menuitem = + trg_menu_bar_item_new(GTK_MENU_SHELL(menu), "Delete", + GTK_STOCK_DELETE, TRUE); + g_signal_connect(menuitem, "activate", G_CALLBACK(delete_tracker), + treeview); - menuitem = trg_menu_bar_item_new(GTK_MENU_SHELL(menu), "Add", GTK_STOCK_ADD, TRUE); - g_signal_connect(menuitem, "activate", G_CALLBACK(add_tracker), treeview); + menuitem = + trg_menu_bar_item_new(GTK_MENU_SHELL(menu), "Add", GTK_STOCK_ADD, + TRUE); + g_signal_connect(menuitem, "activate", G_CALLBACK(add_tracker), + 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); - TrgTrackersModel *model = TRG_TRACKERS_MODEL(gtk_tree_view_get_model(GTK_TREE_VIEW(treeview))); + TrgTrackersTreeViewPrivate *priv = + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(treeview); + TrgTrackersModel *model = + TRG_TRACKERS_MODEL(gtk_tree_view_get_model + (GTK_TREE_VIEW(treeview))); GtkTreeSelection *selection; GtkTreePath *path; if (!trg_client_supports_tracker_edit(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); - return TRUE; - } else if (trg_trackers_model_get_torrent_id(model) >= 0) { - view_popup_menu_add_only(treeview, event, userdata); - } + 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); + return TRUE; + } else if (trg_trackers_model_get_torrent_id(model) >= 0) { + view_popup_menu_add_only(treeview, event, userdata); + } } return FALSE; @@ -275,15 +340,18 @@ static gboolean view_onPopupMenu(GtkWidget * treeview, gpointer userdata) return TRUE; } -TrgTrackersTreeView *trg_trackers_tree_view_new(TrgTrackersModel * model, trg_client *client, TrgMainWindow *win) +TrgTrackersTreeView *trg_trackers_tree_view_new(TrgTrackersModel * model, + trg_client * client, + TrgMainWindow * win) { GObject *obj = g_object_new(TRG_TYPE_TRACKERS_TREE_VIEW, NULL); - TrgTrackersTreeViewPrivate *priv = TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(obj); + TrgTrackersTreeViewPrivate *priv = + TRG_TRACKERS_TREE_VIEW_GET_PRIVATE(obj); 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; diff --git a/src/trg-trackers-tree-view.h b/src/trg-trackers-tree-view.h index 0f03bfa..a6e61ae 100644 --- a/src/trg-trackers-tree-view.h +++ b/src/trg-trackers-tree-view.h @@ -50,8 +50,11 @@ typedef struct { GType trg_trackers_tree_view_get_type(void); -TrgTrackersTreeView *trg_trackers_tree_view_new(TrgTrackersModel * model, trg_client *client, TrgMainWindow *win); -void trg_trackers_tree_view_new_connection(TrgTrackersTreeView *tv, trg_client *tc); +TrgTrackersTreeView *trg_trackers_tree_view_new(TrgTrackersModel * model, + trg_client * client, + TrgMainWindow * win); +void trg_trackers_tree_view_new_connection(TrgTrackersTreeView * tv, + trg_client * tc); G_END_DECLS -#endif /* TRG_TRACKERS_TREE_VIEW_H_ */ +#endif /* TRG_TRACKERS_TREE_VIEW_H_ */ diff --git a/src/trg-tree-view.c b/src/trg-tree-view.c index e92bdbc..14ac8d3 100644 --- a/src/trg-tree-view.c +++ b/src/trg-tree-view.c @@ -28,16 +28,16 @@ G_DEFINE_TYPE(TrgTreeView, trg_tree_view, GTK_TYPE_TREE_VIEW) void trg_tree_view_std_column_setup(GtkTreeViewColumn * column, int index, - int width) + int width) { gtk_tree_view_column_set_resizable(column, TRUE); gtk_tree_view_column_set_reorderable(column, TRUE); gtk_tree_view_column_set_sort_column_id(column, index); if (width > 0) { - gtk_tree_view_column_set_sizing(column, - GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_fixed_width(column, width); + gtk_tree_view_column_set_sizing(column, + GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_fixed_width(column, width); } } @@ -52,96 +52,97 @@ static void trg_tree_view_init(TrgTreeView * tv) gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(tv), TRUE); gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tv), TRUE); gtk_tree_selection_set_mode(gtk_tree_view_get_selection - (GTK_TREE_VIEW(tv)), - GTK_SELECTION_MULTIPLE); + (GTK_TREE_VIEW(tv)), + GTK_SELECTION_MULTIPLE); gtk_widget_set_sensitive(GTK_WIDGET(tv), FALSE); } void trg_tree_view_add_size_column(TrgTreeView * tv, char *title, - int index, int width) + int index, int width) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; renderer = trg_cell_renderer_size_new(); column = gtk_tree_view_column_new_with_attributes(title, renderer, - "size-value", - index, NULL); + "size-value", + index, NULL); trg_tree_view_std_column_setup(column, index, width); gtk_tree_view_append_column(GTK_TREE_VIEW(tv), column); } void trg_tree_view_add_eta_column(TrgTreeView * tv, char *title, int index, - int width) + int width) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; renderer = trg_cell_renderer_eta_new(); column = gtk_tree_view_column_new_with_attributes(title, renderer, - "eta-value", - index, NULL); + "eta-value", + index, NULL); trg_tree_view_std_column_setup(column, index, width); gtk_tree_view_append_column(GTK_TREE_VIEW(tv), column); } void trg_tree_view_add_prog_column(TrgTreeView * tv, - gchar * title, gint index, gint width) + gchar * title, gint index, gint width) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; renderer = gtk_cell_renderer_progress_new(); column = gtk_tree_view_column_new_with_attributes(title, renderer, - "value", index, - NULL); + "value", index, + NULL); trg_tree_view_std_column_setup(column, index, width); gtk_tree_view_append_column(GTK_TREE_VIEW(tv), column); } void trg_tree_view_add_speed_column(TrgTreeView * tv, char *title, - int index, int width) + int index, int width) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; renderer = trg_cell_renderer_speed_new(); column = gtk_tree_view_column_new_with_attributes(title, renderer, - "speed-value", - index, NULL); + "speed-value", + index, NULL); trg_tree_view_std_column_setup(column, index, width); gtk_tree_view_append_column(GTK_TREE_VIEW(tv), column); } void trg_tree_view_add_ratio_column(TrgTreeView * tv, char *title, - int index, int width) + int index, int width) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; renderer = trg_cell_renderer_ratio_new(); column = gtk_tree_view_column_new_with_attributes(title, renderer, - "ratio-value", - index, NULL); + "ratio-value", + index, NULL); trg_tree_view_std_column_setup(column, index, width); gtk_tree_view_append_column(GTK_TREE_VIEW(tv), column); } -GtkCellRenderer *trg_tree_view_add_column_fixed_width(TrgTreeView * tv, char *title, - int index, int width) +GtkCellRenderer *trg_tree_view_add_column_fixed_width(TrgTreeView * tv, + char *title, + int index, int width) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes(title, renderer, - "text", index, NULL); + "text", index, NULL); trg_tree_view_std_column_setup(column, index, width); gtk_tree_view_append_column(GTK_TREE_VIEW(tv), column); @@ -151,9 +152,9 @@ GtkCellRenderer *trg_tree_view_add_column_fixed_width(TrgTreeView * tv, char *ti void trg_tree_view_add_pixbuf_text_column(TrgTreeView * tv, - int iconIndex, - int nameIndex, - gchar * text, int width) + int iconIndex, + int nameIndex, + gchar * text, int width) { GtkTreeViewColumn *column; GtkCellRenderer *renderer; @@ -164,12 +165,12 @@ trg_tree_view_add_pixbuf_text_column(TrgTreeView * tv, gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(column), text); gtk_tree_view_column_pack_start(column, renderer, FALSE); gtk_tree_view_column_set_attributes(column, renderer, "stock-id", - iconIndex, NULL); + iconIndex, NULL); renderer = gtk_cell_renderer_text_new(); gtk_tree_view_column_pack_start(column, renderer, TRUE); gtk_tree_view_column_set_attributes(column, renderer, "text", - nameIndex, NULL); + nameIndex, NULL); trg_tree_view_std_column_setup(column, nameIndex, width); gtk_tree_view_append_column(GTK_TREE_VIEW(tv), column); diff --git a/src/trg-tree-view.h b/src/trg-tree-view.h index fe225fe..0c59f36 100644 --- a/src/trg-tree-view.h +++ b/src/trg-tree-view.h @@ -48,27 +48,29 @@ GtkWidget *trg_tree_view_new(void); G_END_DECLS #define trg_tree_view_add_column(tv, title, index) trg_tree_view_add_column_fixed_width(tv, title, index, -1) -GtkCellRenderer *trg_tree_view_add_column_fixed_width(TrgTreeView * treeview, - char *title, int index, - int width); + GtkCellRenderer * trg_tree_view_add_column_fixed_width(TrgTreeView * + treeview, + char *title, + int index, + int width); void trg_tree_view_add_pixbuf_text_column(TrgTreeView * - treeview, - int iconIndex, - int nameIndex, - gchar * text, int width); + treeview, + int iconIndex, + int nameIndex, + gchar * text, int width); void trg_tree_view_add_speed_column(TrgTreeView * tv, char *title, - int index, int width); + int index, int width); void trg_tree_view_add_size_column(TrgTreeView * tv, char *title, - int index, int width); + int index, int width); void trg_tree_view_add_prog_column(TrgTreeView * tv, gchar * title, - gint index, gint width); + gint index, gint width); void trg_tree_view_add_ratio_column(TrgTreeView * tv, char *title, - int index, int width); + int index, int width); void trg_tree_view_add_eta_column(TrgTreeView * tv, char *title, int index, - int width); + int width); void trg_tree_view_std_column_setup(GtkTreeViewColumn * column, int index, - int width); + int width); -#endif /* _TRG_TREE_VIEW_H_ */ +#endif /* _TRG_TREE_VIEW_H_ */ @@ -36,26 +36,26 @@ const gchar *make_error_message(JsonObject * response, int status) { if (status == FAIL_JSON_DECODE) { - return g_strdup("JSON decoding error."); + return g_strdup("JSON decoding error."); } else if (status == FAIL_RESPONSE_UNSUCCESSFUL) { - const gchar *resultStr = - json_object_get_string_member(response, "result"); - if (resultStr == NULL) - return g_strdup("Server responded, but with no result."); - else - return g_strdup(resultStr); + const gchar *resultStr = + json_object_get_string_member(response, "result"); + if (resultStr == NULL) + return g_strdup("Server responded, but with no result."); + else + return g_strdup(resultStr); } else if (status <= -100) { - return g_strdup_printf("Request failed with HTTP code %d", - -(status + 100)); + return g_strdup_printf("Request failed with HTTP code %d", + -(status + 100)); } else { - return g_strdup(curl_easy_strerror(status)); + return g_strdup(curl_easy_strerror(status)); } } void response_unref(JsonObject * response) { if (response != NULL) - json_object_unref(response); + json_object_unref(response); } char *tr_strlpercent(char *buf, double x, size_t buflen) @@ -67,11 +67,11 @@ char *tr_strpercent(char *buf, double x, size_t buflen) { int precision; if (x < 10.0) - precision = 2; + precision = 2; else if (x < 100.0) - precision = 1; + precision = 1; else - precision = 0; + precision = 0; tr_snprintf(buf, buflen, "%.*f%%", precision, tr_truncd(x, precision)); return buf; @@ -85,18 +85,18 @@ double tr_truncd(double x, int decimal_places) } char *tr_strratio(char *buf, size_t buflen, double ratio, - const char *infinity) + const char *infinity) { if ((int) ratio == TR_RATIO_NA) - tr_strlcpy(buf, "None", buflen); + tr_strlcpy(buf, "None", buflen); else if ((int) ratio == TR_RATIO_INF) - tr_strlcpy(buf, infinity, buflen); + tr_strlcpy(buf, infinity, buflen); else if (ratio < 10.0) - tr_snprintf(buf, buflen, "%.2f", tr_truncd(ratio, 2)); + tr_snprintf(buf, buflen, "%.2f", tr_truncd(ratio, 2)); else if (ratio < 100.0) - tr_snprintf(buf, buflen, "%.1f", tr_truncd(ratio, 1)); + tr_snprintf(buf, buflen, "%.1f", tr_truncd(ratio, 1)); else - tr_snprintf(buf, buflen, "%'.0f", ratio); + tr_snprintf(buf, buflen, "%'.0f", ratio); return buf; } @@ -108,30 +108,30 @@ char *tr_strlratio(char *buf, double ratio, size_t buflen) char *tr_strlsize(char *buf, guint64 size, size_t buflen) { if (!size) - g_strlcpy(buf, "None", buflen); + g_strlcpy(buf, "None", buflen); #if GLIB_CHECK_VERSION( 2, 16, 0 ) else { - char *tmp = g_format_size_for_display(size); - g_strlcpy(buf, tmp, buflen); - g_free(tmp); + char *tmp = g_format_size_for_display(size); + g_strlcpy(buf, tmp, buflen); + g_free(tmp); } #else else if (size < (guint64) KILOBYTE_FACTOR) - g_snprintf(buf, buflen, - ngettext("%'u byte", "%'u bytes", (guint) size), - (guint) size); + g_snprintf(buf, buflen, + ngettext("%'u byte", "%'u bytes", (guint) size), + (guint) size); else { - gdouble displayed_size; - if (size < (guint64) MEGABYTE_FACTOR) { - displayed_size = (gdouble) size / KILOBYTE_FACTOR; - g_snprintf(buf, buflen, _("%'.1f KB"), displayed_size); - } else if (size < (guint64) GIGABYTE_FACTOR) { - displayed_size = (gdouble) size / MEGABYTE_FACTOR; - g_snprintf(buf, buflen, _("%'.1f MB"), displayed_size); - } else { - displayed_size = (gdouble) size / GIGABYTE_FACTOR; - g_snprintf(buf, buflen, _("%'.1f GB"), displayed_size); - } + gdouble displayed_size; + if (size < (guint64) MEGABYTE_FACTOR) { + displayed_size = (gdouble) size / KILOBYTE_FACTOR; + g_snprintf(buf, buflen, _("%'.1f KB"), displayed_size); + } else if (size < (guint64) GIGABYTE_FACTOR) { + displayed_size = (gdouble) size / MEGABYTE_FACTOR; + g_snprintf(buf, buflen, _("%'.1f MB"), displayed_size); + } else { + displayed_size = (gdouble) size / GIGABYTE_FACTOR; + g_snprintf(buf, buflen, _("%'.1f GB"), displayed_size); + } } #endif return buf; @@ -141,14 +141,14 @@ char *tr_strlspeed(char *buf, double kb_sec, size_t buflen) { const double speed = kb_sec; - if (speed < 1000.0) /* 0.0 KB to 999.9 KB */ - g_snprintf(buf, buflen, "%.1f KB/s", speed); - else if (speed < 102400.0) /* 0.98 MB to 99.99 MB */ - g_snprintf(buf, buflen, "%.2f MB/s", (speed / KILOBYTE_FACTOR)); - else if (speed < 1024000.0) /* 100.0 MB to 999.9 MB */ - g_snprintf(buf, buflen, "%.1f MB/s", (speed / MEGABYTE_FACTOR)); - else /* insane speeds */ - g_snprintf(buf, buflen, "%.2f GB/s", (speed / GIGABYTE_FACTOR)); + if (speed < 1000.0) /* 0.0 KB to 999.9 KB */ + g_snprintf(buf, buflen, "%.1f KB/s", speed); + else if (speed < 102400.0) /* 0.98 MB to 99.99 MB */ + g_snprintf(buf, buflen, "%.2f MB/s", (speed / KILOBYTE_FACTOR)); + else if (speed < 1024000.0) /* 100.0 MB to 999.9 MB */ + g_snprintf(buf, buflen, "%.1f MB/s", (speed / MEGABYTE_FACTOR)); + else /* insane speeds */ + g_snprintf(buf, buflen, "%.2f GB/s", (speed / GIGABYTE_FACTOR)); return buf; } @@ -158,7 +158,7 @@ char *tr_strltime_short(char *buf, gint64 seconds, size_t buflen) int hours, minutes; if (seconds < 0) - seconds = 0; + seconds = 0; hours = seconds / 3600; minutes = (seconds % 3600) / 60; @@ -175,7 +175,7 @@ char *tr_strltime_long(char *buf, gint64 seconds, size_t buflen) char d[128], h[128], m[128], s[128]; if (seconds < 0) - seconds = 0; + seconds = 0; days = seconds / 86400; hours = (seconds % 86400) / 3600; @@ -185,30 +185,30 @@ char *tr_strltime_long(char *buf, gint64 seconds, size_t buflen) g_snprintf(d, sizeof(d), days > 1 ? "%d days" : "%d day", days); g_snprintf(h, sizeof(h), hours > 1 ? "%d hours" : "%d hour", hours); g_snprintf(m, sizeof(m), minutes > 1 ? "%d minutes" : "%d minute", - minutes); + minutes); g_snprintf(s, sizeof(s), - seconds > 1 ? "%ld seconds" : "%ld second", seconds); + seconds > 1 ? "%ld seconds" : "%ld second", seconds); if (days) { - if (days >= 4 || !hours) { - g_strlcpy(buf, d, buflen); - } else { - g_snprintf(buf, buflen, "%s, %s", d, h); - } + if (days >= 4 || !hours) { + g_strlcpy(buf, d, buflen); + } else { + g_snprintf(buf, buflen, "%s, %s", d, h); + } } else if (hours) { - if (hours >= 4 || !minutes) { - g_strlcpy(buf, h, buflen); - } else { - g_snprintf(buf, buflen, "%s, %s", h, m); - } + if (hours >= 4 || !minutes) { + g_strlcpy(buf, h, buflen); + } else { + g_snprintf(buf, buflen, "%s, %s", h, m); + } } else if (minutes) { - if (minutes >= 4 || !seconds) { - g_strlcpy(buf, m, buflen); - } else { - g_snprintf(buf, buflen, "%s, %s", m, s); - } + if (minutes >= 4 || !seconds) { + g_strlcpy(buf, m, buflen); + } else { + g_snprintf(buf, buflen, "%s, %s", m, s); + } } else { - g_strlcpy(buf, s, buflen); + g_strlcpy(buf, s, buflen); } return buf; @@ -221,7 +221,7 @@ char *gtr_localtime(time_t time) g_strlcpy(buf, asctime(&tm), sizeof(buf)); if ((eoln = strchr(buf, '\n'))) - *eoln = '\0'; + *eoln = '\0'; return g_locale_to_utf8(buf, -1, NULL, NULL, NULL); } @@ -256,20 +256,20 @@ size_t tr_strlcpy(char *dst, const void *src, size_t siz) /* Copy as many bytes as will fit */ if (n != 0) { - while (--n != 0) { - if ((*d++ = *s++) == '\0') - break; - } + while (--n != 0) { + if ((*d++ = *s++) == '\0') + break; + } } /* Not enough room in dst, add NUL and traverse rest of src */ if (n == 0) { - if (siz != 0) - *d = '\0'; /* NUL-terminate dst */ - while (*s++); + if (siz != 0) + *d = '\0'; /* NUL-terminate dst */ + while (*s++); } - return s - (char *) src - 1; /* count does not include NUL */ + return s - (char *) src - 1; /* count does not include NUL */ #endif } @@ -280,9 +280,9 @@ evutil_vsnprintf(char *buf, size_t buflen, const char *format, va_list ap) int r = _vsnprintf(buf, buflen, format, ap); buf[buflen - 1] = '\0'; if (r >= 0) - return r; + return r; else - return _vscprintf(format, ap); + return _vscprintf(format, ap); #else int r = vsnprintf(buf, buflen, format, ap); buf[buflen - 1] = '\0'; @@ -41,7 +41,7 @@ char *tr_strltime_short(char *buf, gint64 seconds, size_t buflen); char *tr_strpercent(char *buf, double x, size_t buflen); char *tr_strlpercent(char *buf, double x, size_t buflen); char *tr_strratio(char *buf, size_t buflen, double ratio, - const char *infinity); + const char *infinity); char *tr_strlratio(char *buf, double ratio, size_t buflen); char *tr_strlspeed(char *buf, double kb_sec, size_t buflen); char *tr_strlsize(char *buf, guint64 size, size_t buflen); @@ -52,8 +52,8 @@ int tr_snprintf(char *buf, size_t buflen, const char *fmt, ...); size_t tr_strlcpy(char *dst, const void *src, size_t siz); double tr_truncd(double x, int decimal_places); int evutil_vsnprintf(char *buf, size_t buflen, const char *format, - va_list ap); + va_list ap); void response_unref(JsonObject * response); const gchar *make_error_message(JsonObject * response, int status); -#endif /* UTIL_H_ */ +#endif /* UTIL_H_ */ |