diff options
author | Aleksander Morgado <aleksander@lanedo.com> | 2011-02-09 10:52:31 +0100 |
---|---|---|
committer | Aleksander Morgado <aleksander@lanedo.com> | 2011-02-09 10:52:31 +0100 |
commit | 079ac3a519fb7805c62fdff36595df02e3c78859 (patch) | |
tree | f50ab79989117b07611e3cb2e96153eb86d12cb9 | |
parent | 0ecac5cdf80432f6bd44e7eb9ad2a9f61e185eef (diff) | |
download | tracker-079ac3a519fb7805c62fdff36595df02e3c78859.tar.gz |
plugins/nautilus: Fix indentation/alignment
-rw-r--r-- | src/plugins/nautilus/tracker-tags-extension.c | 42 | ||||
-rw-r--r-- | src/plugins/nautilus/tracker-tags-utils.c | 94 | ||||
-rw-r--r-- | src/plugins/nautilus/tracker-tags-view.c | 240 |
3 files changed, 188 insertions, 188 deletions
diff --git a/src/plugins/nautilus/tracker-tags-extension.c b/src/plugins/nautilus/tracker-tags-extension.c index 54bcafb72..5ca56e405 100644 --- a/src/plugins/nautilus/tracker-tags-extension.c +++ b/src/plugins/nautilus/tracker-tags-extension.c @@ -111,7 +111,7 @@ menu_data_destroy (gpointer data, } static void -menu_tags_activate_cb (NautilusMenuItem *menu_item, +menu_tags_activate_cb (NautilusMenuItem *menu_item, gpointer user_data) { MenuData *md = user_data; @@ -124,8 +124,8 @@ menu_tags_activate_cb (NautilusMenuItem *menu_item, dialog = gtk_dialog_new_with_buttons (N_("Tags"), window, - GTK_DIALOG_MODAL | - GTK_DIALOG_DESTROY_WITH_PARENT | + GTK_DIALOG_MODAL | + GTK_DIALOG_DESTROY_WITH_PARENT | #if GTK_CHECK_VERSION (2,90,7) 0, #else @@ -138,8 +138,8 @@ menu_tags_activate_cb (NautilusMenuItem *menu_item, gtk_window_set_default_size (GTK_WINDOW (dialog), 250, 375); gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); gtk_window_set_transient_for (GTK_WINDOW (dialog), window); - g_signal_connect (dialog, "response", - G_CALLBACK (gtk_widget_destroy), + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), NULL); action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog)); @@ -173,13 +173,13 @@ extension_get_background_items (NautilusMenuProvider *provider, } menu_item = nautilus_menu_item_new ("tracker-tags-new", - N_("Tags..."), - N_("Tag one or more files"), - NULL); + N_("Tags..."), + N_("Tag one or more files"), + NULL); menu_items = g_list_append (menu_items, menu_item); - g_signal_connect_data (menu_item, "activate", - G_CALLBACK (menu_tags_activate_cb), + g_signal_connect_data (menu_item, "activate", + G_CALLBACK (menu_tags_activate_cb), menu_data_new (provider, FALSE, window), menu_data_destroy, G_CONNECT_AFTER); @@ -200,13 +200,13 @@ extension_get_file_items (NautilusMenuProvider *provider, } menu_item = nautilus_menu_item_new ("tracker-tags-new", - N_("Tags..."), - N_("Tag one or more files"), - NULL); + N_("Tags..."), + N_("Tag one or more files"), + NULL); menu_items = g_list_append (menu_items, menu_item); - g_signal_connect_data (menu_item, "activate", - G_CALLBACK (menu_tags_activate_cb), + g_signal_connect_data (menu_item, "activate", + G_CALLBACK (menu_tags_activate_cb), menu_data_new (tracker_glist_copy_with_nautilus_files (files), TRUE, window), menu_data_destroy, G_CONNECT_AFTER); @@ -246,12 +246,12 @@ extension_get_pages (NautilusPropertyPageProvider *provider, static void tracker_tags_extension_menu_provider_iface_init (NautilusMenuProviderIface *iface) { - iface->get_file_items = extension_get_file_items; - iface->get_toolbar_items = extension_get_toolbar_items; + iface->get_file_items = extension_get_file_items; + iface->get_toolbar_items = extension_get_toolbar_items; - if (0) { - iface->get_background_items = extension_get_background_items; - } + if (0) { + iface->get_background_items = extension_get_background_items; + } } static void @@ -281,7 +281,7 @@ tracker_tags_extension_init (TrackerTagsExtension *self) self->private->cancellable = g_cancellable_new (); self->private->connection = tracker_sparql_connection_get (self->private->cancellable, - NULL); + NULL); } static void diff --git a/src/plugins/nautilus/tracker-tags-utils.c b/src/plugins/nautilus/tracker-tags-utils.c index 62c80d5c0..898894d6a 100644 --- a/src/plugins/nautilus/tracker-tags-utils.c +++ b/src/plugins/nautilus/tracker-tags-utils.c @@ -123,35 +123,35 @@ tracker_tags_escape_sparql_string (const gchar *str) GString *sparql; sparql = g_string_new (""); - g_string_append_c (sparql, '"'); - - while (*str != '\0') { - gsize len = strcspn (str, "\t\n\r\"\\"); - g_string_append_len (sparql, str, len); - str += len; - switch (*str) { - case '\t': - g_string_append (sparql, "\\t"); - break; - case '\n': - g_string_append (sparql, "\\n"); - break; - case '\r': - g_string_append (sparql, "\\r"); - break; - case '"': - g_string_append (sparql, "\\\""); - break; - case '\\': - g_string_append (sparql, "\\\\"); - break; - default: - continue; - } - str++; - } - - g_string_append_c (sparql, '"'); + g_string_append_c (sparql, '"'); + + while (*str != '\0') { + gsize len = strcspn (str, "\t\n\r\"\\"); + g_string_append_len (sparql, str, len); + str += len; + switch (*str) { + case '\t': + g_string_append (sparql, "\\t"); + break; + case '\n': + g_string_append (sparql, "\\n"); + break; + case '\r': + g_string_append (sparql, "\\r"); + break; + case '"': + g_string_append (sparql, "\\\""); + break; + case '\\': + g_string_append (sparql, "\\\\"); + break; + default: + continue; + } + str++; + } + + g_string_append_c (sparql, '"'); return g_string_free (sparql, FALSE); } @@ -164,17 +164,17 @@ tracker_tags_add_query (const gchar *tag_label) tag_label_escaped = tracker_tags_escape_sparql_string (tag_label); query = g_strdup_printf ("INSERT { " - " _:tag a nao:Tag ;" - " nao:prefLabel %s ." - "} " - "WHERE {" - " OPTIONAL {" - " ?tag a nao:Tag ;" - " nao:prefLabel %s" - " } ." - " FILTER (!bound(?tag)) " - "}", - tag_label_escaped, + " _:tag a nao:Tag ;" + " nao:prefLabel %s ." + "} " + "WHERE {" + " OPTIONAL {" + " ?tag a nao:Tag ;" + " nao:prefLabel %s" + " } ." + " FILTER (!bound(?tag)) " + "}", + tag_label_escaped, tag_label_escaped); g_free (tag_label_escaped); @@ -189,13 +189,13 @@ tracker_tags_remove_query (const gchar *tag_label) tag_label_escaped = tracker_tags_escape_sparql_string (tag_label); query = g_strdup_printf ("DELETE { " - " ?tag a rdfs:Resource " - "} " - "WHERE {" - " ?tag a nao:Tag ;" - " nao:prefLabel %s " - "}", - tag_label_escaped); + " ?tag a rdfs:Resource " + "} " + "WHERE {" + " ?tag a nao:Tag ;" + " nao:prefLabel %s " + "}", + tag_label_escaped); g_free (tag_label_escaped); return query; diff --git a/src/plugins/nautilus/tracker-tags-view.c b/src/plugins/nautilus/tracker-tags-view.c index df6201caf..8d377114c 100644 --- a/src/plugins/nautilus/tracker-tags-view.c +++ b/src/plugins/nautilus/tracker-tags-view.c @@ -105,12 +105,12 @@ tracker_tags_view_init (TrackerTagsView *tv) tv->private->cancellable = g_cancellable_new (); tv->private->connection = tracker_sparql_connection_get (tv->private->cancellable, - NULL); + NULL); tv->private->files = NULL; - tv->private->store = gtk_list_store_new (N_COLUMNS, - G_TYPE_INT, /* Selection type */ + tv->private->store = gtk_list_store_new (N_COLUMNS, + G_TYPE_INT, /* Selection type */ G_TYPE_STRING, /* Tag ID */ G_TYPE_STRING, /* Tag Name */ G_TYPE_STRING, /* Tag Count String */ @@ -224,13 +224,13 @@ show_error_dialog (GError *error) str = error->message ? error->message : _("No error was given"); dialog = gtk_message_dialog_new (NULL, - 0, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - "%s", - str); + 0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + "%s", + str); g_signal_connect (dialog, "response", - G_CALLBACK (gtk_widget_destroy), NULL); + G_CALLBACK (gtk_widget_destroy), NULL); gtk_dialog_run (GTK_DIALOG (dialog)); } @@ -243,8 +243,8 @@ tag_view_model_find_tag_foreach (GtkTreeModel *model, gchar *tag; gtk_tree_model_get (model, iter, - COL_TAG_NAME, &tag, - -1); + COL_TAG_NAME, &tag, + -1); if (!tag) { return FALSE; @@ -285,8 +285,8 @@ tag_view_model_find_tag (TrackerTagsView *tv, model = gtk_tree_view_get_model (view); gtk_tree_model_foreach (model, - (GtkTreeModelForeachFunc) tag_view_model_find_tag_foreach, - &data); + (GtkTreeModelForeachFunc) tag_view_model_find_tag_foreach, + &data); if (data.found == TRUE) { *iter = data.found_iter; @@ -298,8 +298,8 @@ tag_view_model_find_tag (TrackerTagsView *tv, static void tags_view_tag_removed_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) + GAsyncResult *res, + gpointer user_data) { TagData *td = user_data; GError *error = NULL; @@ -307,8 +307,8 @@ tags_view_tag_removed_cb (GObject *source_object, g_debug ("Update callback\n"); tracker_sparql_connection_update_finish (TRACKER_SPARQL_CONNECTION (source_object), - res, - &error); + res, + &error); if (error) { show_error_dialog (error); @@ -338,8 +338,8 @@ tags_view_query_files_for_tag_id_cb (GObject *source_object, guint files_selected, files_with_tag, has_tag_in_selection; cursor = tracker_sparql_connection_query_finish (TRACKER_SPARQL_CONNECTION (source_object), - res, - &error); + res, + &error); if (error) { show_error_dialog (error); @@ -362,8 +362,8 @@ tags_view_query_files_for_tag_id_cb (GObject *source_object, /* FIXME: make this async */ while (tracker_sparql_cursor_next (cursor, - tv->private->cancellable, - &error)) { + tv->private->cancellable, + &error)) { GList *l; gboolean equal; @@ -398,30 +398,30 @@ tags_view_query_files_for_tag_id_cb (GObject *source_object, return; } - g_debug ("Querying files with tag, in selection:%d, in total:%d, selected:%d\n", + g_debug ("Querying files with tag, in selection:%d, in total:%d, selected:%d\n", has_tag_in_selection, files_with_tag, files_selected); if (has_tag_in_selection == 0) { - gtk_list_store_set (tv->private->store, iter, - COL_SELECTION, SELECTION_FALSE, + gtk_list_store_set (tv->private->store, iter, + COL_SELECTION, SELECTION_FALSE, -1); } else if (files_selected != has_tag_in_selection) { - gtk_list_store_set (tv->private->store, iter, - COL_SELECTION, SELECTION_INCONSISTENT, + gtk_list_store_set (tv->private->store, iter, + COL_SELECTION, SELECTION_INCONSISTENT, -1); } else { - gtk_list_store_set (tv->private->store, iter, + gtk_list_store_set (tv->private->store, iter, COL_SELECTION, SELECTION_TRUE, -1); } str = g_strdup_printf ("%d", files_with_tag); - gtk_list_store_set (tv->private->store, iter, + gtk_list_store_set (tv->private->store, iter, COL_TAG_COUNT, str, COL_TAG_COUNT_VALUE, files_with_tag, -1); g_free (str); - + tv->private->tag_data_requests = g_list_remove (tv->private->tag_data_requests, td); tag_data_free (td); @@ -440,16 +440,16 @@ tags_view_query_files_for_tag_id (TagData *td) "}", td->tag_id); tracker_sparql_connection_query_async (td->tv->private->connection, - query, - td->cancellable, - tags_view_query_files_for_tag_id_cb, - td); + query, + td->cancellable, + tags_view_query_files_for_tag_id_cb, + td); g_free (query); } static void tags_view_add_tags_cb (GObject *source_object, - GAsyncResult *res, + GAsyncResult *res, gpointer user_data) { TrackerSparqlCursor *cursor; @@ -459,8 +459,8 @@ tags_view_add_tags_cb (GObject *source_object, g_debug ("Clearing tags in store\n"); cursor = tracker_sparql_connection_query_finish (TRACKER_SPARQL_CONNECTION (source_object), - res, - &error); + res, + &error); gtk_list_store_clear (tv->private->store); @@ -487,10 +487,10 @@ tags_view_add_tags_cb (GObject *source_object, gtk_list_store_append (tv->private->store, &iter); gtk_list_store_set (tv->private->store, &iter, - COL_TAG_ID, id, - COL_TAG_NAME, label, - COL_SELECTION, SELECTION_FALSE, - -1); + COL_TAG_ID, id, + COL_TAG_NAME, label, + COL_SELECTION, SELECTION_FALSE, + -1); td = tag_data_new (id, &iter, FALSE, TRUE, 1, tv); tv->private->tag_data_requests = @@ -512,7 +512,7 @@ tags_view_add_tags_cb (GObject *source_object, static void tags_view_model_update_cb (GObject *source_object, - GAsyncResult *res, + GAsyncResult *res, gpointer user_data) { TagData *td = user_data; @@ -522,8 +522,8 @@ tags_view_model_update_cb (GObject *source_object, g_debug ("Update callback\n"); tracker_sparql_connection_update_finish (TRACKER_SPARQL_CONNECTION (source_object), - res, - &error); + res, + &error); if (error) { show_error_dialog (error); @@ -613,7 +613,7 @@ tags_view_add_tag (TrackerTagsView *tv, tag_escaped = tracker_tags_escape_sparql_string (tag); for (i = 0; files[i] != NULL; i++) { - g_string_append_printf (query, + g_string_append_printf (query, "INSERT { _:file a nie:DataObject ; nie:url '%s' } " "WHERE { " " OPTIONAL {" @@ -626,29 +626,29 @@ tags_view_add_tag (TrackerTagsView *tv, } g_string_append_printf (query, - "INSERT { " - " _:tag a nao:Tag;" - " nao:prefLabel %s . " - "} " - "WHERE {" - " OPTIONAL {" - " ?tag a nao:Tag ;" - " nao:prefLabel %s" - " } ." - " FILTER (!bound(?tag)) " - "} " - "INSERT { " - " ?urn nao:hasTag ?label " - "} " - "WHERE {" - " ?urn nie:url ?f ." - " ?label nao:prefLabel %s " - " %s " - "}", - tag_escaped, - tag_escaped, - tag_escaped, - filter); + "INSERT { " + " _:tag a nao:Tag;" + " nao:prefLabel %s . " + "} " + "WHERE {" + " OPTIONAL {" + " ?tag a nao:Tag ;" + " nao:prefLabel %s" + " } ." + " FILTER (!bound(?tag)) " + "} " + "INSERT { " + " ?urn nao:hasTag ?label " + "} " + "WHERE {" + " ?urn nie:url ?f ." + " ?label nao:prefLabel %s " + " %s " + "}", + tag_escaped, + tag_escaped, + tag_escaped, + filter); g_free (tag_escaped); g_free (filter); @@ -662,11 +662,11 @@ tags_view_add_tag (TrackerTagsView *tv, g_list_prepend (tv->private->tag_data_requests, td); tracker_sparql_connection_update_async (tv->private->connection, - query->str, - G_PRIORITY_DEFAULT, - td->cancellable, - tags_view_model_update_cb, - td); + query->str, + G_PRIORITY_DEFAULT, + td->cancellable, + tags_view_model_update_cb, + td); g_string_free (query, TRUE); } @@ -682,7 +682,7 @@ tags_view_model_toggle_cell_data_func (GtkTreeViewColumn *column, gint selection; gtk_tree_model_get (tree_model, iter, COL_SELECTION, &selection, -1); - gtk_cell_renderer_toggle_set_active (GTK_CELL_RENDERER_TOGGLE (cell_renderer), + gtk_cell_renderer_toggle_set_active (GTK_CELL_RENDERER_TOGGLE (cell_renderer), SELECTION_TRUE == selection); g_value_init (&inconsistent, G_TYPE_BOOLEAN); @@ -731,8 +731,8 @@ tags_view_model_toggle_row (TrackerTagsView *tv, " ?urn nie:url ?f ." /* NB: ?f is used in filter. */ " ?label nao:prefLabel %s ." " %s " - "}", - tag_escaped, + "}", + tag_escaped, filter); } else { TagData *td; @@ -745,9 +745,9 @@ tags_view_model_toggle_row (TrackerTagsView *tv, " ?label nao:prefLabel %s ." " %s " "}", - tag_escaped, + tag_escaped, filter); - + /* Check if there are any files left with this tag and * remove tag if not. */ @@ -770,11 +770,11 @@ tags_view_model_toggle_row (TrackerTagsView *tv, g_list_prepend (tv->private->tag_data_requests, td); tracker_sparql_connection_update_async (tv->private->connection, - query, - G_PRIORITY_DEFAULT, - td->cancellable, - tags_view_model_update_cb, - td); + query, + G_PRIORITY_DEFAULT, + td->cancellable, + tags_view_model_update_cb, + td); g_free (id); g_free (query); @@ -793,9 +793,9 @@ tags_view_model_cell_toggled_cb (GtkCellRendererToggle *cell, } static void -tags_view_model_row_activated_cb (GtkTreeView *view, - GtkTreePath *path, - GtkTreeViewColumn *column, +tags_view_model_row_activated_cb (GtkTreeView *view, + GtkTreePath *path, + GtkTreeViewColumn *column, gpointer user_data) { tags_view_model_toggle_row (user_data, path); @@ -826,7 +826,7 @@ tags_view_entry_activate_cb (GtkEditable *editable, } static void -tags_view_add_clicked_cb (GtkButton *button, +tags_view_add_clicked_cb (GtkButton *button, gpointer user_data) { TrackerTagsView *tv = user_data; @@ -853,16 +853,16 @@ tags_view_remove_tag (TrackerTagsView *tv, g_list_prepend (tv->private->tag_data_requests, td_copy); tracker_sparql_connection_update_async (tv->private->connection, - query, - G_PRIORITY_DEFAULT, - td_copy->cancellable, - tags_view_tag_removed_cb, - td_copy); + query, + G_PRIORITY_DEFAULT, + td_copy->cancellable, + tags_view_tag_removed_cb, + td_copy); g_free (query); } static void -tags_view_remove_clicked_cb (GtkButton *button, +tags_view_remove_clicked_cb (GtkButton *button, gpointer user_data) { TrackerTagsView *tv = user_data; @@ -945,11 +945,11 @@ tags_view_create_ui (TrackerTagsView *tv) gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); - g_signal_connect (entry, "changed", - G_CALLBACK (tags_view_entry_changed_cb), + g_signal_connect (entry, "changed", + G_CALLBACK (tags_view_entry_changed_cb), tv); - g_signal_connect (entry, "activate", - G_CALLBACK (tags_view_entry_activate_cb), + g_signal_connect (entry, "activate", + G_CALLBACK (tags_view_entry_activate_cb), tv); button = gtk_button_new_from_stock (GTK_STOCK_ADD); @@ -958,8 +958,8 @@ tags_view_create_ui (TrackerTagsView *tv) gtk_widget_set_can_default (button, TRUE); gtk_widget_set_sensitive (button, FALSE); - g_signal_connect (button, "clicked", - G_CALLBACK (tags_view_add_clicked_cb), + g_signal_connect (button, "clicked", + G_CALLBACK (tags_view_add_clicked_cb), tv); tv->private->button_add = button; @@ -969,8 +969,8 @@ tags_view_create_ui (TrackerTagsView *tv) gtk_widget_set_sensitive (button, FALSE); - g_signal_connect (button, "clicked", - G_CALLBACK (tags_view_remove_clicked_cb), + g_signal_connect (button, "clicked", + G_CALLBACK (tags_view_remove_clicked_cb), tv); tv->private->button_remove = button; @@ -979,9 +979,9 @@ tags_view_create_ui (TrackerTagsView *tv) scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_box_pack_start (GTK_BOX (tv), scrolled_window, TRUE, TRUE, 0); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN); view = gtk_tree_view_new (); @@ -1000,10 +1000,10 @@ tags_view_create_ui (TrackerTagsView *tv) tv); gtk_tree_view_column_pack_start (column, cell_renderer, TRUE); - gtk_tree_view_column_set_cell_data_func (column, - cell_renderer, - tags_view_model_toggle_cell_data_func, - NULL, + gtk_tree_view_column_set_cell_data_func (column, + cell_renderer, + tags_view_model_toggle_cell_data_func, + NULL, NULL); gtk_cell_renderer_toggle_set_radio (GTK_CELL_RENDERER_TOGGLE (cell_renderer), FALSE); @@ -1029,29 +1029,29 @@ tags_view_create_ui (TrackerTagsView *tv) /* List settings */ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (view), FALSE); - gtk_tree_view_set_model (GTK_TREE_VIEW (view), + gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (tv->private->store)); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); - g_signal_connect (view, "row-activated", - G_CALLBACK (tags_view_model_row_activated_cb), + g_signal_connect (view, "row-activated", + G_CALLBACK (tags_view_model_row_activated_cb), tv); - g_signal_connect (selection, "changed", - G_CALLBACK (tags_view_model_row_selected_cb), + g_signal_connect (selection, "changed", + G_CALLBACK (tags_view_model_row_selected_cb), tv); tracker_sparql_connection_query_async (tv->private->connection, - "SELECT ?urn ?label " - "WHERE {" - " ?urn a nao:Tag ;" - " nao:prefLabel ?label . " - "} ORDER BY ?label", - tv->private->cancellable, - tags_view_add_tags_cb, - tv); + "SELECT ?urn ?label " + "WHERE {" + " ?urn a nao:Tag ;" + " nao:prefLabel ?label . " + "} ORDER BY ?label", + tv->private->cancellable, + tags_view_add_tags_cb, + tv); gtk_widget_show_all (GTK_WIDGET (tv)); gtk_widget_grab_focus (entry); @@ -1073,7 +1073,7 @@ tracker_tags_view_new (GList *files) TrackerTagsView *tv; g_return_val_if_fail (files != NULL, NULL); - + tv = g_object_new (TRACKER_TYPE_TAGS_VIEW, NULL); tv->private->files = tracker_glist_copy_with_nautilus_files (files); |