diff options
46 files changed, 223 insertions, 223 deletions
diff --git a/data/browser.xml b/data/browser.xml index 1b21fcec..19b8350e 100644 --- a/data/browser.xml +++ b/data/browser.xml @@ -3,11 +3,11 @@ <category name="patterns" _display_name="_Patterns" image="backgrounds.png" columns="5" mode="directory" path="caja/patterns" type="property/bgimage" _description="Drag a pattern tile to an object to change it"> - <pattern _display_name="Blue Ridge" filename="blue_ridge"/> - <pattern _display_name="Blue Rough" filename="blue_gray_rough"/> - <pattern _display_name="Blue Type" filename="blue_type"/> - <pattern _display_name="Brushed Metal" filename="brushed_metal"/> - <pattern _display_name="Burlap" filename="burlap"/> + <pattern _display_name="Blue Ridge" filename="blue_ridge"/> + <pattern _display_name="Blue Rough" filename="blue_gray_rough"/> + <pattern _display_name="Blue Type" filename="blue_type"/> + <pattern _display_name="Brushed Metal" filename="brushed_metal"/> + <pattern _display_name="Burlap" filename="burlap"/> <pattern _display_name="Camouflage" filename="camouflage"/> <pattern _display_name="Chalk" filename="chalk"/> <pattern _display_name="Cork" filename="cork"/> @@ -20,7 +20,7 @@ <pattern _display_name="Fossil" filename="fossil"/> <pattern _display_name="MATE" filename="mate"/> <pattern _display_name="Green Weave" filename="green_weave"/> - <pattern _display_name="Ice" filename="ice"/> + <pattern _display_name="Ice" filename="ice"/> <pattern _display_name="Manila Paper" filename="manila_paper"/> <pattern _display_name="Moss Ridge" filename="moss_ridge"/> <pattern _display_name="Numbers" filename="numbers"/> @@ -34,7 +34,7 @@ <pattern _display_name="Terracotta" filename="terracotta"/> <pattern _display_name="Wavy White" filename="wavy_white"/> </category> - + <category name="colors" _display_name="C_olors" image="colors.png" columns="5" mode="inline" type="application/x-color" _description="Drag a color to an object to change it to that color"> <color _name="Mango">#E0D656</color> <color _name="Orange">#D2AB50</color> @@ -45,7 +45,7 @@ <color _name="Sky">#3978A7</color> <color _name="Danube">#184A7F</color> <color _name="Indigo">#3E4985</color> - <color _name="Violet">#65498C</color> + <color _name="Violet">#65498C</color> <color _name="Sea Foam">#CCFFCC</color> <color _name="Leaf">#66CC66</color> <color _name="Deep Teal">#457263</color> @@ -55,7 +55,7 @@ <color _name="Envy">#2C821E</color> <color _name="Azul">#1822CA</color> <color _name="Lemon">#F6E118</color> - <color _name="Bubble Gum">#D050A4</color> + <color _name="Bubble Gum">#D050A4</color> <color _name="White">#FFFFFF</color> <color _name="Apparition">#E5E5E5</color> <color _name="Silver">#C9C9C9</color> @@ -65,9 +65,9 @@ <color _name="Eclipse">#525252</color> <color _name="Charcoal">#323232</color> <color _name="Onyx">#222222</color> - <color _name="Black">#000000</color> + <color _name="Black">#000000</color> </category> - + <category name="emblems" _display_name="_Emblems" image="emblems.png" columns="6" mode="directory" path="caja/emblems" type="property/keyword" _description="Drag an emblem to an object to add it to the object"> <!-- translators: this is the name of an emblem --> <emblem _display_name="Erase" filename="erase"/> diff --git a/docs/architecture.txt b/docs/architecture.txt index bda3397e..896bb6ae 100644 --- a/docs/architecture.txt +++ b/docs/architecture.txt @@ -65,7 +65,7 @@ it displays. The CajaWindow object provides various chrome and uses a number of CajaView objects to communicate with view components. The relationship between CajaWindow and the CajaViews is mostly, but not completely one-way; primarily, the -window calls the view's methods and connects to its signals. +window calls the view's methods and connects to its signals. The CajaView object serves as a proxy for a view component. It provides a number of methods which correspond to the methods of the @@ -140,7 +140,7 @@ architecture is different. * Other Communication The Caja:View and Caja:ViewFrame interfaces allow for other -communication as well. +communication as well. The view may request that the frame update the status message, indicate a certain level of progress during loading, or display a diff --git a/docs/dnd.txt b/docs/dnd.txt index 91467f33..0c604f53 100644 --- a/docs/dnd.txt +++ b/docs/dnd.txt @@ -24,13 +24,13 @@ If you are a destination: if you are a source, you have to start a drag trough gtk_drag_begin. This will call drag_begin signal in the source. -Then, when the destination calls gtk_drag_finish, drag_end will be +Then, when the destination calls gtk_drag_finish, drag_end will be called in the source. -drag_get_data will be called in the source when the destination +drag_get_data will be called in the source when the destination calls gtk_drag_get_data -So, the source is very easy to write: it just needs to implement +So, the source is very easy to write: it just needs to implement those 3 signals and it should not have any memory management issue. @@ -38,14 +38,14 @@ those 3 signals and it should not have any memory management issue. -------------- Things get a little bit complicated. -when the dragging cursor gets in your window, you will get drag_motion +when the dragging cursor gets in your window, you will get drag_motion events. In caja, we do many things in this function: - we start auto-scrolling if it is necessary. - we call caja_*_ensure_data - we prelight what is under the cursor if it can accept the drag. - we try to expand what is under you if it can accept the drop (tree view) -caja_*_ensure_data is vital. It calls gtk_drag_get_data to get the +caja_*_ensure_data is vital. It calls gtk_drag_get_data to get the data from the source. this allows the destination to store it in advance and use it to know if what is under the cursor can accept the drag. @@ -57,7 +57,7 @@ Also, just before the drag_drop event, a drag_leave event is triggered. If no drop occurs, a drag_leave occurs. -So, drag_data_received does 2 things: it is called to get the data when we are +So, drag_data_received does 2 things: it is called to get the data when we are in motion and store it. It is also called to do the actual drop operation when a drop happened. @@ -73,12 +73,12 @@ This schema involves careful memory management: To solve 1), we should use ONE destroy function which cleans up the drag data. To solve 2), we have to be very careful where we call this fution from. -This function has to clean up: +This function has to clean up: - the list of expanded nodes (tree view). - the autoscroll code. - the prelighting code. It also has to set drag_info->need_to_destroy to TRUE - so that during the next drag in this widget, the + so that during the next drag in this widget, the rest of the drag data is destroyed before begening the actual new drag. diff --git a/docs/key_mouse_navigation.txt b/docs/key_mouse_navigation.txt index d111f43e..30861609 100644 --- a/docs/key_mouse_navigation.txt +++ b/docs/key_mouse_navigation.txt @@ -19,7 +19,7 @@ Tab - moves to the "next" icon in order (i.e. at the end of one row, Shift Tab - moves to the "previous" icon in order Home - moves to the first icon End - moves to the last icon - + In order to allow multiple selection the above navigation keys can be combined with the Control key to move the keyboard focus without affecting the current selection. If you use normal movement (not using @@ -38,7 +38,7 @@ are selected. In manual layout (and especially, on the desktop) the keyboard arrow keys work in a slightly different way. To allow all icons to be reached the closest icon in the quadrant of the direction selected -will be used as the "next" icon when navigating. +will be used as the "next" icon when navigating. Other keyboard shortcuts: diff --git a/docs/reference/libcaja-extension/libcaja-extension-docs.xml b/docs/reference/libcaja-extension/libcaja-extension-docs.xml index b0b6cf03..777a846d 100644 --- a/docs/reference/libcaja-extension/libcaja-extension-docs.xml +++ b/docs/reference/libcaja-extension/libcaja-extension-docs.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ <!ENTITY version SYSTEM "version.xml"> ]> diff --git a/eel/eel-background.c b/eel/eel-background.c index 78e5e08b..a41360d5 100644 --- a/eel/eel-background.c +++ b/eel/eel-background.c @@ -665,7 +665,7 @@ widget_realize_cb (GtkWidget *widget, widget_realized_setup (widget, self); - eel_background_set_up_widget (self); + eel_background_set_up_widget (self); } static void diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c index 8321eaee..aa9410b7 100644 --- a/eel/eel-gtk-extensions.c +++ b/eel/eel-gtk-extensions.c @@ -469,7 +469,7 @@ eel_image_menu_item_new_from_icon (const gchar *icon_name, gtk_container_add (GTK_CONTAINER (box), icon); gtk_container_add (GTK_CONTAINER (box), label_menu); - + gtk_container_add (GTK_CONTAINER (menuitem), box); gtk_widget_show_all (menuitem); diff --git a/eel/eel-gtk-macros.h b/eel/eel-gtk-macros.h index 2bf8e064..ff614c83 100644 --- a/eel/eel-gtk-macros.h +++ b/eel/eel-gtk-macros.h @@ -119,7 +119,7 @@ G_STMT_START { \ ? 0 \ : ((* class_cast_macro (G_OBJECT_GET_CLASS (object))->signal) \ parameters) \ - + #ifndef G_DISABLE_ASSERT /* Define a signal that is not implemented by this class but must be diff --git a/eel/eel-stock-dialogs.c b/eel/eel-stock-dialogs.c index ffa9ab53..d34160ad 100644 --- a/eel/eel-stock-dialogs.c +++ b/eel/eel-stock-dialogs.c @@ -423,7 +423,7 @@ eel_run_simple_dialog (GtkWidget *parent, gboolean ignore_close_box, } /* Create the dialog. */ - dialog = gtk_message_dialog_new (GTK_WINDOW (chosen_parent), + dialog = gtk_message_dialog_new (GTK_WINDOW (chosen_parent), 0, message_type, GTK_BUTTONS_NONE, diff --git a/libcaja-private/caja-bookmark.c b/libcaja-private/caja-bookmark.c index 71dfb7d4..752d807a 100644 --- a/libcaja-private/caja-bookmark.c +++ b/libcaja-private/caja-bookmark.c @@ -626,10 +626,10 @@ bookmark_image_menu_item_new_from_surface (cairo_surface_t *icon_surface, gtk_label_set_max_width_chars (label, (ELLIPSISED_MENU_ITEM_MIN_CHARS + 2)); GtkWidget *menuitem = gtk_menu_item_new (); - + gtk_container_add (GTK_CONTAINER (box), icon); gtk_container_add (GTK_CONTAINER (box), label_menu); - + gtk_container_add (GTK_CONTAINER (menuitem), box); gtk_widget_show_all (menuitem); diff --git a/libcaja-private/caja-desktop-metadata.c b/libcaja-private/caja-desktop-metadata.c index 41f0b021..c03bdf64 100644 --- a/libcaja-private/caja-desktop-metadata.c +++ b/libcaja-private/caja-desktop-metadata.c @@ -49,7 +49,7 @@ get_keyfile_path (void) retval = g_build_filename (xdg_dir, "desktop-metadata", NULL); g_free (xdg_dir); - + return retval; } @@ -176,7 +176,7 @@ caja_desktop_set_metadata_string (CajaFile *file, if (caja_desktop_update_metadata_from_keyfile (file, name)) { caja_file_changed (file); - } + } } #define STRV_TERMINATOR "@x-caja-desktop-metadata-term@" diff --git a/libcaja-private/caja-directory-async.c b/libcaja-private/caja-directory-async.c index 7ad201ae..80899205 100644 --- a/libcaja-private/caja-directory-async.c +++ b/libcaja-private/caja-directory-async.c @@ -907,7 +907,7 @@ static gboolean should_skip_file (CajaDirectory *directory, GFileInfo *info) { static gboolean show_hidden_files_changed_callback_installed = FALSE; - + /* Add the callback once for the life of our process */ if (!show_hidden_files_changed_callback_installed) { diff --git a/libcaja-private/caja-extensions.c b/libcaja-private/caja-extensions.c index 580cd582..9b34fdcd 100644 --- a/libcaja-private/caja-extensions.c +++ b/libcaja-private/caja-extensions.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, * Boston, MA 02110-1301, USA. * * Author: Alexander van der Meij <[email protected]> @@ -82,8 +82,8 @@ gsettings_key_has_value (const gchar *value) { gchar **list; gint i; - - list = g_settings_get_strv (caja_extension_preferences, + + list = g_settings_get_strv (caja_extension_preferences, CAJA_PREFERENCES_DISABLED_EXTENSIONS); if (list != NULL) @@ -108,21 +108,21 @@ gsettings_append_to_list (const char *value) gchar **new; gint size; gboolean retval; - - current = g_settings_get_strv (caja_extension_preferences, + + current = g_settings_get_strv (caja_extension_preferences, CAJA_PREFERENCES_DISABLED_EXTENSIONS); - + for (size = 0; current[size] != NULL; size++); size += 1; size += 1; - + new = g_realloc_n (current, size, sizeof (gchar *)); new[size - 2] = g_strdup (value); new[size - 1] = NULL; - - retval = g_settings_set_strv (caja_extension_preferences, + + retval = g_settings_set_strv (caja_extension_preferences, CAJA_PREFERENCES_DISABLED_EXTENSIONS, (const gchar **) new); @@ -137,19 +137,19 @@ gsettings_remove_from_list (const char *value) GArray *array; gint i; gboolean retval; - - current = g_settings_get_strv (caja_extension_preferences, + + current = g_settings_get_strv (caja_extension_preferences, CAJA_PREFERENCES_DISABLED_EXTENSIONS); - + array = g_array_new (TRUE, TRUE, sizeof (gchar *)); - - for (i = 0; current[i] != NULL; i++) + + for (i = 0; current[i] != NULL; i++) { if (g_strcmp0 (current[i], value) != 0) array = g_array_append_val (array, current[i]); } - - retval = g_settings_set_strv (caja_extension_preferences, + + retval = g_settings_set_strv (caja_extension_preferences, CAJA_PREFERENCES_DISABLED_EXTENSIONS, (const gchar **) array->data); @@ -221,7 +221,7 @@ caja_extension_set_state (Extension *ext, gboolean new_state) g_return_val_if_fail (ext->state != new_state, FALSE); ext->state = new_state; } - + gboolean retval; if (new_state) { retval = gsettings_remove_from_list (ext->filename); @@ -229,7 +229,7 @@ caja_extension_set_state (Extension *ext, gboolean new_state) else { retval = gsettings_append_to_list (ext->filename); } - + g_return_val_if_fail (retval == TRUE, FALSE); return TRUE; } diff --git a/libcaja-private/caja-extensions.h b/libcaja-private/caja-extensions.h index 13fa99c3..547b1891 100644 --- a/libcaja-private/caja-extensions.h +++ b/libcaja-private/caja-extensions.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, * Boston, MA 02110-1301, USA. * * Author: Alexander van der Meij <[email protected]> diff --git a/libcaja-private/caja-file-conflict-dialog.c b/libcaja-private/caja-file-conflict-dialog.c index 4d853814..4fe465ec 100644 --- a/libcaja-private/caja-file-conflict-dialog.c +++ b/libcaja-private/caja-file-conflict-dialog.c @@ -346,7 +346,7 @@ file_list_ready_cb (GList *files, gtk_button_set_label (GTK_BUTTON (details->replace_button), _("Merge")); } - + /* If meld is installed, and source and destination arent binary * files, show the diff button */ @@ -358,10 +358,10 @@ file_list_ready_cb (GList *files, g_free (meld_found); gboolean src_is_binary; gboolean dest_is_binary; - + src_is_binary = caja_file_is_binary (details->source); dest_is_binary = caja_file_is_binary (details->destination); - + if (!src_is_binary && !dest_is_binary) gtk_widget_show (details->diff_button); } @@ -523,7 +523,7 @@ diff_button_clicked_cb (GtkButton *w, { CajaFileConflictDialogPrivate *details; details = dialog->details; - + GError *error; char *command; @@ -537,7 +537,7 @@ diff_button_clicked_cb (GtkButton *w, argv[1] = g_file_get_path (caja_file_get_location (details->source)); argv[2] = g_file_get_path (caja_file_get_location (details->destination)); argv[3] = NULL; - + error = NULL; if (!g_spawn_async_with_pipes (NULL, argv, diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c index ecd922a3..97052e91 100644 --- a/libcaja-private/caja-file-operations.c +++ b/libcaja-private/caja-file-operations.c @@ -1038,7 +1038,7 @@ should_skip_file (CommonJob *common, if (common->skip_files != NULL) { return g_hash_table_lookup (common->skip_files, file) != NULL; } - + return FALSE; } diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c index dcef27e8..26cdb129 100644 --- a/libcaja-private/caja-file.c +++ b/libcaja-private/caja-file.c @@ -2194,14 +2194,14 @@ update_info_internal (CajaFile *file, file->details->is_symlink = is_symlink; is_hidden = g_file_info_get_is_hidden (info); - is_backup = g_file_info_get_is_backup (info); + is_backup = g_file_info_get_is_backup (info); if (file->details->is_hidden != is_hidden || file->details->is_backup != is_backup) { changed = TRUE; } file->details->is_hidden = is_hidden; - file->details->is_backup = is_backup; - + file->details->is_backup = is_backup; + is_mountpoint = g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT); if (file->details->is_mountpoint != is_mountpoint) { changed = TRUE; @@ -4609,8 +4609,8 @@ caja_file_get_icon (CajaFile *file, MAX (h * thumb_scale, 1), GDK_INTERP_BILINEAR); - /* Render frames only for thumbnails of non-image files - and for images with no alpha channel. */ + /* Render frames only for thumbnails of non-image files + and for images with no alpha channel. */ gboolean is_image = file->details->mime_type && (strncmp(eel_ref_str_peek (file->details->mime_type), "image/", 6) == 0); if (!is_image || @@ -7500,22 +7500,22 @@ caja_file_is_binary (CajaFile *file) { return FALSE; } - + gboolean is_binary = FALSE; int i = 0; FILE *fp; - + /* Check the first 4096 bytes of the files. If these contains a 0, * we can assume the file is binary. * This idea is taken from python code of meld. */ - + fp = g_fopen (g_file_get_path (caja_file_get_location (file)), "r"); if (fp == NULL) { return FALSE; } - + while (!feof (fp)) { int c; @@ -7530,7 +7530,7 @@ caja_file_is_binary (CajaFile *file) i++; } fclose(fp); - + return is_binary; } diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c index 36783dc9..e4bcd335 100644 --- a/libcaja-private/caja-global-preferences.c +++ b/libcaja-private/caja-global-preferences.c @@ -74,7 +74,7 @@ caja_global_preferences_init (void) } initialized = TRUE; - + caja_preferences = g_settings_new("org.mate.caja.preferences"); caja_media_preferences = g_settings_new("org.mate.media-handling"); caja_window_state = g_settings_new("org.mate.caja.window-state"); diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c index 6a03c794..76443362 100644 --- a/libcaja-private/caja-icon-canvas-item.c +++ b/libcaja-private/caja-icon-canvas-item.c @@ -2770,7 +2770,7 @@ caja_icon_canvas_item_class_init (CajaIconCanvasItemClass *class) g_param_spec_boolean ("highlighted_for_selection", "highlighted for selection", "whether we are highlighted for a selection", - FALSE, G_PARAM_READWRITE)); + FALSE, G_PARAM_READWRITE)); g_object_class_install_property ( object_class, @@ -2778,7 +2778,7 @@ caja_icon_canvas_item_class_init (CajaIconCanvasItemClass *class) g_param_spec_boolean ("highlighted_as_keyboard_focus", "highlighted as keyboard focus", "whether we are highlighted to render keyboard focus", - FALSE, G_PARAM_READWRITE)); + FALSE, G_PARAM_READWRITE)); g_object_class_install_property ( @@ -3510,7 +3510,7 @@ caja_icon_canvas_item_accessible_ref_state_set (AtkObject *accessible) l = container->details->icons; while (l) { icon = l->data; - + if (icon->item == item) { if (icon->is_selected) { one_item_selected = TRUE; diff --git a/libcaja-private/caja-undostack-manager.c b/libcaja-private/caja-undostack-manager.c index e875803f..c80b4f79 100644 --- a/libcaja-private/caja-undostack-manager.c +++ b/libcaja-private/caja-undostack-manager.c @@ -795,22 +795,22 @@ get_all_trashed_items (GQueue *stack) while ((action = (CajaUndoStackActionData *) g_queue_pop_tail (tmp_stack)) != NULL) if (action->trashed) - for (l = g_hash_table_get_keys (action->trashed); l != NULL; l=l->next) { + for (l = g_hash_table_get_keys (action->trashed); l != NULL; l=l->next) { trash = g_list_append(trash, l->data); } - + g_queue_free (tmp_stack); return (trash); } -static gboolean +static gboolean is_destination_uri_action_partof_trashed(GList *trash, GList *g) { GList *l; char *uri; - for (l = trash; l != NULL; l=l->next) { - for (; g != NULL; g=g->next) { + for (l = trash; l != NULL; l=l->next) { + for (; g != NULL; g=g->next) { //printf ("destinations: %s\n", g_file_get_uri(l->data)); uri = g_file_get_uri(g->data); if (!strcmp (uri, l->data)) { diff --git a/libcaja-private/caja-undostack-manager.h b/libcaja-private/caja-undostack-manager.h index df08d58c..9538096c 100644 --- a/libcaja-private/caja-undostack-manager.h +++ b/libcaja-private/caja-undostack-manager.h @@ -82,7 +82,7 @@ typedef struct _CajaUndoStackManager typedef struct _CajaUndoStackManagerClass { GObjectClass parent_class; - + } CajaUndoStackManagerClass; #define TYPE_CAJA_UNDOSTACK_MANAGER (caja_undostack_manager_get_type()) @@ -101,7 +101,7 @@ typedef struct _CajaUndoStackManagerClass #define CAJA_UNDOSTACK_MANAGER_GET_CLASS(object) \ (G_TYPE_INSTANCE_GET_CLASS((object), TYPE_CAJA_UNDOSTACK_MANAGER, CajaUndoStackManagerClass)) - + GType caja_undostack_manager_get_type (void); @@ -163,22 +163,22 @@ caja_undostack_manager_request_menu_update(CajaUndoStackManager* manager); void caja_undostack_manager_data_add_file_permissions( CajaUndoStackActionData* data, GFile* file, guint32 permission); - + void caja_undostack_manager_data_set_recursive_permissions( CajaUndoStackActionData* data, guint32 file_permissions, guint32 file_mask, guint32 dir_permissions, guint32 dir_mask); - + void caja_undostack_manager_data_set_file_permissions( CajaUndoStackActionData* data, char* uri, guint32 current_permissions, guint32 new_permissions); - + void caja_undostack_manager_data_set_owner_change_information( CajaUndoStackActionData* data, char* uri, const char* current_user, const char* new_user); - + void caja_undostack_manager_data_set_group_change_information( - CajaUndoStackActionData* data, char* uri, const char* current_group, const char* new_group); + CajaUndoStackActionData* data, char* uri, const char* current_group, const char* new_group); #endif /* CAJA_UNDOSTACK_MANAGER_H */ diff --git a/libcaja-private/caja-window-info.c b/libcaja-private/caja-window-info.c index cce05f7d..9318847f 100644 --- a/libcaja-private/caja-window-info.c +++ b/libcaja-private/caja-window-info.c @@ -90,7 +90,7 @@ caja_window_info_base_init (gpointer g_class) NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - + initialized = TRUE; } } diff --git a/libcaja-private/caja-window-info.h b/libcaja-private/caja-window-info.h index ea2d23c6..00286e40 100644 --- a/libcaja-private/caja-window-info.h +++ b/libcaja-private/caja-window-info.h @@ -156,7 +156,7 @@ extern "C" { (* get_backup_files_mode) (CajaWindowInfo *window); void (* set_backup_files_mode) (CajaWindowInfo *window, CajaWindowShowBackupFilesMode mode); - + CajaWindowSlotInfo * (* get_active_slot) (CajaWindowInfo *window); CajaWindowSlotInfo * (* get_extra_slot) (CajaWindowInfo *window); @@ -197,7 +197,7 @@ extern "C" { CajaWindowShowBackupFilesMode caja_window_info_get_backup_files_mode (CajaWindowInfo *window); void caja_window_info_set_backup_files_mode (CajaWindowInfo *window, CajaWindowShowBackupFilesMode mode); - + gboolean caja_window_info_get_initiated_unmount (CajaWindowInfo *window); void caja_window_info_set_initiated_unmount (CajaWindowInfo *window, gboolean initiated_unmount); diff --git a/src/caja-application.c b/src/caja-application.c index 9cfea1e2..7bb3a030 100644 --- a/src/caja-application.c +++ b/src/caja-application.c @@ -179,7 +179,7 @@ smclient_save_state_cb (EggSMClient *client, char *data; data = caja_application_get_session_data (application); - if (data != NULL) + if (data != NULL) { g_key_file_set_string (state_file, "Caja", @@ -223,9 +223,9 @@ caja_empty_callback_to_ensure_read() { static void open_window (CajaApplication *application, - GFile *location, - GdkScreen *screen, - const char *geometry, + GFile *location, + GdkScreen *screen, + const char *geometry, gboolean browser_window) { CajaApplication *self = CAJA_APPLICATION (application); @@ -271,10 +271,10 @@ open_window (CajaApplication *application, static void open_tabs (CajaApplication *application, - GFile **locations, - guint n_files, - GdkScreen *screen, - const char *geometry, + GFile **locations, + guint n_files, + GdkScreen *screen, + const char *geometry, gboolean browser_window) { CajaApplication *self = CAJA_APPLICATION (application); @@ -283,7 +283,7 @@ open_tabs (CajaApplication *application, /* monitor the preference to use browser or spatial windows */ /* connect before trying to read or this preference won't be read by root or after change */ - g_signal_connect_swapped (caja_preferences, + g_signal_connect_swapped (caja_preferences, "changed::"CAJA_PREFERENCES_ALWAYS_USE_BROWSER, G_CALLBACK (caja_empty_callback_to_ensure_read), self); @@ -305,7 +305,7 @@ open_tabs (CajaApplication *application, caja_window_go_to (window, locations[0]); g_free (uri); for (int i = 1; i< n_files;i++) { - /* open tabs in reverse order because each + /* open tabs in reverse order because each * tab is opened before the previous one */ guint tab = n_files-i; uri = g_file_get_uri (locations[tab]); @@ -345,9 +345,9 @@ open_windows (CajaApplication *application, /* Open one window with one tab at each requested location */ open_tabs (application, files, n_files, screen, geometry, browser_window); } else { - /* Open windows at each requested location. */ + /* Open windows at each requested location. */ i = 0; - while (i < n_files) { + while (i < n_files) { open_window (application, files[i], screen, geometry, browser_window); i++ ; } @@ -416,7 +416,7 @@ caja_application_open_location (CajaApplication *application, } caja_window_slot_open_location_full (caja_window_get_active_slot (window), location, - open_in_tabs, CAJA_WINDOW_OPEN_FLAG_NEW_WINDOW, + open_in_tabs, CAJA_WINDOW_OPEN_FLAG_NEW_WINDOW, sel_list, NULL, NULL); if (sel_list != NULL) { @@ -472,7 +472,7 @@ caja_application_finalize (GObject *object) { g_bus_unwatch_name (application->ss_watch_id); } - + if (application->volume_queue != NULL) { g_list_free_full (application->volume_queue, g_object_unref); @@ -1108,7 +1108,7 @@ check_screen_lock_and_mount (CajaApplication *application, } else { /* mount it immediately */ caja_file_operations_mount_volume (NULL, volume, TRUE); - } + } } static void @@ -1236,13 +1236,13 @@ mount_added_callback (GVolumeMonitor *monitor, CajaDirectory *directory; GFile *root; gchar *uri; - + root = g_mount_get_root (mount); uri = g_file_get_uri (root); g_debug ("Added mount at uri %s", uri); g_free (uri); - + directory = caja_directory_get_existing (root); g_object_unref (root); if (directory != NULL) { @@ -1455,10 +1455,10 @@ caja_application_get_session_data (CajaApplication *self) } win_node = xmlNewChild (root_node, NULL, "window", NULL); - + xmlNewProp (win_node, "location", tmp); g_free (tmp); - + xmlNewProp (win_node, "type", CAJA_IS_NAVIGATION_WINDOW (window) ? "navigation" : "spatial"); if (CAJA_IS_NAVIGATION_WINDOW (window)) { /* spatial windows store their state as file metadata */ @@ -1510,7 +1510,7 @@ caja_application_get_session_data (CajaApplication *self) xmlSaveFlush (ctx) < 0) { g_message ("failed to save session"); } - + xmlSaveClose(ctx); data = g_strndup (buffer->content, buffer->use); xmlBufferFree (buffer); @@ -1551,7 +1551,7 @@ caja_application_load_session (CajaApplication *application) } bail = TRUE; - + doc = xmlReadMemory (data, strlen (data), NULL, "UTF-8", 0); if (doc != NULL && (root_node = xmlDocGetRootElement (doc)) != NULL) { @@ -1738,7 +1738,7 @@ caja_application_load_session (CajaApplication *application) else if (g_strcmp0 (type, "spatial") == 0) { location = g_file_new_for_uri (location_uri); - window = caja_application_get_spatial_window (application, NULL, NULL, + window = caja_application_get_spatial_window (application, NULL, NULL, location, gdk_screen_get_default (), NULL); @@ -1864,7 +1864,7 @@ caja_application_local_command_line (GApplication *application, const GOptionEntry options[] = { #ifndef CAJA_OMIT_SELF_CHECK - { "check", 'c', 0, G_OPTION_ARG_NONE, &perform_self_check, + { "check", 'c', 0, G_OPTION_ARG_NONE, &perform_self_check, N_("Perform a quick set of self-check tests."), NULL }, #endif { "version", '\0', 0, G_OPTION_ARG_NONE, &version, @@ -1877,11 +1877,11 @@ caja_application_local_command_line (GApplication *application, N_("Do not manage the desktop (ignore the preference set in the preferences dialog)."), NULL }, { "force-desktop", '\0', 0, G_OPTION_ARG_NONE, &self->priv->force_desktop, N_("Manage the desktop regardless of set preferences or environment (on new startup only)"), NULL }, - { "tabs", 't', 0, G_OPTION_ARG_NONE, &open_in_tabs, + { "tabs", 't', 0, G_OPTION_ARG_NONE, &open_in_tabs, N_("Open URIs in tabs."), NULL }, - { "browser", '\0', 0, G_OPTION_ARG_NONE, &browser_window, + { "browser", '\0', 0, G_OPTION_ARG_NONE, &browser_window, N_("Open a browser window."), NULL }, - { "quit", 'q', 0, G_OPTION_ARG_NONE, &kill_shell, + { "quit", 'q', 0, G_OPTION_ARG_NONE, &kill_shell, N_("Quit Caja."), NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &remaining, NULL, N_("[URI...]") }, @@ -2021,7 +2021,7 @@ caja_application_local_command_line (GApplication *application, out: g_option_context_free (context); - return TRUE; + return TRUE; } @@ -2095,7 +2095,7 @@ init_desktop (CajaApplication *self) self); } -static gboolean +static gboolean caja_application_save_accel_map (gpointer data) { if (save_of_accel_map_requested) { @@ -2111,14 +2111,14 @@ caja_application_save_accel_map (gpointer data) return FALSE; } -static void +static void queue_accel_map_save_callback (GtkAccelMap *object, gchar *accel_path, guint accel_key, GdkModifierType accel_mods, gpointer user_data) { if (!save_of_accel_map_requested) { save_of_accel_map_requested = TRUE; - g_timeout_add_seconds (CAJA_ACCEL_MAP_SAVE_DELAY, + g_timeout_add_seconds (CAJA_ACCEL_MAP_SAVE_DELAY, caja_application_save_accel_map, NULL); } } @@ -2187,15 +2187,15 @@ caja_application_startup (GApplication *app) /* initialize theming */ init_icons_and_styles (); init_gtk_accels (); - + /* initialize caja modules */ caja_module_setup (); /* attach menu-provider module callback */ menu_provider_init_callback (); - + /* Initialize notifications for eject operations */ - notify_init (GETTEXT_PACKAGE); + notify_init (GETTEXT_PACKAGE); /* Watch for unmounts so we can close open windows */ /* TODO-gio: This should be using the UNMOUNTED feature of GFileMonitor instead */ @@ -2226,7 +2226,7 @@ caja_application_startup (GApplication *app) init_desktop (self); /* exit_with_last_window is already set to TRUE, and we need to keep that value - * on other desktops, running from the command line, or when running caja as root. + * on other desktops, running from the command line, or when running caja as root. * Otherwise, we read the value from the configuration. */ @@ -2234,7 +2234,7 @@ caja_application_startup (GApplication *app) { GApplication *instance; - exit_with_last_window = g_settings_get_boolean (caja_preferences, + exit_with_last_window = g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_EXIT_WITH_LAST_WINDOW); /*Keep this inside the running as mate/not as root block */ /*So other desktop don't get unkillable caja instances holding open */ diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c index 62396d9a..39ef9ef0 100644 --- a/src/caja-connect-server-dialog.c +++ b/src/caja-connect-server-dialog.c @@ -176,7 +176,7 @@ connect_dialog_set_connecting (CajaConnectServerDialog *dialog) gint width, height; connect_dialog_restore_info_bar (dialog, GTK_MESSAGE_INFO); - gtk_widget_show (dialog->details->info_bar); + gtk_widget_show (dialog->details->info_bar); content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (dialog->details->info_bar)); @@ -216,7 +216,7 @@ connect_dialog_gvfs_error (CajaConnectServerDialog *dialog) image = gtk_image_new_from_icon_name ("dialog-error", GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 6); gtk_widget_show (image); - + label = gtk_label_new (_("Can't load the supported server method list.\n" "Please check your GVfs installation.")); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6); @@ -244,7 +244,7 @@ iconized_entry_restore (gpointer data, g_signal_handlers_disconnect_by_func (entry, iconized_entry_changed_cb, - dialog); + dialog); } static void @@ -311,7 +311,7 @@ connect_dialog_set_info_bar_error (CajaConnectServerDialog *dialog, g_free (str); - break; + break; case G_IO_ERROR_FAILED: default: label = gtk_label_new (error->message); @@ -1222,7 +1222,7 @@ caja_connect_server_dialog_fill_details_async (CajaConnectServerDialog *self, g_mount_operation_set_password (G_MOUNT_OPERATION (operation), str); set_flags ^= G_ASK_PASSWORD_NEED_PASSWORD; - + if (flags & G_ASK_PASSWORD_SAVING_SUPPORTED && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->details->remember_checkbox))) { g_mount_operation_set_password_save (G_MOUNT_OPERATION (operation), diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c index a184f7e2..b5db2e30 100644 --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -728,22 +728,22 @@ extension_state_toggled (GtkCellRendererToggle *cell, gchar *path_str, gpointer GtkTreeModel *model; gboolean new_state; Extension *ext; - + path = gtk_tree_path_new_from_string (path_str); model = gtk_tree_view_get_model (GTK_TREE_VIEW (data)); - + g_object_get (G_OBJECT (cell), "active", &new_state, NULL); gtk_tree_model_get_iter_from_string (model, &iter, path_str); - + new_state ^= 1; if (&iter != NULL) { gtk_tree_model_get (model, &iter, EXT_STRUCT_COLUMN, &ext, -1); - + if (caja_extension_set_state (ext, new_state)) { - gtk_list_store_set (GTK_LIST_STORE (model), &iter, + gtk_list_store_set (GTK_LIST_STORE (model), &iter, EXT_STATE_COLUMN, new_state, -1); } } @@ -874,7 +874,7 @@ caja_file_management_properties_dialog_setup_extension_page (GtkBuilder *builder GdkPixbuf *ext_pixbuf_icon; GtkButton *about_button, *configure_button; gchar *ext_text_info; - + GList *extensions; int i; @@ -884,16 +884,16 @@ caja_file_management_properties_dialog_setup_extension_page (GtkBuilder *builder gtk_builder_get_object (builder, "extension_view")); store = GTK_LIST_STORE ( gtk_builder_get_object (builder, "extension_store")); - + toggle = GTK_CELL_RENDERER_TOGGLE ( gtk_builder_get_object (builder, "extension_toggle")); g_object_set (toggle, "xpad", 6, NULL); - + g_signal_connect (toggle, "toggled", G_CALLBACK (extension_state_toggled), view); - + icon_theme = gtk_icon_theme_get_default(); - + for (i = 0; i < g_list_length (extensions); i++) { Extension* ext = EXTENSION (g_list_nth_data (extensions, i)); @@ -926,7 +926,7 @@ caja_file_management_properties_dialog_setup_extension_page (GtkBuilder *builder gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, EXT_STATE_COLUMN, ext->state, - EXT_ICON_COLUMN, ext_pixbuf_icon, + EXT_ICON_COLUMN, ext_pixbuf_icon, EXT_INFO_COLUMN, ext_text_info, EXT_STRUCT_COLUMN, ext, -1); diff --git a/src/caja-main.c b/src/caja-main.c index 8d6c24dd..567cee42 100644 --- a/src/caja-main.c +++ b/src/caja-main.c @@ -242,7 +242,7 @@ main (int argc, char *argv[]) if (g_getenv ("CAJA_DEBUG") != NULL) { eel_make_warnings_and_criticals_stop_in_debugger (); } - + /* Initialize gettext support */ bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); @@ -255,7 +255,7 @@ main (int argc, char *argv[]) if (g_file_test (DATADIR "/applications/caja.desktop", G_FILE_TEST_EXISTS)) { egg_set_desktop_file (DATADIR "/applications/caja.desktop"); } - + #ifdef HAVE_EXEMPI xmp_init(); #endif diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c index a6aa3b5f..e0198243 100644 --- a/src/caja-navigation-window-pane.c +++ b/src/caja-navigation-window-pane.c @@ -62,7 +62,7 @@ real_set_active (CajaWindowPane *pane, gboolean is_active) /* navigation bar (manual entry) */ caja_location_bar_set_active (CAJA_LOCATION_BAR (nav_pane->navigation_bar), is_active); - + /* location button */ gtk_widget_set_sensitive (gtk_bin_get_child (GTK_BIN (nav_pane->location_button)), is_active); } @@ -490,7 +490,7 @@ notebook_switch_page_cb (GtkNotebook *notebook, g_assert (slot != NULL); caja_window_set_active_slot (slot->pane->window, slot); - + caja_window_slot_update_icon (slot); return FALSE; @@ -642,7 +642,7 @@ caja_navigation_window_pane_always_use_location_entry (CajaNavigationWindowPane { caja_navigation_window_pane_set_bar_mode (pane, CAJA_BAR_PATH); } - + g_signal_handlers_block_by_func (pane->location_button, G_CALLBACK (location_button_toggled_cb), pane); @@ -808,7 +808,7 @@ caja_navigation_window_pane_set_bar_mode (CajaNavigationWindowPane *pane, gtk_widget_hide (pane->navigation_bar); break; } - + if (mode == CAJA_BAR_NAVIGATION || mode == CAJA_BAR_PATH) { use_entry = (mode == CAJA_BAR_NAVIGATION); diff --git a/src/caja-navigation-window-ui.xml b/src/caja-navigation-window-ui.xml index 76b34cb8..e9da1a56 100644 --- a/src/caja-navigation-window-ui.xml +++ b/src/caja-navigation-window-ui.xml @@ -13,7 +13,7 @@ <menuitem name="Folder Window" action="Folder Window"/> <separator/> </placeholder> - + <placeholder name="Close Items Placeholder"> <menuitem name="Close All Windows" action="Close All Windows"/> </placeholder> diff --git a/src/caja-navigation-window.c b/src/caja-navigation-window.c index ff1853d5..594acd5a 100644 --- a/src/caja-navigation-window.c +++ b/src/caja-navigation-window.c @@ -144,7 +144,7 @@ caja_navigation_window_init (CajaNavigationWindow *window) gtk_paned_pack2 (GTK_PANED (window->details->content_paned), vbox, TRUE, FALSE); gtk_widget_show (vbox); - + hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0); gtk_widget_show (hpaned); diff --git a/src/caja-pathbar.c b/src/caja-pathbar.c index d742e556..80dfa89e 100644 --- a/src/caja-pathbar.c +++ b/src/caja-pathbar.c @@ -1469,7 +1469,7 @@ set_label_padding_size (ButtonData *button_data) gint width, height, bold_width, bold_height; gint pad_left, pad_right; gchar *markup; - + layout = gtk_widget_create_pango_layout (button_data->label, dir_name); pango_layout_get_pixel_size (layout, &width, &height); @@ -1839,7 +1839,7 @@ button_data_file_changed (CajaFile *file, * will get the event too and call us back. */ current_location = caja_file_get_location (current_button_data->file); - + if (g_file_has_prefix (location, current_location)) { /* remove this and the following buttons */ diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c index 9b263028..5da49a6c 100644 --- a/src/caja-places-sidebar.c +++ b/src/caja-places-sidebar.c @@ -293,7 +293,7 @@ add_heading (CajaPlacesSidebar *sidebar, gtk_list_store_append (sidebar->store, &iter); gtk_list_store_set (sidebar->store, &iter, PLACES_SIDEBAR_COLUMN_ROW_TYPE, PLACES_HEADING, - PLACES_SIDEBAR_COLUMN_SECTION_TYPE, section_type, + PLACES_SIDEBAR_COLUMN_SECTION_TYPE, section_type, PLACES_SIDEBAR_COLUMN_HEADING_TEXT, title, PLACES_SIDEBAR_COLUMN_EJECT, FALSE, PLACES_SIDEBAR_COLUMN_NO_EJECT, TRUE, @@ -563,7 +563,7 @@ update_places (CajaPlacesSidebar *sidebar) location, mount_uri, last_uri, &last_iter, &select_path); - + /* XDG directories */ xdg_dirs = NULL; for (index = 0; index < G_USER_N_DIRECTORIES; index++) { @@ -891,7 +891,7 @@ update_places (CajaPlacesSidebar *sidebar) compare_for_selection (sidebar, location, mount_uri, last_uri, &last_iter, &select_path); - + g_free (location); if (select_path != NULL) { @@ -2259,7 +2259,7 @@ volume_eject_cb (GObject *source_object, NULL); g_free (primary); } - g_error_free (error); + g_error_free (error); } else { diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c index f73d9031..4e17d178 100644 --- a/src/caja-window-manage-views.c +++ b/src/caja-window-manage-views.c @@ -1308,7 +1308,7 @@ got_file_info_for_view_selection_callback (CajaFile *file, */ /* if this is the only window, we don't want to quit, so we redirect it to home */ app = CAJA_APPLICATION (g_application_get_default ()); - + if (g_list_length (gtk_application_get_windows (GTK_APPLICATION (app))) == 1) { /* the user could have typed in a home directory that doesn't exist, diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c index 280ac38c..7e31c122 100644 --- a/src/caja-window-menus.c +++ b/src/caja-window-menus.c @@ -1006,7 +1006,7 @@ caja_window_initialize_menus (CajaWindow *window) g_signal_connect_swapped (caja_preferences, "changed::" CAJA_PREFERENCES_SHOW_BACKUP_FILES, G_CALLBACK(show_backup_files_preference_callback), window); - + window->details->ui_manager = gtk_ui_manager_new (); ui_manager = window->details->ui_manager; gtk_window_add_accel_group (GTK_WINDOW (window), diff --git a/src/caja-window.c b/src/caja-window.c index 8cd52a36..251d6090 100644 --- a/src/caja-window.c +++ b/src/caja-window.c @@ -2059,7 +2059,7 @@ caja_window_info_iface_init (CajaWindowInfoIface *iface) iface->get_selection = caja_window_get_selection; iface->get_hidden_files_mode = caja_window_get_hidden_files_mode; iface->set_hidden_files_mode = caja_window_set_hidden_files_mode; - + iface->get_backup_files_mode = caja_window_get_backup_files_mode; iface->set_backup_files_mode = caja_window_set_backup_files_mode; diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c index 49f4abd7..7c236488 100644 --- a/src/caja-zoom-control.c +++ b/src/caja-zoom-control.c @@ -651,7 +651,7 @@ caja_zoom_control_class_init (CajaZoomControlClass *class) binding_set = gtk_binding_set_by_class (class); gtk_binding_entry_add_signal (binding_set, - GDK_KEY_KP_Subtract, 0, + GDK_KEY_KP_Subtract, 0, "change_value", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_DOWN); @@ -662,21 +662,21 @@ caja_zoom_control_class_init (CajaZoomControlClass *class) GTK_SCROLL_STEP_DOWN); gtk_binding_entry_add_signal (binding_set, - GDK_KEY_KP_Equal, 0, + GDK_KEY_KP_Equal, 0, "zoom_to_default", 0); gtk_binding_entry_add_signal (binding_set, - GDK_KEY_KP_Equal, 0, + GDK_KEY_KP_Equal, 0, "zoom_to_default", 0); gtk_binding_entry_add_signal (binding_set, - GDK_KEY_KP_Add, 0, + GDK_KEY_KP_Add, 0, "change_value", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_UP); gtk_binding_entry_add_signal (binding_set, - GDK_KEY_plus, 0, + GDK_KEY_plus, 0, "change_value", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_UP); diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 1d131771..b03c8e89 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -239,7 +239,7 @@ struct FMDirectoryViewDetails gboolean show_foreign_files; gboolean show_hidden_files; gboolean ignore_hidden_file_preferences; - + gboolean show_backup_files; gboolean batching_selection_level; diff --git a/src/file-manager/fm-tree-model.c b/src/file-manager/fm-tree-model.c index b512d622..7b3dc5d2 100644 --- a/src/file-manager/fm-tree-model.c +++ b/src/file-manager/fm-tree-model.c @@ -105,7 +105,7 @@ struct FMTreeModelDetails gboolean show_hidden_files; gboolean show_backup_files; gboolean show_only_directories; - + GList *highlighted_files; }; diff --git a/test/test-caja-directory-async.c b/test/test-caja-directory-async.c index 6481ca57..32ddcc32 100644 --- a/test/test-caja-directory-async.c +++ b/test/test-caja-directory-async.c @@ -96,7 +96,7 @@ main (int argc, char **argv) g_signal_connect (directory, "files-changed", G_CALLBACK (files_changed), NULL); g_signal_connect (directory, "done-loading", G_CALLBACK (done_loading), NULL); caja_directory_file_monitor_add (directory, client1, TRUE, - CAJA_FILE_ATTRIBUTE_INFO, + CAJA_FILE_ATTRIBUTE_INFO, NULL, NULL); diff --git a/test/test-caja-search-engine.c b/test/test-caja-search-engine.c index 49c949ce..4b08559b 100644 --- a/test/test-caja-search-engine.c +++ b/test/test-caja-search-engine.c @@ -4,7 +4,7 @@ static void hits_added_cb (CajaSearchEngine *engine, GSList *hits) -{ +{ g_print ("hits added\n"); while (hits) { g_print (" - %s\n", (char *)hits->data); @@ -29,7 +29,7 @@ finished_cb (CajaSearchEngine *engine) // gtk_main_quit (); } -int +int main (int argc, char* argv[]) { CajaSearchEngine *engine; @@ -38,11 +38,11 @@ main (int argc, char* argv[]) gtk_init (&argc, &argv); engine = caja_search_engine_new (); - g_signal_connect (engine, "hits-added", + g_signal_connect (engine, "hits-added", G_CALLBACK (hits_added_cb), NULL); - g_signal_connect (engine, "hits-subtracted", + g_signal_connect (engine, "hits-subtracted", G_CALLBACK (hits_subtracted_cb), NULL); - g_signal_connect (engine, "finished", + g_signal_connect (engine, "finished", G_CALLBACK (finished_cb), NULL); query = caja_query_new (); @@ -51,7 +51,7 @@ main (int argc, char* argv[]) g_object_unref (query); caja_search_engine_start (engine); - + gtk_main (); return 0; } diff --git a/test/test-caja-wrap-table.c b/test/test-caja-wrap-table.c index 43dfe632..1af209bc 100644 --- a/test/test-caja-wrap-table.c +++ b/test/test-caja-wrap-table.c @@ -6,7 +6,7 @@ #include "test.h" -int +int main (int argc, char* argv[]) { CajaCustomizationData *customization_data; @@ -27,7 +27,7 @@ main (int argc, char* argv[]) gtk_widget_show (emblems_table); gtk_container_set_border_width (GTK_CONTAINER (emblems_table), 8); - + scroller = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroller), GTK_POLICY_NEVER, @@ -42,30 +42,30 @@ main (int argc, char* argv[]) gtk_widget_show (scroller); #if 0 - /* Get rid of default lowered shadow appearance. + /* Get rid of default lowered shadow appearance. * This must be done after the widget is realized, due to * an apparent bug in gtk_viewport_set_shadow_type. */ - g_signal_connect (GTK_BIN (scroller->child), - "realize", - remove_default_viewport_shadow, + g_signal_connect (GTK_BIN (scroller->child), + "realize", + remove_default_viewport_shadow, NULL); #endif /* Use caja_customization to make the emblem widgets */ customization_data = caja_customization_data_new ("emblems", TRUE, - CAJA_ICON_SIZE_SMALL, + CAJA_ICON_SIZE_SMALL, CAJA_ICON_SIZE_SMALL); - + while (caja_customization_data_get_next_element_for_display (customization_data, &emblem_name, &pixbuf, - &label)) { + &label)) { stripped_name = eel_filename_strip_extension (emblem_name); g_free (emblem_name); - + if (strcmp (stripped_name, "erase") == 0) { g_object_unref (pixbuf); g_free (label); @@ -82,15 +82,15 @@ main (int argc, char* argv[]) "caja_property_name", stripped_name, (GDestroyNotify) g_free); - + gtk_container_add (GTK_CONTAINER (emblems_table), button); } gtk_widget_show_all (emblems_table); gtk_widget_show (window); - + gtk_main (); - + return 0; } diff --git a/test/test-copy.c b/test/test-copy.c index fabd7673..ea42e257 100644 --- a/test/test-copy.c +++ b/test/test-copy.c @@ -34,7 +34,7 @@ finished_cb (CajaProgressInfo *info, gtk_main_quit (); } -int +int main (int argc, char* argv[]) { GtkWidget *window; @@ -58,11 +58,11 @@ main (int argc, char* argv[]) sources = g_list_prepend (sources, source); } sources = g_list_reverse (sources); - + dest = g_file_new_for_commandline_arg (argv[i]); - + window = test_window_new ("copy test", 5); - + gtk_widget_show (window); caja_file_operations_copy (sources, @@ -82,9 +82,9 @@ main (int argc, char* argv[]) g_signal_connect (progress_info, "changed", (GCallback)changed_cb, NULL); g_signal_connect (progress_info, "progress-changed", (GCallback)progress_changed_cb, NULL); g_signal_connect (progress_info, "finished", (GCallback)finished_cb, NULL); - + gtk_main (); - + return 0; } diff --git a/test/test-eel-editable-label.c b/test/test-eel-editable-label.c index 154a1a4e..db30a079 100644 --- a/test/test-eel-editable-label.c +++ b/test/test-eel-editable-label.c @@ -12,13 +12,13 @@ quit (GtkWidget *widget, gpointer data) gtk_main_quit (); } -int +int main (int argc, char* argv[]) { GtkWidget *window; GtkWidget *label; GtkWidget *vbox; - + gtk_init (&argc, &argv); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -27,30 +27,30 @@ main (int argc, char* argv[]) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (window), vbox); - + label = eel_editable_label_new ("Centered dsau dsfgsdfgoydsfiugy oiusdyfg iouysdf goiuys dfioguy siodufgy iusdyfgiu ydsf giusydf gouiysdfgoiuysdfg oiudyfsg Label"); gtk_widget_set_size_request (label, 200, -1); eel_editable_label_set_line_wrap (EEL_EDITABLE_LABEL (label), TRUE); - + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 4); label = eel_editable_label_new ("Left aligned label"); gtk_label_set_xalign (GTK_LABEL (label), 0.0); - + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 4); label = eel_editable_label_new ("Right aligned label"); gtk_label_set_xalign (GTK_LABEL (label), 1.0); - + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 4); - + gtk_window_set_default_size (GTK_WINDOW (window), 300, 300); - - gtk_widget_show_all (window); - + + gtk_widget_show_all (window); + gtk_main (); return 0; diff --git a/test/test-eel-labeled-image.c b/test/test-eel-labeled-image.c index b9dd9cd7..b5f4e829 100644 --- a/test/test-eel-labeled-image.c +++ b/test/test-eel-labeled-image.c @@ -10,7 +10,7 @@ button_callback (GtkWidget *button, { const char *info = callback_data; g_return_if_fail (GTK_IS_BUTTON (button)); - + g_print ("%s(%p)\n", info, button); } @@ -51,11 +51,11 @@ labeled_image_button_window_new (const char *title, } gtk_widget_show_all (vbox); - + return window; } -int +int main (int argc, char* argv[]) { GtkWidget *labeled_image_window = NULL; @@ -71,7 +71,7 @@ main (int argc, char* argv[]) if (labeled_image_window) gtk_widget_show (labeled_image_window); if (labeled_image_button_window) gtk_widget_show (labeled_image_button_window); - + gtk_main (); return test_quit (EXIT_SUCCESS); diff --git a/test/test-eel-pixbuf-scale.c b/test/test-eel-pixbuf-scale.c index 22999f03..bace672d 100644 --- a/test/test-eel-pixbuf-scale.c +++ b/test/test-eel-pixbuf-scale.c @@ -9,14 +9,14 @@ #define DEST_WIDTH 32 #define DEST_HEIGHT 32 -int +int main (int argc, char* argv[]) { GdkPixbuf *pixbuf, *scaled; GError *error; struct timeval t1, t2; int i; - + test_init (&argc, &argv); if (argc != 2) { @@ -31,11 +31,11 @@ main (int argc, char* argv[]) printf ("error loading pixbuf: %s\n", error->message); exit (1); } - + printf ("scale factors: %f, %f\n", (double)gdk_pixbuf_get_width(pixbuf)/DEST_WIDTH, (double)gdk_pixbuf_get_height(pixbuf)/DEST_HEIGHT); - + gettimeofday(&t1, NULL); for (i = 0; i < N_SCALES; i++) { scaled = eel_gdk_pixbuf_scale_down (pixbuf, DEST_WIDTH, DEST_HEIGHT); @@ -44,9 +44,9 @@ main (int argc, char* argv[]) gettimeofday(&t2, NULL); g_print ("Time for eel_gdk_pixbuf_scale_down: %ld msecs\n", (t2.tv_sec - t1.tv_sec) * 1000 + (t2.tv_usec - t1.tv_usec) / 1000); - - - + + + gettimeofday(&t1, NULL); for (i = 0; i < N_SCALES; i++) { scaled = gdk_pixbuf_scale_simple (pixbuf, DEST_WIDTH, DEST_HEIGHT, GDK_INTERP_NEAREST); @@ -56,7 +56,7 @@ main (int argc, char* argv[]) g_print ("Time for INTERP_NEAREST: %ld msecs\n", (t2.tv_sec - t1.tv_sec) * 1000 + (t2.tv_usec - t1.tv_usec) / 1000); - + gettimeofday(&t1, NULL); for (i = 0; i < N_SCALES; i++) { scaled = gdk_pixbuf_scale_simple (pixbuf, DEST_WIDTH, DEST_HEIGHT, GDK_INTERP_BILINEAR); @@ -65,17 +65,17 @@ main (int argc, char* argv[]) gettimeofday(&t2, NULL); g_print ("Time for INTERP_BILINEAR: %ld msecs\n", (t2.tv_sec - t1.tv_sec) * 1000 + (t2.tv_usec - t1.tv_usec) / 1000); - + scaled = eel_gdk_pixbuf_scale_down (pixbuf, DEST_WIDTH, DEST_HEIGHT); - gdk_pixbuf_save (scaled, "eel_scaled.png", "png", NULL, NULL); + gdk_pixbuf_save (scaled, "eel_scaled.png", "png", NULL, NULL); g_object_unref (scaled); scaled = gdk_pixbuf_scale_simple (pixbuf, DEST_WIDTH, DEST_HEIGHT, GDK_INTERP_NEAREST); - gdk_pixbuf_save (scaled, "nearest_scaled.png", "png", NULL, NULL); + gdk_pixbuf_save (scaled, "nearest_scaled.png", "png", NULL, NULL); g_object_unref (scaled); scaled = gdk_pixbuf_scale_simple (pixbuf, DEST_WIDTH, DEST_HEIGHT, GDK_INTERP_BILINEAR); - gdk_pixbuf_save (scaled, "bilinear_scaled.png", "png", NULL, NULL); + gdk_pixbuf_save (scaled, "bilinear_scaled.png", "png", NULL, NULL); g_object_unref (scaled); return 0; diff --git a/test/test.c b/test/test.c index 103f8b85..d50d3321 100644 --- a/test/test.c +++ b/test/test.c @@ -35,16 +35,16 @@ test_window_new (const char *title, guint border_width) GtkWidget *window; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - + if (title != NULL) { gtk_window_set_title (GTK_WINDOW (window), title); } g_signal_connect (window, "delete_event", G_CALLBACK (test_delete_event), NULL); - + gtk_container_set_border_width (GTK_CONTAINER (window), border_width); - + return window; } @@ -59,7 +59,7 @@ test_gtk_widget_set_background_image (GtkWidget *widget, g_return_if_fail (image_name != NULL); background = eel_get_widget_background (widget); - + uri = g_strdup_printf ("file://%s/%s", CAJA_DATADIR, image_name); eel_background_set_image_uri (background, uri); @@ -77,7 +77,7 @@ test_gtk_widget_set_background_color (GtkWidget *widget, g_return_if_fail (color_spec != NULL); background = eel_get_widget_background (widget); - + eel_background_set_color (background, color_spec); } @@ -101,7 +101,7 @@ test_pixbuf_new_named (const char *name, float scale) g_free (path); g_return_val_if_fail (pixbuf != NULL, NULL); - + if (scale != 1.0) { GdkPixbuf *scaled; float width = gdk_pixbuf_get_width (pixbuf) * scale; @@ -129,18 +129,18 @@ test_label_new (const char *text, if (text == NULL) { text = "Foo"; } - + label = gtk_label_new (text); return label; } -void +void test_window_set_title_with_pid (GtkWindow *window, const char *title) { char *tmp; - + g_return_if_fail (GTK_IS_WINDOW (window)); tmp = g_strdup_printf ("%lu: %s", (gulong) getpid (), title); |