diff options
28 files changed, 236 insertions, 236 deletions
diff --git a/configure.ac b/configure.ac index 021ba56..2b856c0 100644 --- a/configure.ac +++ b/configure.ac @@ -312,7 +312,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package]) AM_GLIB_GNU_GETTEXT AC_OUTPUT([ - Makefile + Makefile gksu/libcaja-gksu.caja-extension.in gksu/Makefile image-converter/libcaja-image-converter.caja-extension.in @@ -337,7 +337,7 @@ AC_OUTPUT([ wallpaper/Makefile xattr-tags/libcaja-xattr-tags.caja-extension.in xattr-tags/Makefile - po/Makefile.in + po/Makefile.in ]) echo " diff --git a/image-converter/caja-image-converter.c b/image-converter/caja-image-converter.c index 8840258..61c0084 100644 --- a/image-converter/caja-image-converter.c +++ b/image-converter/caja-image-converter.c @@ -1,6 +1,6 @@ /* * caja-image-converter.c - * + * * Copyright (C) 2004-2005 Jürg Billeter * * This library is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Jürg Billeter <[email protected]> - * + * */ #ifdef HAVE_CONFIG_H @@ -50,7 +50,7 @@ image_converter_file_is_image (CajaFileInfo *file_info) gchar *uri_scheme; gchar *mime_type; gboolean maybe_image; - + maybe_image = TRUE; uri_scheme = caja_file_info_get_uri_scheme (file_info); if (strcmp (uri_scheme, "file") != 0) @@ -61,7 +61,7 @@ image_converter_file_is_image (CajaFileInfo *file_info) if (strncmp (mime_type, "image/", 6) != 0) maybe_image = FALSE; g_free (mime_type); - + return maybe_image; } @@ -70,14 +70,14 @@ image_converter_filter_images (GList *files) { GList *images; GList *file; - + images = NULL; - + for (file = files; file != NULL; file = file->next) { if (image_converter_file_is_image (file->data)) images = g_list_prepend (images, file->data); } - + return images; } @@ -113,7 +113,7 @@ caja_image_converter_get_file_items (CajaMenuProvider *provider, CajaMenuItem *item; GList *file; GList *items = NULL; - + for (file = files; file != NULL; file = file->next) { if (image_converter_file_is_image (file->data)) { item = caja_menu_item_new ("CajaImageConverter::resize", @@ -123,7 +123,7 @@ caja_image_converter_get_file_items (CajaMenuProvider *provider, g_signal_connect (item, "activate", G_CALLBACK (image_resize_callback), caja_file_info_list_copy (files)); - + items = g_list_prepend (items, item); item = caja_menu_item_new ("CajaImageConverter::rotate", @@ -135,13 +135,13 @@ caja_image_converter_get_file_items (CajaMenuProvider *provider, caja_file_info_list_copy (files)); items = g_list_prepend (items, item); - + items = g_list_reverse (items); return items; } } - + return NULL; } @@ -152,7 +152,7 @@ caja_image_converter_menu_provider_iface_init (CajaMenuProviderIface *iface) iface->get_file_items = caja_image_converter_get_file_items; } -static void +static void caja_image_converter_instance_init (CajaImageConverter *img) { } @@ -163,7 +163,7 @@ caja_image_converter_class_init (CajaImageConverterClass *class) } GType -caja_image_converter_get_type (void) +caja_image_converter_get_type (void) { return image_converter_type; } @@ -176,7 +176,7 @@ caja_image_converter_register_type (GTypeModule *module) (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) caja_image_converter_class_init, - NULL, + NULL, NULL, sizeof (CajaImageConverter), 0, diff --git a/image-converter/caja-image-converter.h b/image-converter/caja-image-converter.h index 09839c7..c8beba7 100644 --- a/image-converter/caja-image-converter.h +++ b/image-converter/caja-image-converter.h @@ -1,6 +1,6 @@ /* * caja-image-converter.h - * + * * Copyright (C) 2004-2005 Jürg Billeter * * This library is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Jürg Billeter <[email protected]> - * + * */ #ifndef CAJA_IMAGE_CONVERTER_H @@ -29,7 +29,7 @@ G_BEGIN_DECLS /* Declarations for the open terminal extension object. This object will be - * instantiated by caja. It implements the GInterfaces + * instantiated by caja. It implements the GInterfaces * exported by libcaja. */ diff --git a/image-converter/caja-image-resizer.c b/image-converter/caja-image-resizer.c index 3409d91..ae33b23 100644 --- a/image-converter/caja-image-resizer.c +++ b/image-converter/caja-image-resizer.c @@ -1,6 +1,6 @@ /* * caja-image-resizer.c - * + * * Copyright (C) 2004-2008 Jürg Billeter * * This library is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Jürg Billeter <[email protected]> - * + * */ #ifdef HAVE_CONFIG_H @@ -34,18 +34,18 @@ #include <gtk/gtk.h> #include <libcaja-extension/caja-file-info.h> - + typedef struct _CajaImageResizerPrivate CajaImageResizerPrivate; struct _CajaImageResizerPrivate { GList *files; - + gchar *suffix; - + int images_resized; int images_total; gboolean cancelled; - + gchar *size; GtkDialog *resize_dialog; @@ -84,9 +84,9 @@ caja_image_resizer_finalize(GObject *object) { CajaImageResizer *dialog = CAJA_IMAGE_RESIZER (object); CajaImageResizerPrivate *priv = CAJA_IMAGE_RESIZER_GET_PRIVATE (dialog); - + g_free (priv->suffix); - + G_OBJECT_CLASS(caja_image_resizer_parent_class)->finalize(object); } @@ -162,17 +162,17 @@ caja_image_resizer_transform_filename (CajaImageResizer *resizer, GFile *orig_fi GFile *parent_file, *new_file; char *basename, *extension, *new_basename; - + g_return_val_if_fail (G_IS_FILE (orig_file), NULL); parent_file = g_file_get_parent (orig_file); basename = g_strdup (g_file_get_basename (orig_file)); - + extension = g_strdup (strrchr (basename, '.')); if (extension != NULL) basename[strlen (basename) - strlen (extension)] = '\0'; - + new_basename = g_strdup_printf ("%s%s%s", basename, priv->suffix == NULL ? ".tmp" : priv->suffix, extension == NULL ? "" : extension); @@ -192,11 +192,11 @@ op_finished (GPid pid, gint status, gpointer data) { CajaImageResizer *resizer = CAJA_IMAGE_RESIZER (data); CajaImageResizerPrivate *priv = CAJA_IMAGE_RESIZER_GET_PRIVATE (resizer); - + gboolean retry = TRUE; - + CajaFileInfo *file = CAJA_FILE_INFO (priv->files->data); - + if (status != 0) { /* resizing failed */ char *name = caja_file_info_get_name (file); @@ -207,12 +207,12 @@ op_finished (GPid pid, gint status, gpointer data) "'%s' cannot be resized. Check whether you have permission to write to this folder.", name); g_free (name); - + gtk_dialog_add_button (GTK_DIALOG (msg_dialog), _("_Skip"), 1); gtk_dialog_add_button (GTK_DIALOG (msg_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); gtk_dialog_add_button (GTK_DIALOG (msg_dialog), _("_Retry"), 0); gtk_dialog_set_default_response (GTK_DIALOG (msg_dialog), 0); - + int response_id = gtk_dialog_run (GTK_DIALOG (msg_dialog)); gtk_widget_destroy (msg_dialog); if (response_id == 0) { @@ -222,7 +222,7 @@ op_finished (GPid pid, gint status, gpointer data) } else if (response_id == 1) { retry = FALSE; } - + } else if (priv->suffix == NULL) { /* resize image in place */ GFile *orig_location = caja_file_info_get_location (file); @@ -237,7 +237,7 @@ op_finished (GPid pid, gint status, gpointer data) priv->images_resized++; priv->files = priv->files->next; } - + if (!priv->cancelled && priv->files != NULL) { /* process next image */ run_op (resizer); @@ -251,9 +251,9 @@ static void run_op (CajaImageResizer *resizer) { CajaImageResizerPrivate *priv = CAJA_IMAGE_RESIZER_GET_PRIVATE (resizer); - + g_return_if_fail (priv->files != NULL); - + CajaFileInfo *file = CAJA_FILE_INFO (priv->files->data); GFile *orig_location = caja_file_info_get_location (file); @@ -264,7 +264,7 @@ run_op (CajaImageResizer *resizer) g_object_unref (new_location); /* FIXME: check whether new_uri already exists and provide "Replace _All", "_Skip", and "_Replace" options */ - + gchar *argv[6]; argv[0] = "/usr/bin/convert"; argv[1] = filename; @@ -272,32 +272,32 @@ run_op (CajaImageResizer *resizer) argv[3] = priv->size; argv[4] = new_filename; argv[5] = NULL; - + pid_t pid; if (!g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, NULL)) { // FIXME: error handling return; } - + g_free (filename); g_free (new_filename); - + g_child_watch_add (pid, op_finished, resizer); - + char *tmp; gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progress_bar), (double) (priv->images_resized + 1) / priv->images_total); tmp = g_strdup_printf (_("Resizing image: %d of %d"), priv->images_resized + 1, priv->images_total); gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->progress_bar), tmp); g_free (tmp); - + char *name = caja_file_info_get_name (file); tmp = g_strdup_printf (_("<i>Resizing \"%s\"</i>"), name); g_free (name); gtk_label_set_markup (GTK_LABEL (priv->progress_label), tmp); g_free (tmp); - + } static void @@ -325,7 +325,7 @@ caja_image_resizer_response_cb (GtkDialog *dialog, gint response_id, gpointer us } else { priv->size = g_strdup_printf ("%dx%d", (int) gtk_spin_button_get_value (priv->width_spinbutton), (int) gtk_spin_button_get_value (priv->height_spinbutton)); } - + run_op (resizer); } diff --git a/image-converter/caja-image-resizer.h b/image-converter/caja-image-resizer.h index 177165b..f55d160 100644 --- a/image-converter/caja-image-resizer.h +++ b/image-converter/caja-image-resizer.h @@ -1,6 +1,6 @@ /* * caja-image-resize-dialog.h - * + * * Copyright (C) 2004-2005 Jürg Billeter * * This library is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Jürg Billeter <[email protected]> - * + * */ #ifndef CAJA_IMAGE_RESIZER_H diff --git a/image-converter/caja-image-rotator.c b/image-converter/caja-image-rotator.c index 32c3d09..30b8094 100644 --- a/image-converter/caja-image-rotator.c +++ b/image-converter/caja-image-rotator.c @@ -1,6 +1,6 @@ /* * caja-image-rotator.c - * + * * Copyright (C) 2004-2008 Jürg Billeter * * This library is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Jürg Billeter <[email protected]> - * + * */ #ifdef HAVE_CONFIG_H @@ -34,18 +34,18 @@ #include <gtk/gtk.h> #include <libcaja-extension/caja-file-info.h> - + typedef struct _CajaImageRotatorPrivate CajaImageRotatorPrivate; struct _CajaImageRotatorPrivate { GList *files; - + gchar *suffix; - + int images_rotated; int images_total; gboolean cancelled; - + gchar *angle; GtkDialog *rotate_dialog; @@ -81,9 +81,9 @@ caja_image_rotator_finalize(GObject *object) { CajaImageRotator *dialog = CAJA_IMAGE_ROTATOR (object); CajaImageRotatorPrivate *priv = CAJA_IMAGE_ROTATOR_GET_PRIVATE (dialog); - + g_free (priv->suffix); - + G_OBJECT_CLASS(caja_image_rotator_parent_class)->finalize(object); } @@ -159,17 +159,17 @@ caja_image_rotator_transform_filename (CajaImageRotator *rotator, GFile *orig_fi GFile *parent_file, *new_file; char *basename, *extension, *new_basename; - + g_return_val_if_fail (G_IS_FILE (orig_file), NULL); parent_file = g_file_get_parent (orig_file); basename = g_strdup (g_file_get_basename (orig_file)); - + extension = g_strdup (strrchr (basename, '.')); if (extension != NULL) basename[strlen (basename) - strlen (extension)] = '\0'; - + new_basename = g_strdup_printf ("%s%s%s", basename, priv->suffix == NULL ? ".tmp" : priv->suffix, extension == NULL ? "" : extension); @@ -189,11 +189,11 @@ op_finished (GPid pid, gint status, gpointer data) { CajaImageRotator *rotator = CAJA_IMAGE_ROTATOR (data); CajaImageRotatorPrivate *priv = CAJA_IMAGE_ROTATOR_GET_PRIVATE (rotator); - + gboolean retry = TRUE; - + CajaFileInfo *file = CAJA_FILE_INFO (priv->files->data); - + if (status != 0) { /* rotating failed */ char *name = caja_file_info_get_name (file); @@ -204,12 +204,12 @@ op_finished (GPid pid, gint status, gpointer data) "'%s' cannot be rotated. Check whether you have permission to write to this folder.", name); g_free (name); - + gtk_dialog_add_button (GTK_DIALOG (msg_dialog), _("_Skip"), 1); gtk_dialog_add_button (GTK_DIALOG (msg_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); gtk_dialog_add_button (GTK_DIALOG (msg_dialog), _("_Retry"), 0); gtk_dialog_set_default_response (GTK_DIALOG (msg_dialog), 0); - + int response_id = gtk_dialog_run (GTK_DIALOG (msg_dialog)); gtk_widget_destroy (msg_dialog); if (response_id == 0) { @@ -219,7 +219,7 @@ op_finished (GPid pid, gint status, gpointer data) } else if (response_id == 1) { retry = FALSE; } - + } else if (priv->suffix == NULL) { /* rotate image in place */ GFile *orig_location = caja_file_info_get_location (file); @@ -234,7 +234,7 @@ op_finished (GPid pid, gint status, gpointer data) priv->images_rotated++; priv->files = priv->files->next; } - + if (!priv->cancelled && priv->files != NULL) { /* process next image */ run_op (rotator); @@ -248,9 +248,9 @@ static void run_op (CajaImageRotator *rotator) { CajaImageRotatorPrivate *priv = CAJA_IMAGE_ROTATOR_GET_PRIVATE (rotator); - + g_return_if_fail (priv->files != NULL); - + CajaFileInfo *file = CAJA_FILE_INFO (priv->files->data); GFile *orig_location = caja_file_info_get_location (file); @@ -261,7 +261,7 @@ run_op (CajaImageRotator *rotator) g_object_unref (new_location); /* FIXME: check whether new_uri already exists and provide "Replace _All", "_Skip", and "_Replace" options */ - + gchar *argv[8]; argv[0] = "/usr/bin/convert"; argv[1] = filename; @@ -271,32 +271,32 @@ run_op (CajaImageRotator *rotator) argv[5] = "TopLeft"; argv[6] = new_filename; argv[7] = NULL; - + pid_t pid; if (!g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, NULL)) { // FIXME: error handling return; } - + g_free (filename); g_free (new_filename); - + g_child_watch_add (pid, op_finished, rotator); - + char *tmp; gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progress_bar), (double) (priv->images_rotated + 1) / priv->images_total); tmp = g_strdup_printf (_("Rotating image: %d of %d"), priv->images_rotated + 1, priv->images_total); gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->progress_bar), tmp); g_free (tmp); - + char *name = caja_file_info_get_name (file); tmp = g_strdup_printf (_("<i>Rotating \"%s\"</i>"), name); g_free (name); gtk_label_set_markup (GTK_LABEL (priv->progress_label), tmp); g_free (tmp); - + } static void @@ -336,7 +336,7 @@ caja_image_rotator_response_cb (GtkDialog *dialog, gint response_id, gpointer us } else { g_assert_not_reached (); } - + run_op (rotator); } diff --git a/image-converter/caja-image-rotator.h b/image-converter/caja-image-rotator.h index 81ea848..55222d3 100644 --- a/image-converter/caja-image-rotator.h +++ b/image-converter/caja-image-rotator.h @@ -1,6 +1,6 @@ /* * caja-image-rotator.h - * + * * Copyright (C) 2004-2006 Jürg Billeter * * This library is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Jürg Billeter <[email protected]> - * + * */ #ifndef CAJA_IMAGE_ROTATOR_H diff --git a/image-converter/image-converter.c b/image-converter/image-converter.c index c6fed17..d793ef9 100644 --- a/image-converter/image-converter.c +++ b/image-converter/image-converter.c @@ -1,6 +1,6 @@ /* * image-converter.c - * + * * Copyright (C) 2004-2005 Jürg Billeter * * This library is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Jürg Billeter <[email protected]> - * + * */ #ifdef HAVE_CONFIG_H @@ -49,7 +49,7 @@ caja_module_shutdown (void) g_print ("Shutting down caja-image-converter extension\n"); } -void +void caja_module_list_types (const GType **types, int *num_types) { diff --git a/open-terminal/caja-open-terminal.c b/open-terminal/caja-open-terminal.c index 1c7d683..b2d18e5 100644 --- a/open-terminal/caja-open-terminal.c +++ b/open-terminal/caja-open-terminal.c @@ -1,6 +1,6 @@ /* * caja-open-terminal.c - * + * * Copyright (C) 2004, 2005 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Christian Neumair <[email protected]> - * + * */ #ifdef HAVE_CONFIG_H @@ -260,7 +260,7 @@ append_sftp_info (char **terminal_exec, g_assert (terminal_exec != NULL); g_assert (file_info != NULL); - + vfs_uri = g_file_new_for_uri (caja_file_info_get_activation_uri (file_info)); g_assert (vfs_uri != NULL); @@ -425,7 +425,7 @@ open_terminal_callback (CajaMenuItem *item, g_message ("CajaOpenTerminal: Failed to close Caja working directory."); } } - } else { + } else { g_spawn_async (working_directory, argv, NULL, @@ -611,7 +611,7 @@ caja_open_terminal_configurable_iface_init (CajaConfigurableIface *iface) iface->run_config = caja_open_terminal_run_config; } -static void +static void caja_open_terminal_instance_init (CajaOpenTerminal *cvs) { } @@ -622,7 +622,7 @@ caja_open_terminal_class_init (CajaOpenTerminalClass *class) } GType -caja_open_terminal_get_type (void) +caja_open_terminal_get_type (void) { return terminal_type; } @@ -635,7 +635,7 @@ caja_open_terminal_register_type (GTypeModule *module) (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) caja_open_terminal_class_init, - NULL, + NULL, NULL, sizeof (CajaOpenTerminal), 0, diff --git a/open-terminal/caja-open-terminal.h b/open-terminal/caja-open-terminal.h index 16c435d..c5c0dc1 100644 --- a/open-terminal/caja-open-terminal.h +++ b/open-terminal/caja-open-terminal.h @@ -1,6 +1,6 @@ /* * caja-open-terminal.h - * + * * Copyright (C) 2004, 2005 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Christian Neumair <[email protected]> - * + * */ #ifndef CAJA_OPEN_TERMINAL_H @@ -29,7 +29,7 @@ G_BEGIN_DECLS /* Declarations for the open terminal extension object. This object will be - * instantiated by caja. It implements the GInterfaces + * instantiated by caja. It implements the GInterfaces * exported by libcaja. */ diff --git a/open-terminal/open-terminal.c b/open-terminal/open-terminal.c index 1e60dca..ff21ec1 100644 --- a/open-terminal/open-terminal.c +++ b/open-terminal/open-terminal.c @@ -1,6 +1,6 @@ /* * open-terminal.c - * + * * Copyright (C) 2004, 2005 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Christian Neumair <[email protected]> - * + * */ #ifdef HAVE_CONFIG_H @@ -49,7 +49,7 @@ caja_module_shutdown (void) g_print ("Shutting down caja-open-terminal extension\n"); } -void +void caja_module_list_types (const GType **types, int *num_types) { diff --git a/sendto/caja-nste.c b/sendto/caja-nste.c index 9814f74..1f62ecf 100644 --- a/sendto/caja-nste.c +++ b/sendto/caja-nste.c @@ -1,6 +1,6 @@ /* - * Caja-sendto - * + * Caja-sendto + * * Copyright (C) 2004 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or @@ -17,8 +17,8 @@ * License along with this library; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - * Author: Roberto Majadas <[email protected]> - * + * Author: Roberto Majadas <[email protected]> + * */ #include <config.h> @@ -72,7 +72,7 @@ caja_nste_get_file_items (CajaMenuProvider *provider, return NULL; one_item = (files != NULL) && (files->next == NULL); - if (one_item && + if (one_item && !caja_file_info_is_directory ((CajaFileInfo *)files->data)) { item = caja_menu_item_new ("CajaNste::sendto", _("Send to..."), @@ -84,11 +84,11 @@ caja_nste_get_file_items (CajaMenuProvider *provider, _("Send files by mail, instant message..."), "document-send"); } - g_signal_connect (item, + g_signal_connect (item, "activate", G_CALLBACK (sendto_callback), provider); - g_object_set_data_full (G_OBJECT (item), + g_object_set_data_full (G_OBJECT (item), "files", caja_file_info_list_copy (files), (GDestroyNotify) caja_file_info_list_free); @@ -99,14 +99,14 @@ caja_nste_get_file_items (CajaMenuProvider *provider, } -static void +static void caja_nste_menu_provider_iface_init (CajaMenuProviderIface *iface) { iface->get_file_items = caja_nste_get_file_items; } -static void +static void caja_nste_instance_init (CajaNste *nste) { } @@ -123,7 +123,7 @@ static GType nste_type = 0; GType -caja_nste_get_type (void) +caja_nste_get_type (void) { return nste_type; } @@ -137,7 +137,7 @@ caja_nste_register_type (GTypeModule *module) (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) caja_nste_class_init, - NULL, + NULL, NULL, sizeof (CajaNste), 0, diff --git a/sendto/caja-nste.h b/sendto/caja-nste.h index 87b5222..113711c 100644 --- a/sendto/caja-nste.h +++ b/sendto/caja-nste.h @@ -1,7 +1,7 @@ /* - * Caja SendTo extension - * - * Copyright (C) 2005 Roberto Majadas + * Caja SendTo extension + * + * Copyright (C) 2005 Roberto Majadas * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -17,8 +17,8 @@ * License along with this library; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - * Author: Roberto Majadas <[email protected]> - * + * Author: Roberto Majadas <[email protected]> + * */ #ifndef CAJA_NSTE_H diff --git a/sendto/caja-sendto-command.c b/sendto/caja-sendto-command.c index ede4774..d10859a 100644 --- a/sendto/caja-sendto-command.c +++ b/sendto/caja-sendto-command.c @@ -1,8 +1,8 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * Copyright (C) 2004 Roberto Majadas - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of the @@ -81,7 +81,7 @@ static const GOptionEntry entries[] = { { NULL } }; -static void +static void destroy_dialog (GtkWidget *widget, gpointer data ) { gtk_main_quit (); @@ -190,9 +190,9 @@ pack_files (NS_ui *ui) filename = gtk_entry_get_text(GTK_ENTRY(ui->pack_entry)); g_assert (filename != NULL && *filename != '\0'); - - tmp_dir = g_strdup_printf ("%s/caja-sendto-%s", - g_get_tmp_dir(), g_get_user_name()); + + tmp_dir = g_strdup_printf ("%s/caja-sendto-%s", + g_get_tmp_dir(), g_get_user_name()); g_mkdir (tmp_dir, 0700); tmp_work_dir = g_strdup_printf ("%s/caja-sendto-%s/%li", g_get_tmp_dir(), g_get_user_name(), @@ -208,7 +208,7 @@ pack_files (NS_ui *ui) case 1: pack_type = g_strdup (".tar.gz"); break; - case 2: + case 2: pack_type = g_strdup (".tar.bz2"); break; default: @@ -449,7 +449,7 @@ set_model_for_options_combobox (NS_ui *ui) for (aux = plugin_list; aux; aux = aux->next) { p = (NstPlugin *) aux->data; - pixbuf = gtk_icon_theme_load_icon (it, p->info->icon, 16, + pixbuf = gtk_icon_theme_load_icon (it, p->info->icon, 16, GTK_ICON_LOOKUP_USE_BUILTIN, NULL); gtk_list_store_append (model, &iter); gtk_list_store_set (model, &iter, @@ -470,16 +470,16 @@ set_model_for_options_combobox (NS_ui *ui) gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (ui->options_combobox), renderer, FALSE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (ui->options_combobox), + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (ui->options_combobox), renderer, "pixbuf", COLUMN_ICON, - NULL); + NULL); renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (ui->options_combobox), renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (ui->options_combobox), + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (ui->options_combobox), renderer, "text", COLUMN_DESCRIPTION, NULL); @@ -553,7 +553,7 @@ caja_sendto_create_ui (void) ui->dialog = GTK_WIDGET (gtk_builder_get_object (app, "caja_sendto_dialog")); ui->cancel_button = GTK_WIDGET (gtk_builder_get_object (app, "cancel_button")); ui->send_button = GTK_WIDGET (gtk_builder_get_object (app, "send_button")); - ui->pack_combobox = GTK_WIDGET (gtk_builder_get_object (app, "pack_combobox")); + ui->pack_combobox = GTK_WIDGET (gtk_builder_get_object (app, "pack_combobox")); ui->pack_entry = GTK_WIDGET (gtk_builder_get_object (app, "pack_entry")); ui->pack_checkbutton = GTK_WIDGET (gtk_builder_get_object (app, "pack_checkbutton")); ui->status_box = GTK_WIDGET (gtk_builder_get_object (app, "status_box")); @@ -574,7 +574,7 @@ caja_sendto_create_ui (void) one_file = FALSE; else if (file_list != NULL) one_file = TRUE; - + gtk_entry_set_text (GTK_ENTRY (ui->pack_entry), _("Files")); if (one_file) { diff --git a/sendto/caja-sendto-module.c b/sendto/caja-sendto-module.c index f3746ff..b01377c 100644 --- a/sendto/caja-sendto-module.c +++ b/sendto/caja-sendto-module.c @@ -1,7 +1,7 @@ /* - * Caja SendTo - * - * Copyright (C) 2005 Roberto Majadas + * Caja SendTo + * + * Copyright (C) 2005 Roberto Majadas * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -18,7 +18,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Author: Roberto Majadas <[email protected]> - * + * */ #include <config.h> @@ -44,12 +44,12 @@ caja_module_shutdown (void) } -void +void caja_module_list_types (const GType **types, int *num_types) { static GType type_list[1]; - + type_list[0] = CAJA_TYPE_NSTE; *types = type_list; diff --git a/sendto/caja-sendto-plugin.h b/sendto/caja-sendto-plugin.h index f208718..ed7714b 100644 --- a/sendto/caja-sendto-plugin.h +++ b/sendto/caja-sendto-plugin.h @@ -1,9 +1,9 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * Copyright (C) 2004 Roberto Majadas * Copyright (C) 2009 Bastien Nocera <[email protected]> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of the @@ -110,7 +110,7 @@ struct _NstPlugin G_MODULE_EXPORT gboolean nst_init_plugin(NstPlugin *plugin) { \ plugin->info = &(plugininfo); \ return TRUE; \ - } + } #endif /* _CAJA_SENDTO_PLUGIN_H_ */ diff --git a/sendto/plugins/caja-burn/caja-burn.c b/sendto/plugins/caja-burn/caja-burn.c index 50dda08..9de3534 100644 --- a/sendto/plugins/caja-burn/caja-burn.c +++ b/sendto/plugins/caja-burn/caja-burn.c @@ -1,8 +1,8 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * Copyright (C) 2008 Jader Henrique da Silva - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of the @@ -108,7 +108,7 @@ GtkWidget* get_contacts_widget (NstPlugin *plugin) gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, FALSE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (widget), + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (widget), renderer, "icon-name", COL_PIXBUF, NULL); @@ -116,7 +116,7 @@ GtkWidget* get_contacts_widget (NstPlugin *plugin) gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (widget), + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (widget), renderer, "text", COL_LABEL, NULL); @@ -162,7 +162,7 @@ gboolean send_files (NstPlugin *plugin, return TRUE; } -static +static gboolean destroy (NstPlugin *plugin){ g_object_unref (burn); @@ -171,7 +171,7 @@ gboolean destroy (NstPlugin *plugin){ } -static +static NstPluginInfo plugin_info = { "brasero", "caja-burn", @@ -183,7 +183,7 @@ NstPluginInfo plugin_info = { NULL, send_files, destroy -}; +}; NST_INIT_PLUGIN (plugin_info) diff --git a/sendto/plugins/emailclient/emailclient.c b/sendto/plugins/emailclient/emailclient.c index 14cb998..9d1e369 100644 --- a/sendto/plugins/emailclient/emailclient.c +++ b/sendto/plugins/emailclient/emailclient.c @@ -1,9 +1,9 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * Copyright (C) 2004 Roberto Majadas <[email protected]> * Copyright (C) 2012 Stefano Karapetsas <[email protected]> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of the @@ -56,7 +56,7 @@ get_evo_cmd (void) NULL}; guint i; - + for (i = 0; cmds[i] != NULL; i++) { tmp = g_find_program_in_path (cmds[i]); if (tmp != NULL) @@ -77,7 +77,7 @@ init (NstPlugin *plugin) GAppInfo *app_info = NULL; g_print ("Init email client plugin\n"); - + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); @@ -249,14 +249,14 @@ send_files (NstPlugin *plugin, return TRUE; } -static +static gboolean destroy (NstPlugin *plugin){ g_free (mail_cmd); mail_cmd = NULL; return TRUE; } -static +static NstPluginInfo plugin_info = { "emblem-mail", "emailclient", @@ -268,7 +268,7 @@ NstPluginInfo plugin_info = { NULL, send_files, destroy -}; +}; NST_INIT_PLUGIN (plugin_info) diff --git a/sendto/plugins/gajim/gajim.c b/sendto/plugins/gajim/gajim.c index 93aff8a..b0dd44f 100644 --- a/sendto/plugins/gajim/gajim.c +++ b/sendto/plugins/gajim/gajim.c @@ -48,28 +48,28 @@ static void _foreach_contact(gpointer contact, gpointer user_data) { const gchar *show; - + GValue *value; GHashTable *contact_table; - + /* holds contact props of already exisiting jid/nick */ GHashTable *existing_contact; - + /* name of the contact in completion list it may be jid, nick, jid (account), or nick(account) */ GString *contact_str; - + gchar *jid; gchar *account; gint i; - + if (contact == NULL) { g_warning("Null contact in the list"); return; } contact_table = (GHashTable *) contact; account = (gchar *) user_data; - + value = g_hash_table_lookup(contact_table, "show"); if (value == NULL || !G_VALUE_HOLDS_STRING(value)) { g_warning("String expected (contact - show)"); @@ -85,10 +85,10 @@ _foreach_contact(gpointer contact, gpointer user_data) to contact properties */ g_hash_table_insert(contact_table, "account", account); g_hash_table_remove(contact_table, "resource"); - + /* add nick the same way as jid */ for(i=0;i<2;i++) { - value = g_hash_table_lookup(contact_table, COMPLETION_PROPS[i]); + value = g_hash_table_lookup(contact_table, COMPLETION_PROPS[i]); if(value == NULL || !G_VALUE_HOLDS_STRING(value)) { g_warning("String expected (contact - name)"); return; @@ -105,7 +105,7 @@ _foreach_contact(gpointer contact, gpointer user_data) g_hash_table_insert(jid_table, contact_str->str, existing_contact); g_string_free(contact_str, FALSE); - + /* add current contact as nick (account) */ contact_str = g_string_new(jid); g_string_append(contact_str, " ("); @@ -120,7 +120,7 @@ _foreach_contact(gpointer contact, gpointer user_data) g_hash_table_insert(jid_table, jid, contact_table); } } - + } /* @@ -155,7 +155,7 @@ init_dbus (void) { g_object_unref(proxy); g_error_free(error); - return FALSE; + return FALSE; } g_strfreev(accounts); return TRUE; @@ -198,7 +198,7 @@ _get_contacts (void) gchar **accounts; gchar **account_iter; gchar *account; - + error = NULL; if (proxy == NULL) { @@ -232,7 +232,7 @@ _get_contacts (void) } for(account_iter = accounts; *account_iter ; account_iter++) { account = g_strdup(*account_iter); - error = NULL; + error = NULL; /* query gajim remote object and put results in 'contacts_list' */ if (!dbus_g_proxy_call (proxy, "list_contacts", &error, G_TYPE_STRING, account, /* call arguments */ @@ -261,7 +261,7 @@ init (NstPlugin *plugin) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - + /* connect to gajim dbus service */ jid_table = g_hash_table_new (g_str_hash, g_str_equal); if (!init_dbus()) { @@ -276,7 +276,7 @@ _set_pixbuf_from_status (const gchar *show, GdkPixbuf **pixbuf) { GString *pixbuf_path; GError *error; - + pixbuf_path = g_string_new(GAJIM_SHARE_DIR); g_string_append_c(pixbuf_path, '/'); g_string_append(pixbuf_path, "data"); @@ -309,7 +309,7 @@ _add_contact_to_model(gpointer key, gpointer value, gpointer user_data) GValue *val; GHashTable *contact_props; const gchar *show; - + contact_props = (GHashTable *) value; pixbuf = NULL; val = g_hash_table_lookup(contact_props, "show"); @@ -320,7 +320,7 @@ _add_contact_to_model(gpointer key, gpointer value, gpointer user_data) show = g_value_get_string ((GValue *)val); _set_pixbuf_from_status(show, &pixbuf); } - + store = (GtkListStore *) user_data; iter = g_malloc (sizeof(GtkTreeIter)); gtk_list_store_append (store, iter); @@ -336,7 +336,7 @@ static gboolean add_gajim_contacts_to_model (GtkListStore *store) { if(!_get_contacts()) { - return FALSE; + return FALSE; } if(g_hash_table_size(jid_table) == 0) { return FALSE; @@ -357,18 +357,18 @@ get_contacts_widget (NstPlugin *plugin) GtkListStore *store; GtkCellRenderer *renderer; GtkTreeModel *completion_model; - + entry = gtk_entry_new (); completion = gtk_entry_completion_new (); - + renderer = gtk_cell_renderer_pixbuf_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), renderer, FALSE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (completion), renderer, "pixbuf", 0, NULL); - - + + store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING); if(!add_gajim_contacts_to_model (store)) { gtk_widget_set_sensitive(entry, FALSE); @@ -409,7 +409,7 @@ send_files (NstPlugin *plugin, GValue *value; GList *file_iter; GHashTable *contact_props; - + gchar *send_to; gchar *jid; gchar *account; @@ -429,14 +429,14 @@ send_files (NstPlugin *plugin, account = NULL; } else { - value = g_hash_table_lookup(contact_props, "jid"); + value = g_hash_table_lookup(contact_props, "jid"); if(value == NULL || !G_VALUE_HOLDS_STRING(value)) { g_warning("[Gajim] string expected (contact - jid)"); return FALSE; } - + jid = g_value_dup_string((GValue *)value); - account = g_hash_table_lookup(contact_props, "account"); + account = g_hash_table_lookup(contact_props, "account"); } } else { @@ -445,7 +445,7 @@ send_files (NstPlugin *plugin, _("Recipient is missing.")); return FALSE; } - + error= NULL; for(file_iter = file_list; file_iter != NULL; file_iter = file_iter->next) { char *uri = file_iter->data; diff --git a/sendto/plugins/pidgin/pidgin.c b/sendto/plugins/pidgin/pidgin.c index 3189c71..d555893 100644 --- a/sendto/plugins/pidgin/pidgin.c +++ b/sendto/plugins/pidgin/pidgin.c @@ -103,7 +103,7 @@ init (NstPlugin *plugin) DBUS_TYPE_G_INT_ARRAY, &accounts, G_TYPE_INVALID)) { g_object_unref(proxy); g_error_free(error); - return FALSE; + return FALSE; } g_array_free(accounts, TRUE); diff --git a/share/caja-share.c b/share/caja-share.c index 71d640b..70b523a 100644 --- a/share/caja-share.c +++ b/share/caja-share.c @@ -66,7 +66,7 @@ typedef struct { GtkBuilder *ui; GtkWidget *main; /* Widget that holds all the rest. Its "PropertyPage" GObject-data points to this PropertyPage structure */ - + GtkWidget *checkbutton_share_folder; GtkWidget *hbox_share_name; GtkWidget *hbox_share_comment; @@ -95,7 +95,7 @@ property_page_validate_fields (PropertyPage *page) const char *name; name = gtk_entry_get_text (GTK_ENTRY (page->entry_share_name)); - + if (g_utf8_strlen (name, -1) <= 12) property_page_set_normal (page); else @@ -427,7 +427,7 @@ get_fullpath_from_fileinfo(CajaFileInfo *fileinfo) gchar *fullpath; g_assert (fileinfo != NULL); - + file = caja_file_info_get_location(fileinfo); fullpath = g_file_get_path(file); g_assert (fullpath != NULL && g_file_is_native(file)); /* In the beginning we checked that this was a local URI */ @@ -843,24 +843,24 @@ create_property_page (CajaFileInfo *fileinfo) /* Implementation of the CajaInfoProvider interface */ -/* caja_info_provider_update_file_info - * This function is called by Caja when it wants the extension to +/* caja_info_provider_update_file_info + * This function is called by Caja when it wants the extension to * fill in data about the file. It passes a CajaFileInfo object, * which the extension can use to read data from the file, and which * the extension should add data to. * - * If the data can be added immediately (without doing blocking IO), - * the extension can do so, and return CAJA_OPERATION_COMPLETE. - * In this case the 'update_complete' and 'handle' parameters can be + * If the data can be added immediately (without doing blocking IO), + * the extension can do so, and return CAJA_OPERATION_COMPLETE. + * In this case the 'update_complete' and 'handle' parameters can be * ignored. - * + * * If waiting for the deata would block the UI, the extension should - * perform the task asynchronously, and return - * CAJA_OPERATION_IN_PROGRESS. The function must also set the + * perform the task asynchronously, and return + * CAJA_OPERATION_IN_PROGRESS. The function must also set the * 'handle' pointer to a value unique to the object, and invoke the * 'update_complete' closure when the update is done. - * - * If the extension encounters an error, it should return + * + * If the extension encounters an error, it should return * CAJA_OPERATION_FAILED. */ typedef struct { @@ -870,7 +870,7 @@ typedef struct { GClosure *update_complete; } CajaShareHandle; -static CajaShareStatus +static CajaShareStatus get_share_status_and_free_share_info (ShareInfo *share_info) { CajaShareStatus result; @@ -950,7 +950,7 @@ get_share_info_for_file_info (CajaFileInfo *file, ShareInfo **share_info, gboole } /*--------------------------------------------------------------------------*/ -static CajaShareStatus +static CajaShareStatus file_get_share_status_file(CajaFileInfo *file) { ShareInfo *share_info; @@ -971,7 +971,7 @@ caja_share_update_file_info (CajaInfoProvider *provider, CajaOperationHandle **handle) { /* gchar *share_status = NULL; */ - + switch (file_get_share_status_file (file)) { case CAJA_SHARE_SHARED_RO: @@ -1005,12 +1005,12 @@ caja_share_cancel_update (CajaInfoProvider *provider, CajaOperationHandle *handle) { CajaShareHandle *share_handle; - + share_handle = (CajaShareHandle*)handle; share_handle->cancelled = TRUE; } -static void +static void caja_share_info_provider_iface_init (CajaInfoProviderIface *iface) { iface->update_file_info = caja_share_update_file_info; @@ -1019,13 +1019,13 @@ caja_share_info_provider_iface_init (CajaInfoProviderIface *iface) /*--------------------------------------------------------------------------*/ /* caja_property_page_provider_get_pages - * + * * This function is called by Caja when it wants property page * items from the extension. * * This function is called in the main thread before a property page * is shown, so it should return quickly. - * + * * The function should return a GList of allocated CajaPropertyPage * items. */ @@ -1053,7 +1053,7 @@ caja_share_get_property_pages (CajaPropertyPageProvider *provider, page = create_property_page (fileinfo); gtk_widget_hide (page->button_cancel); - + if (share_info) shares_free_share_info (share_info); @@ -1068,7 +1068,7 @@ caja_share_get_property_pages (CajaPropertyPageProvider *provider, } /*--------------------------------------------------------------------------*/ -static void +static void caja_share_property_page_provider_iface_init (CajaPropertyPageProviderIface *iface) { iface->get_pages = caja_share_get_property_pages; @@ -1088,13 +1088,13 @@ caja_share_class_init (CajaShareClass *class) } /* caja_menu_provider_get_file_items - * + * * This function is called by Caja when it wants context menu * items from the extension. * * This function is called in the main thread before a context menu * is shown, so it should return quickly. - * + * * The function should return a GList of allocated CajaMenuItem * items. */ @@ -1158,7 +1158,7 @@ caja_share_get_file_items (CajaMenuProvider *provider, /* We don't own a reference to the file info to keep it around, so acquire one */ g_object_ref (fileinfo); - + /* FMQ: change the label to "Share with Windows users"? */ item = caja_menu_item_new ("CajaShare::share", _("Sharing Options"), @@ -1167,7 +1167,7 @@ caja_share_get_file_items (CajaMenuProvider *provider, g_signal_connect (item, "activate", G_CALLBACK (share_this_folder_callback), fileinfo); - g_object_set_data_full (G_OBJECT (item), + g_object_set_data_full (G_OBJECT (item), "files", fileinfo, g_object_unref); /* Release our reference when the menu item goes away */ @@ -1177,7 +1177,7 @@ caja_share_get_file_items (CajaMenuProvider *provider, } /*--------------------------------------------------------------------------*/ -static void +static void caja_share_menu_provider_iface_init (CajaMenuProviderIface *iface) { iface->get_file_items = caja_share_get_file_items; @@ -1193,7 +1193,7 @@ static GType share_type = 0; #define CAJA_TYPE_SHARE (caja_share_get_type ()) static GType -caja_share_get_type (void) +caja_share_get_type (void) { return share_type; } @@ -1206,7 +1206,7 @@ caja_share_register_type (GTypeModule *module) (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) caja_share_class_init, - NULL, + NULL, NULL, sizeof (CajaShare), 0, @@ -1223,7 +1223,7 @@ caja_share_register_type (GTypeModule *module) NULL, NULL }; - + g_type_module_add_interface (module, share_type, CAJA_TYPE_PROPERTY_PAGE_PROVIDER, @@ -1247,20 +1247,20 @@ caja_share_register_type (GTypeModule *module) NULL, NULL }; - + g_type_module_add_interface (module, share_type, CAJA_TYPE_MENU_PROVIDER, &menu_provider_iface_info); - + } -/* Extension module functions. These functions are defined in - * caja-extensions-types.h, and must be implemented by all +/* Extension module functions. These functions are defined in + * caja-extensions-types.h, and must be implemented by all * extensions. */ -/* Initialization function. In addition to any module-specific - * initialization, any types implemented by the module should +/* Initialization function. In addition to any module-specific + * initialization, any types implemented by the module should * be registered here. */ void caja_module_initialize (GTypeModule *module) @@ -1282,12 +1282,12 @@ caja_module_shutdown (void) } /* List all the extension types. */ -void +void caja_module_list_types (const GType **types, int *num_types) { static GType type_list[1]; - + type_list[0] = CAJA_TYPE_SHARE; *types = type_list; diff --git a/share/caja-share.h b/share/caja-share.h index 1410917..a8b0b82 100644 --- a/share/caja-share.h +++ b/share/caja-share.h @@ -62,4 +62,4 @@ typedef enum { } CajaShareStatus; #endif - + diff --git a/share/shares.h b/share/shares.h index beec95f..ea079da 100644 --- a/share/shares.h +++ b/share/shares.h @@ -36,7 +36,7 @@ gboolean shares_get_share_info_list (GSList **ret_info_list, GError **error); void shares_free_share_info_list (GSList *list); -gboolean shares_supports_guest_ok (gboolean *supports_guest_ok_ret, +gboolean shares_supports_guest_ok (gboolean *supports_guest_ok_ret, GError **error); void shares_set_debug (gboolean error_on_refresh, diff --git a/wallpaper/caja-wallpaper-command.c b/wallpaper/caja-wallpaper-command.c index 09f63d8..9d6e3b2 100644 --- a/wallpaper/caja-wallpaper-command.c +++ b/wallpaper/caja-wallpaper-command.c @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * Authors: Adam Israel <[email protected]> + * Authors: Adam Israel <[email protected]> * Stefano Karapetsas <[email protected]> */ @@ -39,11 +39,11 @@ caja_module_shutdown (void) { } -void +void caja_module_list_types (const GType **types, int *num_types) { static GType type_list[1]; - + type_list[0] = CAJA_TYPE_CWE; *types = type_list; *num_types = 1; diff --git a/wallpaper/caja-wallpaper-extension.c b/wallpaper/caja-wallpaper-extension.c index 12e9d65..f25f097 100644 --- a/wallpaper/caja-wallpaper-extension.c +++ b/wallpaper/caja-wallpaper-extension.c @@ -21,7 +21,7 @@ * Authors: Adam Israel <[email protected]> * Stefano Karapetsas <[email protected]> */ - + #include <config.h> #include <string.h> #include <gio/gio.h> @@ -60,7 +60,7 @@ set_wallpaper_callback (CajaMenuItem *item, g_object_unref (settings); g_free (filename); g_free (uri); - + } static gboolean @@ -68,14 +68,14 @@ is_image (CajaFileInfo *file) { gchar *mimeType; gboolean isImage; - + mimeType = caja_file_info_get_mime_type (file); - + isImage = g_str_has_prefix (caja_file_info_get_mime_type (file), "image/"); - + g_free (mimeType); - - return isImage; + + return isImage; } @@ -109,11 +109,11 @@ caja_cwe_get_file_items (CajaMenuProvider *provider, _("Set as wallpaper"), _("Set image as the current wallpaper"), NULL); - g_signal_connect (item, + g_signal_connect (item, "activate", G_CALLBACK (set_wallpaper_callback), provider); - g_object_set_data_full (G_OBJECT (item), + g_object_set_data_full (G_OBJECT (item), "files", caja_file_info_list_copy (files), (GDestroyNotify) caja_file_info_list_free); @@ -123,14 +123,14 @@ caja_cwe_get_file_items (CajaMenuProvider *provider, } -static void +static void caja_cwe_menu_provider_iface_init (CajaMenuProviderIface *iface) { iface->get_file_items = caja_cwe_get_file_items; } -static void +static void caja_cwe_instance_init (CajaCwe *cwe) { } @@ -147,7 +147,7 @@ static GType cwe_type = 0; GType -caja_cwe_get_type (void) +caja_cwe_get_type (void) { return cwe_type; } @@ -161,7 +161,7 @@ caja_cwe_register_type (GTypeModule *module) (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) caja_cwe_class_init, - NULL, + NULL, NULL, sizeof (CajaCwe), 0, diff --git a/wallpaper/caja-wallpaper-extension.h b/wallpaper/caja-wallpaper-extension.h index 9040043..ddd2ce0 100644 --- a/wallpaper/caja-wallpaper-extension.h +++ b/wallpaper/caja-wallpaper-extension.h @@ -21,7 +21,7 @@ * Authors: Adam Israel <[email protected]> * Stefano Karapetsas <[email protected]> */ - + #ifndef CAJA_WALLPAPER_EXTENSION_H #define CAJA_WALLPAPER_EXTENSION_H diff --git a/xattr-tags/caja-xattr-tags-extension.c b/xattr-tags/caja-xattr-tags-extension.c index ab552f1..eb4eec3 100644 --- a/xattr-tags/caja-xattr-tags-extension.c +++ b/xattr-tags/caja-xattr-tags-extension.c @@ -19,7 +19,7 @@ * * Authors: Felipe Barriga Richards <[email protected]> */ - + #include <config.h> #include <string.h> #include <gio/gio.h> @@ -188,7 +188,7 @@ caja_xattr_tags_column_provider_iface_init(CajaColumnProviderIface *iface) } -static void +static void caja_xattr_tags_instance_init(CajaXattrTags *cajaXattrTags) { } @@ -219,7 +219,7 @@ caja_xattr_tags_register_type(GTypeModule *module) (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) caja_xattr_tags_class_init, - NULL, + NULL, NULL, sizeof (CajaXattrTags), 0, diff --git a/xattr-tags/caja-xattr-tags-extension.h b/xattr-tags/caja-xattr-tags-extension.h index 4490827..3225ad1 100644 --- a/xattr-tags/caja-xattr-tags-extension.h +++ b/xattr-tags/caja-xattr-tags-extension.h @@ -19,7 +19,7 @@ * * Authors: Felipe Barriga Richards <[email protected]> */ - + #ifndef CAJA_XATTR_TAGS_EXTENSION_H #define CAJA_XATTR_TAGS_EXTENSION_H |