eog r4858 - in trunk: . src
- From: csaavedra svn gnome org
- To: svn-commits-list gnome org
- Subject: eog r4858 - in trunk: . src
- Date: Mon, 27 Oct 2008 19:33:43 +0000 (UTC)
Author: csaavedra
Date: Mon Oct 27 19:33:42 2008
New Revision: 4858
URL: http://svn.gnome.org/viewvc/eog?rev=4858&view=rev
Log:
2008-10-27 Claudio Saavedra <csaavedra igalia com>
* src/*.[ch]: remove trailing whitespaces.
Modified:
trunk/ChangeLog
trunk/src/eog-application.c
trunk/src/eog-application.h
trunk/src/eog-config-keys.h
trunk/src/eog-debug.c
trunk/src/eog-debug.h
trunk/src/eog-dialog.c
trunk/src/eog-dialog.h
trunk/src/eog-error-message-area.c
trunk/src/eog-error-message-area.h
trunk/src/eog-exif-details.c
trunk/src/eog-exif-details.h
trunk/src/eog-exif-util.c
trunk/src/eog-exif-util.h
trunk/src/eog-file-chooser.c
trunk/src/eog-file-chooser.h
trunk/src/eog-image-jpeg.c
trunk/src/eog-image-jpeg.h
trunk/src/eog-image-private.h
trunk/src/eog-image-save-info.c
trunk/src/eog-image-save-info.h
trunk/src/eog-image.c
trunk/src/eog-image.h
trunk/src/eog-job-queue.c
trunk/src/eog-job-queue.h
trunk/src/eog-jobs.c
trunk/src/eog-jobs.h
trunk/src/eog-list-store.c
trunk/src/eog-list-store.h
trunk/src/eog-message-area.c
trunk/src/eog-message-area.h
trunk/src/eog-metadata-reader-jpg.c
trunk/src/eog-metadata-reader-png.c
trunk/src/eog-metadata-reader.c
trunk/src/eog-metadata-reader.h
trunk/src/eog-module.c
trunk/src/eog-module.h
trunk/src/eog-pixbuf-cell-renderer.c
trunk/src/eog-pixbuf-cell-renderer.h
trunk/src/eog-pixbuf-util.c
trunk/src/eog-plugin-engine.c
trunk/src/eog-plugin-engine.h
trunk/src/eog-plugin-manager.c
trunk/src/eog-plugin-manager.h
trunk/src/eog-plugin.c
trunk/src/eog-plugin.h
trunk/src/eog-preferences-dialog.c
trunk/src/eog-preferences-dialog.h
trunk/src/eog-print-image-setup.c
trunk/src/eog-print-preview.c
trunk/src/eog-print-preview.h
trunk/src/eog-print.c
trunk/src/eog-properties-dialog.c
trunk/src/eog-properties-dialog.h
trunk/src/eog-python-module.c
trunk/src/eog-python-module.h
trunk/src/eog-python-plugin.c
trunk/src/eog-python-plugin.h
trunk/src/eog-save-as-dialog-helper.c
trunk/src/eog-scroll-view.c
trunk/src/eog-session.c
trunk/src/eog-session.h
trunk/src/eog-sidebar.c
trunk/src/eog-sidebar.h
trunk/src/eog-statusbar.c
trunk/src/eog-statusbar.h
trunk/src/eog-thumb-nav.c
trunk/src/eog-thumb-nav.h
trunk/src/eog-thumb-view.c
trunk/src/eog-thumb-view.h
trunk/src/eog-thumbnail.c
trunk/src/eog-thumbnail.h
trunk/src/eog-transform.c
trunk/src/eog-transform.h
trunk/src/eog-uri-converter.c
trunk/src/eog-util.c
trunk/src/eog-util.h
trunk/src/eog-window.c
trunk/src/eog-window.h
Modified: trunk/src/eog-application.c
==============================================================================
--- trunk/src/eog-application.c (original)
+++ trunk/src/eog-application.c Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Application Facade
+/* Eye Of Gnome - Application Facade
*
* Copyright (C) 2006 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on evince code (shell/ev-application.h) by:
+ * Based on evince code (shell/ev-application.h) by:
* - Martin Kretzschmar <martink gnome org>
*
* This program is free software; you can redistribute it and/or modify
@@ -58,7 +58,7 @@
/**
* eog_application_register_service:
- * @application: An #EogApplication.
+ * @application: An #EogApplication.
*
* Registers #EogApplication<!-- -->'s DBus service, to allow
* remote calls. If the DBus service is already registered,
@@ -79,7 +79,7 @@
g_warning ("Service already registered.");
return FALSE;
}
-
+
connection = dbus_g_bus_get (DBUS_BUS_STARTER, &err);
if (connection == NULL) {
@@ -103,7 +103,7 @@
}
g_object_unref (driver_proxy);
-
+
if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS) {
return FALSE;
}
@@ -116,7 +116,7 @@
G_OBJECT (application));
application->scr_saver = totem_scrsaver_new (connection);
-
+
return TRUE;
}
#endif /* ENABLE_DBUS */
@@ -141,7 +141,7 @@
if (G_LIKELY (dot_dir != NULL))
eog_application->toolbars_file = g_build_filename
(dot_dir, "eog_toolbar.xml", NULL);
-
+
if (!dot_dir || !egg_toolbars_model_load_toolbars (eog_application->toolbars_model,
eog_application->toolbars_file)) {
@@ -194,22 +194,22 @@
}
g_list_free (windows);
-
+
return empty_window;
}
/**
* eog_application_open_window:
- * @application: An #EogApplication.
- * @timestamp:
- * @flags:
- * @error:
+ * @application: An #EogApplication.
+ * @timestamp:
+ * @flags:
+ * @error:
*
* Opens and presents an empty #EogWindow to the user. If there is
* an empty window already open, this will be used. Otherwise, a
* new one will be instantiated.
*
- * Returns:
+ * Returns:
**/
gboolean
eog_application_open_window (EogApplication *application,
@@ -224,7 +224,7 @@
if (new_window == NULL) {
new_window = eog_window_new (flags);
}
-
+
g_return_val_if_fail (EOG_IS_APPLICATION (application), FALSE);
gtk_window_present_with_time (GTK_WINDOW (new_window),
@@ -248,11 +248,11 @@
for (l = windows; l != NULL; l = l->next) {
if (EOG_IS_WINDOW (l->data)) {
EogWindow *window = EOG_WINDOW (l->data);
-
+
if (!eog_window_is_empty (window)) {
EogImage *image = eog_window_get_image (window);
GFile *window_file;
-
+
window_file = eog_image_get_file (image);
if (g_file_equal (window_file, file)) {
file_window = window;
@@ -263,7 +263,7 @@
}
g_list_free (windows);
-
+
return file_window;
}
@@ -282,15 +282,15 @@
* eog_application_open_file_list:
* @application: An #EogApplication.
* @file_list: A list of #GFile<!-- -->s.
- * @timestamp:
- * @flags:
- * @error:
+ * @timestamp:
+ * @flags:
+ * @error:
*
* Opens a list of files in a #EogWindow. If an #EogWindow displaying the first
* image in the list is already open, this will be used. Otherwise, an empty
* #EogWindow is used, either already existing or newly created.
*
- * Returns:
+ * Returns:
**/
gboolean
eog_application_open_file_list (EogApplication *application,
@@ -317,9 +317,9 @@
new_window = EOG_WINDOW (eog_window_new (flags));
}
- g_signal_connect (new_window,
- "prepared",
- G_CALLBACK (eog_application_show_window),
+ g_signal_connect (new_window,
+ "prepared",
+ G_CALLBACK (eog_application_show_window),
GUINT_TO_POINTER (timestamp));
eog_window_open_file_list (new_window, file_list);
@@ -331,14 +331,14 @@
* eog_application_open_uri_list:
* @application: An #EogApplication.
* @uri_list: A list of URIs.
- * @timestamp:
- * @flags:
- * @error:
+ * @timestamp:
+ * @flags:
+ * @error:
*
* Opens a list of images, from a list of URIs. See
* eog_application_open_file_list() for details.
*
- * Returns:
+ * Returns:
**/
gboolean
eog_application_open_uri_list (EogApplication *application,
@@ -348,31 +348,31 @@
GError **error)
{
GSList *file_list = NULL;
-
+
g_return_val_if_fail (EOG_IS_APPLICATION (application), FALSE);
-
+
file_list = eog_util_string_list_to_file_list (uri_list);
return eog_application_open_file_list (application,
- file_list,
+ file_list,
timestamp,
- flags,
+ flags,
error);
}
-
+
#ifdef HAVE_DBUS
/**
- * eog_application_open_uris:
+ * eog_application_open_uris:
* @application: an #EogApplication
* @uris: A #GList of URI strings.
- * @timestamp:
- * @flags:
- * @error:
+ * @timestamp:
+ * @flags:
+ * @error:
*
* Opens a list of images, from a list of URI strings. See
* eog_application_open_file_list() for details.
*
- * Returns:
+ * Returns:
**/
gboolean
eog_application_open_uris (EogApplication *application,
@@ -382,9 +382,9 @@
GError **error)
{
GSList *file_list = NULL;
-
+
file_list = eog_util_strings_to_file_list (uris);
-
+
return eog_application_open_file_list (application, file_list, timestamp,
flags, error);
}
@@ -410,7 +410,7 @@
}
g_object_unref (application);
-
+
gtk_main_quit ();
}
@@ -458,7 +458,7 @@
eog_application_get_toolbars_model (EogApplication *application)
{
g_return_val_if_fail (EOG_IS_APPLICATION (application), NULL);
-
+
return application->toolbars_model;
}
@@ -473,7 +473,7 @@
{
if (G_LIKELY(application->toolbars_file != NULL))
egg_toolbars_model_save_toolbars (application->toolbars_model,
- application->toolbars_file,
+ application->toolbars_file,
"1.0");
}
Modified: trunk/src/eog-application.h
==============================================================================
--- trunk/src/eog-application.h (original)
+++ trunk/src/eog-application.h Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Application Facade
+/* Eye Of Gnome - Application Facade
*
* Copyright (C) 2006 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on evince code (shell/ev-application.h) by:
+ * Based on evince code (shell/ev-application.h) by:
* - Martin Kretzschmar <martink gnome org>
*
* This program is free software; you can redistribute it and/or modify
Modified: trunk/src/eog-config-keys.h
==============================================================================
--- trunk/src/eog-config-keys.h (original)
+++ trunk/src/eog-config-keys.h Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - GConf Keys Macros
+/* Eye Of Gnome - GConf Keys Macros
*
* Copyright (C) 2000-2006 The Free Software Foundation
*
Modified: trunk/src/eog-debug.c
==============================================================================
--- trunk/src/eog-debug.c (original)
+++ trunk/src/eog-debug.c Mon Oct 27 19:33:42 2008
@@ -1,14 +1,14 @@
-/* Eye Of Gnome - Debugging
+/* Eye Of Gnome - Debugging
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-debug.h) by:
+ * Based on gedit code (gedit/gedit-debug.h) by:
* - Alex Roberts <bse error fsnet co uk>
- * - Evan Lawrence <evan worldpath net>
- * - Chema Celorio <chema celorio com>
- * - Paolo Maggi <paolo gnome org>
+ * - Evan Lawrence <evan worldpath net>
+ * - Chema Celorio <chema celorio com>
+ * - Paolo Maggi <paolo gnome org>
*
* 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
@@ -88,7 +88,7 @@
if (g_getenv ("EOG_DEBUG_PLUGINS") != NULL)
debug = debug | EOG_DEBUG_PLUGINS;
-out:
+out:
#ifdef ENABLE_PROFILING
if (debug != EOG_NO_DEBUG)
@@ -105,7 +105,7 @@
const gchar *format, ...)
{
if (G_UNLIKELY (debug & section))
- {
+ {
#ifdef ENABLE_PROFILING
gdouble seconds;
#endif
@@ -123,11 +123,11 @@
g_return_if_fail (timer != NULL);
seconds = g_timer_elapsed (timer, NULL);
- g_print ("[%f (%f)] %s:%d (%s) %s\n",
+ g_print ("[%f (%f)] %s:%d (%s) %s\n",
seconds, seconds - last, file, line, function, msg);
- last = seconds;
+ last = seconds;
#else
- g_print ("%s:%d (%s) %s\n", file, line, function, msg);
+ g_print ("%s:%d (%s) %s\n", file, line, function, msg);
#endif
fflush (stdout);
@@ -148,13 +148,13 @@
g_return_if_fail (timer != NULL);
- seconds = g_timer_elapsed (timer, NULL);
- g_print ("[%f (%f)] %s:%d (%s)\n",
+ seconds = g_timer_elapsed (timer, NULL);
+ g_print ("[%f (%f)] %s:%d (%s)\n",
seconds, seconds - last, file, line, function);
last = seconds;
#else
g_print ("%s:%d (%s)\n", file, line, function);
-#endif
+#endif
fflush (stdout);
}
}
Modified: trunk/src/eog-debug.h
==============================================================================
--- trunk/src/eog-debug.h (original)
+++ trunk/src/eog-debug.h Mon Oct 27 19:33:42 2008
@@ -1,14 +1,14 @@
-/* Eye Of Gnome - Debugging
+/* Eye Of Gnome - Debugging
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-debug.h) by:
+ * Based on gedit code (gedit/gedit-debug.h) by:
* - Alex Roberts <bse error fsnet co uk>
- * - Evan Lawrence <evan worldpath net>
- * - Chema Celorio <chema celorio com>
- * - Paolo Maggi <paolo gnome org>
+ * - Evan Lawrence <evan worldpath net>
+ * - Chema Celorio <chema celorio com>
+ * - Paolo Maggi <paolo gnome org>
*
* 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
Modified: trunk/src/eog-dialog.c
==============================================================================
--- trunk/src/eog-dialog.c (original)
+++ trunk/src/eog-dialog.c Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - Image Dialog
+/* Eye Of Gnome - Image Dialog
*
* Copyright (C) 2006 The Free Software Foundation
*
@@ -46,8 +46,8 @@
};
static void
-eog_dialog_construct_impl (EogDialog *dialog,
- const gchar *glade_file,
+eog_dialog_construct_impl (EogDialog *dialog,
+ const gchar *glade_file,
const gchar *dlg_node)
{
EogDialogPrivate *priv;
@@ -55,7 +55,7 @@
g_return_if_fail (dialog != NULL);
g_return_if_fail (EOG_IS_DIALOG (dialog));
-
+
priv = dialog->priv;
filename = g_build_filename (EOG_DATA_DIR, glade_file, NULL);
@@ -69,7 +69,7 @@
priv->dlg = GTK_WIDGET (gtk_builder_get_object (priv->xml, dlg_node));
if (priv->parent != NULL) {
- gtk_window_set_transient_for (GTK_WINDOW (priv->dlg),
+ gtk_window_set_transient_for (GTK_WINDOW (priv->dlg),
priv->parent);
}
}
@@ -127,7 +127,7 @@
{
EogDialog *dialog;
EogDialogPrivate *priv;
-
+
g_return_if_fail (object != NULL);
g_return_if_fail (EOG_IS_DIALOG (object));
@@ -166,10 +166,10 @@
"Parent window",
"Parent window",
GTK_TYPE_WINDOW,
- G_PARAM_READWRITE |
- G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_NAME |
+ G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB));
g_type_class_add_private (g_object_class, sizeof (EogDialogPrivate));
@@ -186,8 +186,8 @@
}
void
-eog_dialog_construct (EogDialog *dialog,
- const gchar *glade_file,
+eog_dialog_construct (EogDialog *dialog,
+ const gchar *glade_file,
const gchar *dlg_node)
{
EogDialogClass *klass = EOG_DIALOG_GET_CLASS (dialog);
@@ -219,7 +219,7 @@
g_return_if_fail (dialog != NULL);
g_return_if_fail (EOG_IS_DIALOG (dialog));
-
+
priv = dialog->priv;
va_start (varargs, property_id);
Modified: trunk/src/eog-dialog.h
==============================================================================
--- trunk/src/eog-dialog.h (original)
+++ trunk/src/eog-dialog.h Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - EOG Dialog
+/* Eye Of Gnome - EOG Dialog
*
* Copyright (C) 2006 The Free Software Foundation
*
@@ -58,7 +58,7 @@
};
GType eog_dialog_get_type (void) G_GNUC_CONST;
-
+
void eog_dialog_construct (EogDialog *dialog,
const gchar *glade_file,
const gchar *dlg_node);
Modified: trunk/src/eog-error-message-area.c
==============================================================================
--- trunk/src/eog-error-message-area.c (original)
+++ trunk/src/eog-error-message-area.c Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Erro Message Area
+/* Eye Of Gnome - Erro Message Area
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-message-area.h) by:
+ * Based on gedit code (gedit/gedit-message-area.h) by:
* - Paolo Maggi <paolo gnome org>
*
* This program is free software; you can redistribute it and/or modify
@@ -109,7 +109,7 @@
message_area = eog_message_area_new_with_buttons (
_("_Retry"), GTK_RESPONSE_OK,
NULL);
- else
+ else
message_area = eog_message_area_new ();
set_message_area_text_and_icon (EOG_MESSAGE_AREA (message_area),
@@ -140,7 +140,7 @@
error_message = g_strdup_printf (_("Could not load image '%s'."),
pango_escaped_caption);
- message_details = g_strdup (error->message);
+ message_details = g_strdup (error->message);
message_area = create_error_message_area (error_message,
message_details,
@@ -181,8 +181,8 @@
error_message = g_strdup (_("The given locations contain no images."));
}
- message_area = create_error_message_area (error_message,
- NULL,
+ message_area = create_error_message_area (error_message,
+ NULL,
FALSE);
g_free (error_message);
Modified: trunk/src/eog-error-message-area.h
==============================================================================
--- trunk/src/eog-error-message-area.h (original)
+++ trunk/src/eog-error-message-area.h Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Erro Message Area
+/* Eye Of Gnome - Erro Message Area
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-message-area.h) by:
+ * Based on gedit code (gedit/gedit-message-area.h) by:
* - Paolo Maggi <paolo gnome org>
*
* This program is free software; you can redistribute it and/or modify
Modified: trunk/src/eog-exif-details.c
==============================================================================
--- trunk/src/eog-exif-details.c (original)
+++ trunk/src/eog-exif-details.c Mon Oct 27 19:33:42 2008
@@ -89,7 +89,7 @@
{ EXIF_TAG_INTEROPERABILITY_INDEX, EXIF_CATEGORY_CAMERA},
{ EXIF_TAG_INTEROPERABILITY_VERSION, EXIF_CATEGORY_CAMERA},
{ EXIF_TAG_IMAGE_WIDTH, EXIF_CATEGORY_IMAGE_DATA},
- { EXIF_TAG_IMAGE_LENGTH , EXIF_CATEGORY_IMAGE_DATA},
+ { EXIF_TAG_IMAGE_LENGTH , EXIF_CATEGORY_IMAGE_DATA},
{ EXIF_TAG_BITS_PER_SAMPLE ,EXIF_CATEGORY_CAMERA },
{ EXIF_TAG_COMPRESSION , EXIF_CATEGORY_IMAGE_DATA},
{ EXIF_TAG_PHOTOMETRIC_INTERPRETATION , EXIF_CATEGORY_OTHER},
@@ -113,72 +113,72 @@
{ EXIF_TAG_ARTIST , EXIF_CATEGORY_IMAGE_DATA},
{ EXIF_TAG_WHITE_POINT , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
{ EXIF_TAG_PRIMARY_CHROMATICITIES, EXIF_CATEGORY_OTHER},
- { EXIF_TAG_TRANSFER_RANGE , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_JPEG_PROC , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_TRANSFER_RANGE , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_JPEG_PROC , EXIF_CATEGORY_OTHER},
{ EXIF_TAG_JPEG_INTERCHANGE_FORMAT, EXIF_CATEGORY_OTHER},
{ EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, },
- { EXIF_TAG_YCBCR_COEFFICIENTS , EXIF_CATEGORY_IMAGE_DATA},
- { EXIF_TAG_YCBCR_SUB_SAMPLING , EXIF_CATEGORY_IMAGE_DATA},
- { EXIF_TAG_YCBCR_POSITIONING , EXIF_CATEGORY_IMAGE_DATA},
- { EXIF_TAG_REFERENCE_BLACK_WHITE, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_YCBCR_COEFFICIENTS , EXIF_CATEGORY_IMAGE_DATA},
+ { EXIF_TAG_YCBCR_SUB_SAMPLING , EXIF_CATEGORY_IMAGE_DATA},
+ { EXIF_TAG_YCBCR_POSITIONING , EXIF_CATEGORY_IMAGE_DATA},
+ { EXIF_TAG_REFERENCE_BLACK_WHITE, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
{ EXIF_TAG_RELATED_IMAGE_FILE_FORMAT,EXIF_CATEGORY_OTHER},
- { EXIF_TAG_RELATED_IMAGE_WIDTH , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_RELATED_IMAGE_LENGTH , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_CFA_REPEAT_PATTERN_DIM, EXIF_CATEGORY_OTHER},
- { EXIF_TAG_CFA_PATTERN , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_BATTERY_LEVEL , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_COPYRIGHT , EXIF_CATEGORY_IMAGE_DATA},
- { EXIF_TAG_EXPOSURE_TIME , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_FNUMBER , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_IPTC_NAA , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_EXIF_IFD_POINTER , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_INTER_COLOR_PROFILE , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_EXPOSURE_PROGRAM , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_SPECTRAL_SENSITIVITY , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_GPS_INFO_IFD_POINTER , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_ISO_SPEED_RATINGS , EXIF_CATEGORY_IMAGE_DATA},
- { EXIF_TAG_OECF , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_EXIF_VERSION , EXIF_CATEGORY_CAMERA},
- { EXIF_TAG_DATE_TIME_ORIGINAL , EXIF_CATEGORY_IMAGE_DATA},
- { EXIF_TAG_DATE_TIME_DIGITIZED , EXIF_CATEGORY_IMAGE_DATA},
+ { EXIF_TAG_RELATED_IMAGE_WIDTH , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_RELATED_IMAGE_LENGTH , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_CFA_REPEAT_PATTERN_DIM, EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_CFA_PATTERN , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_BATTERY_LEVEL , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_COPYRIGHT , EXIF_CATEGORY_IMAGE_DATA},
+ { EXIF_TAG_EXPOSURE_TIME , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_FNUMBER , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_IPTC_NAA , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_EXIF_IFD_POINTER , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_INTER_COLOR_PROFILE , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_EXPOSURE_PROGRAM , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_SPECTRAL_SENSITIVITY , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_GPS_INFO_IFD_POINTER , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_ISO_SPEED_RATINGS , EXIF_CATEGORY_IMAGE_DATA},
+ { EXIF_TAG_OECF , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_EXIF_VERSION , EXIF_CATEGORY_CAMERA},
+ { EXIF_TAG_DATE_TIME_ORIGINAL , EXIF_CATEGORY_IMAGE_DATA},
+ { EXIF_TAG_DATE_TIME_DIGITIZED , EXIF_CATEGORY_IMAGE_DATA},
{ EXIF_TAG_COMPONENTS_CONFIGURATION , EXIF_CATEGORY_CAMERA},
{ EXIF_TAG_COMPRESSED_BITS_PER_PIXEL, EXIF_CATEGORY_CAMERA},
- { EXIF_TAG_SHUTTER_SPEED_VALUE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_APERTURE_VALUE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_BRIGHTNESS_VALUE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_EXPOSURE_BIAS_VALUE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_MAX_APERTURE_VALUE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_SUBJECT_DISTANCE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_METERING_MODE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_LIGHT_SOURCE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_FLASH , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_FOCAL_LENGTH , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_SUBJECT_AREA , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_MAKER_NOTE , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_USER_COMMENT , EXIF_CATEGORY_IMAGE_DATA},
- { EXIF_TAG_SUBSEC_TIME , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_SUB_SEC_TIME_ORIGINAL, EXIF_CATEGORY_OTHER},
- { EXIF_TAG_SUB_SEC_TIME_DIGITIZED, EXIF_CATEGORY_OTHER},
- { EXIF_TAG_FLASH_PIX_VERSION , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_COLOR_SPACE , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_PIXEL_X_DIMENSION , EXIF_CATEGORY_IMAGE_DATA},
- { EXIF_TAG_PIXEL_Y_DIMENSION , EXIF_CATEGORY_IMAGE_DATA},
- { EXIF_TAG_RELATED_SOUND_FILE , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_SHUTTER_SPEED_VALUE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_APERTURE_VALUE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_BRIGHTNESS_VALUE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_EXPOSURE_BIAS_VALUE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_MAX_APERTURE_VALUE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_SUBJECT_DISTANCE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_METERING_MODE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_LIGHT_SOURCE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_FLASH , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_FOCAL_LENGTH , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_SUBJECT_AREA , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_MAKER_NOTE , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_USER_COMMENT , EXIF_CATEGORY_IMAGE_DATA},
+ { EXIF_TAG_SUBSEC_TIME , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_SUB_SEC_TIME_ORIGINAL, EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_SUB_SEC_TIME_DIGITIZED, EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_FLASH_PIX_VERSION , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_COLOR_SPACE , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_PIXEL_X_DIMENSION , EXIF_CATEGORY_IMAGE_DATA},
+ { EXIF_TAG_PIXEL_Y_DIMENSION , EXIF_CATEGORY_IMAGE_DATA},
+ { EXIF_TAG_RELATED_SOUND_FILE , EXIF_CATEGORY_OTHER},
{ EXIF_TAG_INTEROPERABILITY_IFD_POINTER, EXIF_CATEGORY_OTHER},
- { EXIF_TAG_FLASH_ENERGY ,EXIF_CATEGORY_OTHER },
+ { EXIF_TAG_FLASH_ENERGY ,EXIF_CATEGORY_OTHER },
{ EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE, EXIF_CATEGORY_OTHER},
{ EXIF_TAG_FOCAL_PLANE_X_RESOLUTION, EXIF_CATEGORY_CAMERA},
{ EXIF_TAG_FOCAL_PLANE_Y_RESOLUTION, EXIF_CATEGORY_CAMERA},
{ EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT, EXIF_CATEGORY_CAMERA},
- { EXIF_TAG_SUBJECT_LOCATION, EXIF_CATEGORY_OTHER},
- { EXIF_TAG_EXPOSURE_INDEX, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_SENSING_METHOD, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_FILE_SOURCE , EXIF_CATEGORY_OTHER},
- { EXIF_TAG_SCENE_TYPE, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_NEW_CFA_PATTERN, EXIF_CATEGORY_OTHER},
- { EXIF_TAG_CUSTOM_RENDERED, EXIF_CATEGORY_OTHER},
- { EXIF_TAG_EXPOSURE_MODE, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
- { EXIF_TAG_WHITE_BALANCE, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_SUBJECT_LOCATION, EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_EXPOSURE_INDEX, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_SENSING_METHOD, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_FILE_SOURCE , EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_SCENE_TYPE, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_NEW_CFA_PATTERN, EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_CUSTOM_RENDERED, EXIF_CATEGORY_OTHER},
+ { EXIF_TAG_EXPOSURE_MODE, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_WHITE_BALANCE, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
{ EXIF_TAG_DIGITAL_ZOOM_RATIO, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
{ EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM, EXIF_CATEGORY_CAMERA},
{ EXIF_TAG_SCENE_CAPTURE_TYPE , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
@@ -187,7 +187,7 @@
{ EXIF_TAG_SATURATION , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
{ EXIF_TAG_SHARPNESS , EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
{ EXIF_TAG_DEVICE_SETTING_DESCRIPTION, EXIF_CATEGORY_CAMERA},
- { EXIF_TAG_SUBJECT_DISTANCE_RANGE, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
+ { EXIF_TAG_SUBJECT_DISTANCE_RANGE, EXIF_CATEGORY_IMAGE_TAKING_CONDITIONS},
{ EXIF_TAG_IMAGE_UNIQUE_ID , EXIF_CATEGORY_IMAGE_DATA},
{ -1, -1 }
};
@@ -248,14 +248,14 @@
/* Tag name column */
cell = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Tag"), cell,
+ column = gtk_tree_view_column_new_with_attributes (_("Tag"), cell,
"text", MODEL_COLUMN_ATTRIBUTE,
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (exif_details), column);
/* Value column */
cell = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Value"), cell,
+ column = gtk_tree_view_column_new_with_attributes (_("Value"), cell,
"text", MODEL_COLUMN_VALUE,
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (exif_details), column);
@@ -264,11 +264,11 @@
eog_exif_details_reset (exif_details);
- gtk_tree_view_set_model (GTK_TREE_VIEW (exif_details),
+ gtk_tree_view_set_model (GTK_TREE_VIEW (exif_details),
GTK_TREE_MODEL (priv->model));
}
-static void
+static void
eog_exif_details_class_init (EogExifDetailsClass *klass)
{
GObjectClass *object_class = (GObjectClass*) klass;
@@ -316,8 +316,8 @@
gboolean parent_valid = FALSE;
if (parent != NULL) {
- parent_valid = gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (store),
- &parent_iter,
+ parent_valid = gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (store),
+ &parent_iter,
parent);
}
@@ -325,7 +325,7 @@
if (path == NULL) {
tree_path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
-
+
if (tree_path != NULL) {
path = gtk_tree_path_to_string (tree_path);
gtk_tree_path_free (tree_path);
@@ -348,7 +348,7 @@
}
#ifdef HAVE_EXIF
-static void
+static void
exif_entry_cb (ExifEntry *entry, gpointer data)
{
GtkTreeStore *store;
@@ -362,15 +362,15 @@
priv = view->priv;
store = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (view)));
-
+
path = g_hash_table_lookup (priv->id_path_hash, GINT_TO_POINTER (entry->tag));
if (path != NULL) {
- set_row_data (store,
- path,
- NULL,
- exif_tag_get_name (entry->tag),
- exif_entry_get_value (entry, b, sizeof(b)));
+ set_row_data (store,
+ path,
+ NULL,
+ exif_tag_get_name (entry->tag),
+ exif_entry_get_value (entry, b, sizeof(b)));
} else {
ExifMnoteData *mnote = (entry->tag == EXIF_TAG_MAKER_NOTE ?
@@ -379,18 +379,18 @@
if (mnote) {
// Supported MakerNote Found
unsigned int i, c = exif_mnote_data_count (mnote);
-
+
for (i = 0; i < c; i++) {
path = g_hash_table_lookup (priv->id_path_hash_mnote, GINT_TO_POINTER (i));
if (path != NULL) {
- set_row_data (store, path, NULL,
- exif_mnote_data_get_title (mnote, i),
- exif_mnote_data_get_value (mnote, i, b, sizeof(b)));
+ set_row_data (store, path, NULL,
+ exif_mnote_data_get_title (mnote, i),
+ exif_mnote_data_get_value (mnote, i, b, sizeof(b)));
} else {
path = set_row_data (store,
NULL,
exif_categories[EXIF_CATEGORY_MAKER_NOTE].path,
- exif_mnote_data_get_title (mnote, i),
+ exif_mnote_data_get_title (mnote, i),
exif_mnote_data_get_value (mnote, i, b, sizeof(b)));
g_hash_table_insert (priv->id_path_hash_mnote, GINT_TO_POINTER (i), path);
}
@@ -398,10 +398,10 @@
} else {
cat = get_exif_category (entry);
- path = set_row_data (store,
- NULL,
+ path = set_row_data (store,
+ NULL,
exif_categories[cat].path,
- exif_tag_get_name (entry->tag),
+ exif_tag_get_name (entry->tag),
exif_entry_get_value (entry, b,
sizeof(b)));
@@ -444,13 +444,13 @@
for (i = 0; exif_categories [i].label != NULL; i++) {
char *translated_string;
-
+
translated_string = gettext (exif_categories[i].label);
- set_row_data (GTK_TREE_STORE (priv->model),
- exif_categories[i].path,
+ set_row_data (GTK_TREE_STORE (priv->model),
+ exif_categories[i].path,
NULL,
- translated_string,
+ translated_string,
NULL);
}
}
@@ -496,18 +496,18 @@
ExifCategory cat = XMP_CATEGORY_OTHER;
const char *s = xmp_string_cstr(schema);
int i;
-
+
for (i = 0; xmp_ns_category_map[i].id != NULL; i++) {
if (strcmp (xmp_ns_category_map[i].id, s) == 0) {
cat = xmp_ns_category_map[i].category;
break;
}
}
-
+
return cat;
}
-static void
+static void
xmp_entry_insert (EogExifDetails *view, XmpStringPtr xmp_schema,
XmpStringPtr xmp_path, XmpStringPtr xmp_prop)
{
@@ -516,19 +516,19 @@
ExifCategory cat;
char *path;
gchar *key;
-
+
priv = view->priv;
- key = g_strconcat (xmp_string_cstr (xmp_schema), ":",
+ key = g_strconcat (xmp_string_cstr (xmp_schema), ":",
xmp_string_cstr (xmp_path), NULL);
-
+
store = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (view)));
-
+
path = g_hash_table_lookup (priv->id_path_hash, key);
-
+
if (path != NULL) {
- set_row_data (store, path, NULL,
- xmp_string_cstr (xmp_path),
+ set_row_data (store, path, NULL,
+ xmp_string_cstr (xmp_path),
xmp_string_cstr (xmp_prop));
g_free(key);
@@ -537,7 +537,7 @@
cat = get_xmp_category (xmp_schema);
path = set_row_data (store, NULL, exif_categories[cat].path,
- xmp_string_cstr(xmp_path),
+ xmp_string_cstr(xmp_path),
xmp_string_cstr(xmp_prop));
g_hash_table_insert (priv->id_path_hash, key, path);
@@ -548,11 +548,11 @@
eog_exif_details_xmp_update (EogExifDetails *view, XmpPtr data)
{
EogExifDetailsPrivate *priv;
-
+
g_return_if_fail (EOG_IS_EXIF_DETAILS (view));
-
+
priv = view->priv;
-
+
if (data) {
XmpIteratorPtr iter = xmp_iterator_new(data, NULL, NULL, XMP_ITER_JUSTLEAFNODES);
XmpStringPtr the_schema = xmp_string_new ();
Modified: trunk/src/eog-exif-details.h
==============================================================================
--- trunk/src/eog-exif-details.h (original)
+++ trunk/src/eog-exif-details.h Mon Oct 27 19:33:42 2008
@@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __EOG_EXIF_DETAILS__
+#ifndef __EOG_EXIF_DETAILS__
#define __EOG_EXIF_DETAILS__
#include <glib-object.h>
@@ -59,7 +59,7 @@
GtkWidget *eog_exif_details_new (void);
#if HAVE_EXIF
-void eog_exif_details_update (EogExifDetails *view,
+void eog_exif_details_update (EogExifDetails *view,
ExifData *data);
#endif
#if HAVE_EXEMPI
Modified: trunk/src/eog-exif-util.c
==============================================================================
--- trunk/src/eog-exif-util.c (original)
+++ trunk/src/eog-exif-util.c Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - EXIF Utilities
+/* Eye Of Gnome - EXIF Utilities
*
* Copyright (C) 2006-2007 The Free Software Foundation
*
@@ -41,7 +41,7 @@
#define DATE_BUF_SIZE 200
#ifdef HAVE_STRPTIME
-static gchar *
+static gchar *
eog_exif_util_format_date_with_strptime (const gchar *date)
{
gchar *new_date = NULL;
@@ -49,7 +49,7 @@
gchar *p;
gsize dlen;
struct tm tm;
-
+
memset (&tm, '\0', sizeof (tm));
p = strptime (date, "%Y:%m:%d %T", &tm);
@@ -68,7 +68,7 @@
int year, month, day, hour, minutes, seconds;
int result;
gchar *new_date = NULL;
-
+
result = sscanf (date, "%d:%d:%d %d:%d:%d",
&year, &month, &day, &hour, &minutes, &seconds);
@@ -79,12 +79,12 @@
gsize dlen;
time_t secs;
struct tm tm;
-
+
memset (&tm, '\0', sizeof (tm));
tm.tm_mday = day;
tm.tm_mon = month-1;
tm.tm_year = year-1900;
-
+
if (result < 5) {
/* A strftime-formatted string, to display the date the image was taken, for the case we don't have the time. */
dlen = strftime (tmp_date, DATE_BUF_SIZE * sizeof(gchar), _("%a, %d %B %Y"), &tm);
@@ -96,7 +96,7 @@
dlen = strftime (tmp_date, DATE_BUF_SIZE * sizeof(gchar), _("%a, %d %B %Y %X"), &tm);
}
- if (dlen == 0)
+ if (dlen == 0)
return NULL;
else
new_date = g_strndup (tmp_date, dlen);
@@ -105,7 +105,7 @@
}
#endif /* HAVE_STRPTIME */
-gchar *
+gchar *
eog_exif_util_format_date (const gchar *date)
{
gchar *new_date;
@@ -117,7 +117,7 @@
return new_date;
}
-const gchar *
+const gchar *
eog_exif_util_get_value (ExifData *exif_data, gint tag_id, gchar *buffer, guint buf_size)
{
ExifEntry *exif_entry;
Modified: trunk/src/eog-exif-util.h
==============================================================================
--- trunk/src/eog-exif-util.h (original)
+++ trunk/src/eog-exif-util.h Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - EXIF Utilities
+/* Eye Of Gnome - EXIF Utilities
*
* Copyright (C) 2006-2007 The Free Software Foundation
*
Modified: trunk/src/eog-file-chooser.c
==============================================================================
--- trunk/src/eog-file-chooser.c (original)
+++ trunk/src/eog-file-chooser.c Mon Oct 27 19:33:42 2008
@@ -11,7 +11,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330,
+ * Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*/
@@ -199,7 +199,7 @@
gtk_file_filter_add_mime_type (all_img_filter, mime_types[i]);
}
g_strfreev (mime_types);
-
+
pattern = gdk_pixbuf_format_get_extensions ((GdkPixbufFormat *) it->data);
for (i = 0; pattern[i] != NULL; i++) {
tmp = g_strconcat ("*.", pattern[i], NULL);
@@ -211,10 +211,10 @@
/* attach GdkPixbufFormat to filter, see also
* eog_file_chooser_get_format. */
- g_object_set_data (G_OBJECT (filter),
+ g_object_set_data (G_OBJECT (filter),
FILE_FORMAT_KEY,
format);
-
+
filters = g_slist_prepend (filters, filter);
}
g_slist_free (formats);
@@ -254,16 +254,16 @@
const char *bytes_str;
const char *width;
const char *height;
- const char *creator = NULL;
+ const char *creator = NULL;
char *size_str = NULL;
char *dim_str = NULL;
-
+
g_return_if_fail (EOG_IS_FILE_CHOOSER (chooser));
priv = chooser->priv;
-
+
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), pixbuf);
-
+
if (pixbuf != NULL) {
/* try to read file size */
bytes_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Size");
@@ -278,7 +278,7 @@
/* try to read image dimensions */
width = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width");
height = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height");
-
+
if ((width != NULL) && (height != NULL)) {
pixels = atoi (height);
/* Pixel size of image: width x height in pixel */
@@ -299,7 +299,7 @@
}
#endif
}
-
+
set_preview_label (priv->size_label, size_str);
set_preview_label (priv->dim_label, dim_str);
set_preview_label (priv->creator_label, creator);
@@ -354,22 +354,22 @@
thumb_path = gtk_file_chooser_get_preview_filename (file_chooser);
}
}
-
+
if (thumb_path != NULL && g_file_test (thumb_path, G_FILE_TEST_EXISTS)) {
/* try to load and display preview thumbnail */
pixbuf = gdk_pixbuf_new_from_file (thumb_path, NULL);
-
+
have_preview = (pixbuf != NULL);
-
+
set_preview_pixbuf (EOG_FILE_CHOOSER (file_chooser), pixbuf,
g_file_info_get_size (file_info));
-
+
if (pixbuf != NULL) {
g_object_unref (pixbuf);
}
}
}
-
+
if (thumb_path != NULL) {
g_free (thumb_path);
}
@@ -387,18 +387,18 @@
GtkWidget *vbox;
priv = EOG_FILE_CHOOSER (widget)->priv;
-
+
vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
priv->image = gtk_image_new ();
/* 128x128 is maximum size of thumbnails */
gtk_widget_set_size_request (priv->image, 128,128);
-
+
priv->dim_label = gtk_label_new (NULL);
priv->size_label = gtk_label_new (NULL);
priv->creator_label = gtk_label_new (NULL);
-
+
gtk_box_pack_start (GTK_BOX (vbox), priv->image, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), priv->dim_label, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), priv->size_label, FALSE, TRUE, 0);
@@ -478,7 +478,7 @@
return chooser;
}
-GdkPixbufFormat *
+GdkPixbufFormat *
eog_file_chooser_get_format (EogFileChooser *chooser)
{
GtkFileFilter *filter;
Modified: trunk/src/eog-file-chooser.h
==============================================================================
--- trunk/src/eog-file-chooser.h (original)
+++ trunk/src/eog-file-chooser.h Mon Oct 27 19:33:42 2008
@@ -11,7 +11,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330,
+ * Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*/
@@ -22,7 +22,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
G_BEGIN_DECLS
-
+
#define EOG_TYPE_FILE_CHOOSER (eog_file_chooser_get_type ())
#define EOG_FILE_CHOOSER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EOG_TYPE_FILE_CHOOSER, EogFileChooser))
#define EOG_FILE_CHOOSER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EOG_TYPE_FILE_CHOOSER, EogFileChooserClass))
Modified: trunk/src/eog-image-jpeg.c
==============================================================================
--- trunk/src/eog-image-jpeg.c (original)
+++ trunk/src/eog-image-jpeg.c Mon Oct 27 19:33:42 2008
@@ -1,11 +1,11 @@
-/* This code is based on the jpeg saving code from gdk-pixbuf. Full copyright
+/* This code is based on the jpeg saving code from gdk-pixbuf. Full copyright
* notice is given in the following:
*/
/* GdkPixbuf library - JPEG image loader
*
* Copyright (C) 1999 Michael Zucchi
* Copyright (C) 1999 The Free Software Foundation
- *
+ *
* Progressive loading code Copyright (C) 1999 Red Hat, Inc.
*
* Authors: Michael Zucchi <zucchi zedzone mmc com au>
@@ -79,9 +79,9 @@
{
struct error_handler_data *errmgr;
char buffer[JMSG_LENGTH_MAX];
-
+
errmgr = (struct error_handler_data *) cinfo->err;
-
+
/* Create the message */
(* cinfo->err->format_message) (cinfo, buffer);
@@ -123,7 +123,7 @@
priv = image->priv;
if (priv->trans != NULL && priv->trans_autorotate != NULL) {
- composition = eog_transform_compose (priv->trans,
+ composition = eog_transform_compose (priv->trans,
priv->trans_autorotate);
} else if (priv->trans != NULL) {
composition = g_object_ref (priv->trans);
@@ -136,13 +136,13 @@
switch (transformation) {
case EOG_TRANSFORM_ROT_90:
- trans_code = JXFORM_ROT_90;
+ trans_code = JXFORM_ROT_90;
break;
case EOG_TRANSFORM_ROT_270:
- trans_code = JXFORM_ROT_270;
+ trans_code = JXFORM_ROT_270;
break;
case EOG_TRANSFORM_ROT_180:
- trans_code = JXFORM_ROT_180;
+ trans_code = JXFORM_ROT_180;
break;
case EOG_TRANSFORM_FLIP_HORIZONTAL:
trans_code = JXFORM_FLIP_H;
@@ -164,13 +164,13 @@
}
static gboolean
-_save_jpeg_as_jpeg (EogImage *image, const char *file, EogImageSaveInfo *source,
+_save_jpeg_as_jpeg (EogImage *image, const char *file, EogImageSaveInfo *source,
EogImageSaveInfo *target, GError **error)
{
struct jpeg_decompress_struct srcinfo;
struct jpeg_compress_struct dstinfo;
struct error_handler_data jsrcerr, jdsterr;
- jpeg_transform_info transformoption;
+ jpeg_transform_info transformoption;
jvirt_barray_ptr *src_coef_arrays;
jvirt_barray_ptr *dst_coef_arrays;
FILE *output_file;
@@ -184,8 +184,8 @@
priv = image->priv;
init_transform_info (image, &transformoption);
-
- /* Initialize the JPEG decompression object with default error
+
+ /* Initialize the JPEG decompression object with default error
* handling. */
jsrcerr.filename = g_file_get_path (priv->file);
srcinfo.err = jpeg_std_error (&(jsrcerr.pub));
@@ -195,7 +195,7 @@
jpeg_create_decompress (&srcinfo);
- /* Initialize the JPEG compression object with default error
+ /* Initialize the JPEG compression object with default error
* handling. */
jdsterr.filename = (char *) file;
dstinfo.err = jpeg_std_error (&(jdsterr.pub));
@@ -204,7 +204,7 @@
jdsterr.error = error;
jpeg_create_compress (&dstinfo);
-
+
dstinfo.err->trace_level = 0;
dstinfo.arith_code = FALSE;
dstinfo.optimize_coding = FALSE;
@@ -273,7 +273,7 @@
/* Adjust destination parameters if required by transform options;
* also find out which set of coefficient arrays will hold the output.
*/
- dst_coef_arrays = jtransform_adjust_parameters (&srcinfo,
+ dst_coef_arrays = jtransform_adjust_parameters (&srcinfo,
&dstinfo,
src_coef_arrays,
&transformoption);
@@ -304,12 +304,12 @@
#endif
/* FIXME: Consider IPTC data too */
- /* Copy to the output file any extra markers that we want to
+ /* Copy to the output file any extra markers that we want to
* preserve */
jcopy_markers_execute (&srcinfo, &dstinfo, JCOPYOPT_DEFAULT);
/* Execute image transformation, if any */
- jtransform_execute_transformation (&srcinfo,
+ jtransform_execute_transformation (&srcinfo,
&dstinfo,
src_coef_arrays,
&transformoption);
@@ -325,11 +325,11 @@
fclose (input_file);
fclose (output_file);
- return TRUE;
+ return TRUE;
}
static gboolean
-_save_any_as_jpeg (EogImage *image, const char *file, EogImageSaveInfo *source,
+_save_any_as_jpeg (EogImage *image, const char *file, EogImageSaveInfo *source,
EogImageSaveInfo *target, GError **error)
{
EogImagePrivate *priv;
@@ -346,13 +346,13 @@
int rowstride = 0;
FILE *outfile;
struct error_handler_data jerr;
-
+
g_return_val_if_fail (EOG_IS_IMAGE (image), FALSE);
g_return_val_if_fail (EOG_IMAGE (image)->priv->image != NULL, FALSE);
-
+
priv = image->priv;
pixbuf = priv->image;
-
+
outfile = fopen (file, "wb");
if (outfile == NULL) {
g_set_error (error, /* FIXME: Better error message */
@@ -366,11 +366,11 @@
rowstride = gdk_pixbuf_get_rowstride (pixbuf);
w = gdk_pixbuf_get_width (pixbuf);
h = gdk_pixbuf_get_height (pixbuf);
-
+
/* no image data? abort */
pixels = gdk_pixbuf_get_pixels (pixbuf);
g_return_val_if_fail (pixels != NULL, FALSE);
-
+
/* allocate a small buffer to convert image data */
buf = g_try_malloc (w * 3 * sizeof (guchar));
if (!buf) {
@@ -380,8 +380,8 @@
_("Couldn't allocate memory for loading JPEG file"));
return FALSE;
}
-
- /* set up error handling */
+
+ /* set up error handling */
jerr.filename = (char *) file;
cinfo.err = jpeg_std_error (&(jerr.pub));
jerr.pub.error_exit = fatal_error_handler;
@@ -393,7 +393,7 @@
jpeg_stdio_dest (&cinfo, outfile);
cinfo.image_width = w;
cinfo.image_height = h;
- cinfo.input_components = 3;
+ cinfo.input_components = 3;
cinfo.in_color_space = JCS_RGB;
/* error exit routine */
@@ -407,12 +407,12 @@
if (target != NULL && target->jpeg_quality >= 0.0) {
quality = (int) MIN (target->jpeg_quality, 1.0) * 100;
}
-
+
/* set up jepg compression parameters */
jpeg_set_defaults (&cinfo);
jpeg_set_quality (&cinfo, quality, TRUE);
jpeg_start_compress (&cinfo, TRUE);
-
+
/* write EXIF/IPTC data explicitly */
#if HAVE_EXIF
/* exif_chunk and exif are mutally exclusvie, this is what we assure here */
@@ -421,7 +421,7 @@
{
unsigned char *exif_buf;
unsigned int exif_buf_len;
-
+
exif_data_save_data (priv->exif, &exif_buf, &exif_buf_len);
jpeg_write_marker (&cinfo, 0xe1, exif_buf, exif_buf_len);
g_free (exif_buf);
@@ -441,15 +441,15 @@
/* convert scanline from ARGB to RGB packed */
for (j = 0; j < w; j++)
memcpy (&(buf[j*3]), &(ptr[i*rowstride + j*(rowstride/w)]), 3);
-
+
/* write scanline */
jbuf = (JSAMPROW *)(&buf);
jpeg_write_scanlines (&cinfo, jbuf, 1);
i++;
y++;
-
+
}
-
+
/* finish off */
jpeg_finish_compress (&cinfo);
jpeg_destroy_compress(&cinfo);
@@ -460,8 +460,8 @@
return TRUE;
}
-gboolean
-eog_image_jpeg_save_file (EogImage *image, const char *file,
+gboolean
+eog_image_jpeg_save_file (EogImage *image, const char *file,
EogImageSaveInfo *source, EogImageSaveInfo *target,
GError **error)
{
Modified: trunk/src/eog-image-jpeg.h
==============================================================================
--- trunk/src/eog-image-jpeg.h (original)
+++ trunk/src/eog-image-jpeg.h Mon Oct 27 19:33:42 2008
@@ -13,7 +13,7 @@
* possible. It will save the image as lossless as possible (if the
* target is a jpeg image too).
*/
-gboolean eog_image_jpeg_save_file (EogImage *image, const char *file,
+gboolean eog_image_jpeg_save_file (EogImage *image, const char *file,
EogImageSaveInfo *source, EogImageSaveInfo *target,
GError **error);
#endif
Modified: trunk/src/eog-image-private.h
==============================================================================
--- trunk/src/eog-image-private.h (original)
+++ trunk/src/eog-image-private.h Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - Image Private Data
+/* Eye Of Gnome - Image Private Data
*
* Copyright (C) 2007 The Free Software Foundation
*
@@ -35,7 +35,7 @@
GdkPixbuf *image;
GdkPixbuf *thumbnail;
-
+
gint width;
gint height;
@@ -44,11 +44,11 @@
gboolean threadsafe_format;
/* Holds EXIF raw data */
- guchar *exif_chunk;
+ guchar *exif_chunk;
guint exif_chunk_len;
/* Holds IPTC raw data */
- guchar *iptc_chunk;
+ guchar *iptc_chunk;
guint iptc_chunk_len;
#ifdef HAVE_EXIF
Modified: trunk/src/eog-image-save-info.c
==============================================================================
--- trunk/src/eog-image-save-info.c (original)
+++ trunk/src/eog-image-save-info.c Mon Oct 27 19:33:42 2008
@@ -34,7 +34,7 @@
}
-static void
+static void
eog_image_save_info_class_init (EogImageSaveInfoClass *klass)
{
GObjectClass *object_class = (GObjectClass*) klass;
@@ -42,14 +42,14 @@
object_class->dispose = eog_image_save_info_dispose;
}
-/* is_local_uri:
- *
+/* is_local_uri:
+ *
* Checks if the URI points to a local file system. This tests simply
* if the URI scheme is 'file'. This function is used to ensure that
* we can write to the path-part of the URI with non-VFS aware
* filesystem calls.
*/
-static gboolean
+static gboolean
is_local_file (GFile *file)
{
char *scheme;
@@ -58,7 +58,7 @@
g_return_val_if_fail (file != NULL, FALSE);
scheme = g_file_get_uri_scheme (file);
-
+
ret = (g_ascii_strcasecmp (scheme, "file") == 0);
g_free (scheme);
return ret;
@@ -78,18 +78,18 @@
return type;
}
-EogImageSaveInfo*
+EogImageSaveInfo*
eog_image_save_info_from_image (gpointer data)
{
EogImageSaveInfo *info = NULL;
EogImage *image;
-
+
image = EOG_IMAGE (data);
g_return_val_if_fail (EOG_IS_IMAGE (image), NULL);
info = g_object_new (EOG_TYPE_IMAGE_SAVE_INFO, NULL);
-
+
info->file = eog_image_get_file (image);
info->format = g_strdup (image->priv->file_type);
info->exists = g_file_query_exists (info->file, NULL);
@@ -97,13 +97,13 @@
info->has_metadata = eog_image_has_data (image, EOG_IMAGE_DATA_EXIF);
info->modified = eog_image_is_modified (image);
info->overwrite = FALSE;
-
+
info->jpeg_quality = -1.0;
return info;
}
-EogImageSaveInfo*
+EogImageSaveInfo*
eog_image_save_info_from_uri (const char *txt_uri, GdkPixbufFormat *format)
{
GFile *file;
@@ -114,13 +114,13 @@
file = g_file_new_for_uri (txt_uri);
info = eog_image_save_info_from_file (file, format);
-
+
g_object_unref (file);
return info;
}
-EogImageSaveInfo*
+EogImageSaveInfo*
eog_image_save_info_from_file (GFile *file, GdkPixbufFormat *format)
{
EogImageSaveInfo *info;
@@ -128,7 +128,7 @@
g_return_val_if_fail (file != NULL, NULL);
info = g_object_new (EOG_TYPE_IMAGE_SAVE_INFO, NULL);
-
+
info->file = g_object_ref (file);
if (format == NULL) {
info->format = get_save_file_type_by_file (info->file);
Modified: trunk/src/eog-image-save-info.h
==============================================================================
--- trunk/src/eog-image-save-info.h (original)
+++ trunk/src/eog-image-save-info.h Mon Oct 27 19:33:42 2008
@@ -43,10 +43,10 @@
EogImageSaveInfo *eog_image_save_info_from_image (gpointer data);
-EogImageSaveInfo *eog_image_save_info_from_uri (const char *uri,
+EogImageSaveInfo *eog_image_save_info_from_uri (const char *uri,
GdkPixbufFormat *format);
-EogImageSaveInfo *eog_image_save_info_from_file (GFile *file,
+EogImageSaveInfo *eog_image_save_info_from_file (GFile *file,
GdkPixbufFormat *format);
G_END_DECLS
Modified: trunk/src/eog-image.c
==============================================================================
--- trunk/src/eog-image.c (original)
+++ trunk/src/eog-image.c Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - Image
+/* Eye Of Gnome - Image
*
* Copyright (C) 2006 The Free Software Foundation
*
@@ -84,11 +84,11 @@
#define EOG_IMAGE_READ_BUFFER_SIZE 65535
-static void
+static void
eog_image_free_mem_private (EogImage *image)
{
EogImagePrivate *priv;
-
+
priv = image->priv;
if (priv->status == EOG_IMAGE_STATUS_LOADING) {
@@ -98,14 +98,14 @@
g_object_unref (priv->image);
priv->image = NULL;
}
-
+
#ifdef HAVE_EXIF
if (priv->exif != NULL) {
exif_data_unref (priv->exif);
priv->exif = NULL;
}
#endif
-
+
if (priv->exif_chunk != NULL) {
g_free (priv->exif_chunk);
priv->exif_chunk = NULL;
@@ -126,7 +126,7 @@
priv->profile = NULL;
}
#endif
-
+
priv->status = EOG_IMAGE_STATUS_UNKNOWN;
}
}
@@ -159,7 +159,7 @@
g_free (priv->file_type);
priv->file_type = NULL;
}
-
+
if (priv->status_mutex) {
g_mutex_free (priv->status_mutex);
priv->status_mutex = NULL;
@@ -191,7 +191,7 @@
object_class->dispose = eog_image_dispose;
- signals[SIGNAL_SIZE_PREPARED] =
+ signals[SIGNAL_SIZE_PREPARED] =
g_signal_new ("size-prepared",
EOG_TYPE_IMAGE,
G_SIGNAL_RUN_LAST,
@@ -202,7 +202,7 @@
G_TYPE_INT,
G_TYPE_INT);
- signals[SIGNAL_CHANGED] =
+ signals[SIGNAL_CHANGED] =
g_signal_new ("changed",
EOG_TYPE_IMAGE,
G_SIGNAL_RUN_LAST,
@@ -211,7 +211,7 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- signals[SIGNAL_THUMBNAIL_CHANGED] =
+ signals[SIGNAL_THUMBNAIL_CHANGED] =
g_signal_new ("thumbnail-changed",
EOG_TYPE_IMAGE,
G_SIGNAL_RUN_LAST,
@@ -220,7 +220,7 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- signals[SIGNAL_SAVE_PROGRESS] =
+ signals[SIGNAL_SAVE_PROGRESS] =
g_signal_new ("save-progress",
EOG_TYPE_IMAGE,
G_SIGNAL_RUN_LAST,
@@ -264,7 +264,7 @@
#endif
}
-EogImage *
+EogImage *
eog_image_new (const char *txt_uri)
{
EogImage *img;
@@ -276,7 +276,7 @@
return img;
}
-EogImage *
+EogImage *
eog_image_new_file (GFile *file)
{
EogImage *img;
@@ -318,7 +318,7 @@
bo = exif_data_get_byte_order (priv->exif);
- /* Update image width */
+ /* Update image width */
entry = exif_data_get_entry (priv->exif, EXIF_TAG_PIXEL_X_DIMENSION);
if (entry != NULL && (priv->width >= 0)) {
if (entry->format == EXIF_FORMAT_LONG)
@@ -329,7 +329,7 @@
g_warning ("Exif entry has unsupported size");
}
- /* Update image height */
+ /* Update image height */
entry = exif_data_get_entry (priv->exif, EXIF_TAG_PIXEL_Y_DIMENSION);
if (entry != NULL && (priv->height >= 0)) {
if (entry->format == EXIF_FORMAT_LONG)
@@ -339,8 +339,8 @@
else
g_warning ("Exif entry has unsupported size");
}
-
- /* Update image orientation */
+
+ /* Update image orientation */
entry = exif_data_get_entry (priv->exif, EXIF_TAG_ORIENTATION);
if (entry != NULL) {
if (entry->format == EXIF_FORMAT_LONG)
@@ -356,8 +356,8 @@
}
static void
-eog_image_real_transform (EogImage *img,
- EogTransform *trans,
+eog_image_real_transform (EogImage *img,
+ EogTransform *trans,
gboolean is_undo,
EogJob *job)
{
@@ -372,13 +372,13 @@
if (priv->image != NULL) {
transformed = eog_transform_apply (trans, priv->image, job);
-
+
g_object_unref (priv->image);
priv->image = transformed;
priv->width = gdk_pixbuf_get_width (transformed);
priv->height = gdk_pixbuf_get_height (transformed);
-
+
modified = TRUE;
}
@@ -387,7 +387,7 @@
g_object_unref (priv->thumbnail);
priv->thumbnail = transformed;
-
+
modified = TRUE;
}
@@ -408,7 +408,7 @@
priv->trans = composition;
}
-
+
if (!is_undo) {
g_object_ref (trans);
priv->undo_stack = g_slist_prepend (priv->undo_stack, trans);
@@ -424,13 +424,13 @@
format = gdk_pixbuf_loader_get_format (loader);
if (format) {
ret_val = TRUE;
- if (result)
+ if (result)
/* FIXME: We should not be accessing this struct internals
* directly. Keep track of bug #469209 to fix that. */
*result = format->flags & GDK_PIXBUF_FORMAT_THREADSAFE;
}
- return ret_val;
+ return ret_val;
}
static void
@@ -450,9 +450,9 @@
}
static void
-eog_image_size_prepared (GdkPixbufLoader *loader,
- gint width,
- gint height,
+eog_image_size_prepared (GdkPixbufLoader *loader,
+ gint width,
+ gint height,
gpointer data)
{
EogImage *img;
@@ -483,12 +483,12 @@
{
EogMetadataReader *md_reader = NULL;
- eog_debug_message (DEBUG_IMAGE_DATA, "Check image format for jpeg: %x%x - length: %i",
+ eog_debug_message (DEBUG_IMAGE_DATA, "Check image format for jpeg: %x%x - length: %i",
buffer[0], buffer[1], bytes_read);
if (bytes_read >= 2) {
/* SOI (start of image) marker for JPEGs is 0xFFD8 */
- if ((buffer[0] == 0xFF) && (buffer[1] == 0xD8)) {
+ if ((buffer[0] == 0xFF) && (buffer[1] == 0xD8)) {
md_reader = eog_metadata_reader_new (EOG_METADATA_JPEG);
}
if (bytes_read >= 8 &&
@@ -516,7 +516,7 @@
EogImagePrivate *priv;
g_return_val_if_fail (EOG_IS_IMAGE (img), FALSE);
-
+
priv = img->priv;
if (priv->trans == NULL && priv->trans_autorotate == NULL) {
@@ -524,8 +524,8 @@
}
if (priv->image == NULL) {
- g_set_error (error,
- EOG_IMAGE_ERROR,
+ g_set_error (error,
+ EOG_IMAGE_ERROR,
EOG_IMAGE_ERROR_NOT_LOADED,
_("Transformation on unloaded image."));
@@ -533,7 +533,7 @@
}
if (priv->trans != NULL && priv->trans_autorotate != NULL) {
- composition = eog_transform_compose (priv->trans,
+ composition = eog_transform_compose (priv->trans,
priv->trans_autorotate);
} else if (priv->trans != NULL) {
composition = g_object_ref (priv->trans);
@@ -552,8 +552,8 @@
priv->width = gdk_pixbuf_get_width (priv->image);
priv->height = gdk_pixbuf_get_height (priv->image);
} else {
- g_set_error (error,
- EOG_IMAGE_ERROR,
+ g_set_error (error,
+ EOG_IMAGE_ERROR,
EOG_IMAGE_ERROR_GENERIC,
_("Transformation failed."));
}
@@ -563,10 +563,10 @@
return (transformed != NULL);
}
-static void
-eog_image_get_file_info (EogImage *img,
+static void
+eog_image_get_file_info (EogImage *img,
goffset *bytes,
- gchar **mime_type,
+ gchar **mime_type,
GError **error)
{
GFileInfo *file_info;
@@ -583,8 +583,8 @@
if (mime_type)
*mime_type = NULL;
- g_set_error (error,
- EOG_IMAGE_ERROR,
+ g_set_error (error,
+ EOG_IMAGE_ERROR,
EOG_IMAGE_ERROR_VFS,
"Error in getting image file info");
} else {
@@ -605,7 +605,7 @@
cmsHTRANSFORM transform;
gint row, width, rows, stride;
guchar *p;
-
+
g_return_if_fail (img != NULL);
priv = img->priv;
@@ -625,13 +625,13 @@
return;
}
- transform = cmsCreateTransform (priv->profile,
- TYPE_RGB_8,
- screen,
- TYPE_RGB_8,
- INTENT_PERCEPTUAL,
+ transform = cmsCreateTransform (priv->profile,
+ TYPE_RGB_8,
+ screen,
+ TYPE_RGB_8,
+ INTENT_PERCEPTUAL,
0);
-
+
if (G_LIKELY (transform != NULL)) {
rows = gdk_pixbuf_get_height (priv->image);
width = gdk_pixbuf_get_width (priv->image);
@@ -658,7 +658,7 @@
#endif
#ifdef HAVE_EXIF
-static void
+static void
eog_image_set_orientation (EogImage *img)
{
EogImagePrivate *priv;
@@ -670,7 +670,7 @@
if (priv->exif != NULL) {
ExifByteOrder o = exif_data_get_byte_order (priv->exif);
- ExifEntry *entry = exif_data_get_entry (priv->exif,
+ ExifEntry *entry = exif_data_get_entry (priv->exif,
EXIF_TAG_ORIENTATION);
if (entry && entry->data != NULL) {
@@ -691,13 +691,13 @@
static void
eog_image_real_autorotate (EogImage *img)
{
- static EogTransformType lookup[8] = {EOG_TRANSFORM_NONE,
- EOG_TRANSFORM_FLIP_HORIZONTAL,
- EOG_TRANSFORM_ROT_180,
- EOG_TRANSFORM_FLIP_VERTICAL,
- EOG_TRANSFORM_TRANSPOSE,
- EOG_TRANSFORM_ROT_90,
- EOG_TRANSFORM_TRANSVERSE,
+ static EogTransformType lookup[8] = {EOG_TRANSFORM_NONE,
+ EOG_TRANSFORM_FLIP_HORIZONTAL,
+ EOG_TRANSFORM_ROT_180,
+ EOG_TRANSFORM_FLIP_VERTICAL,
+ EOG_TRANSFORM_TRANSPOSE,
+ EOG_TRANSFORM_ROT_90,
+ EOG_TRANSFORM_TRANSVERSE,
EOG_TRANSFORM_ROT_270};
EogImagePrivate *priv;
EogTransformType type;
@@ -706,7 +706,7 @@
priv = img->priv;
- type = (priv->orientation >= 1 && priv->orientation <= 8 ?
+ type = (priv->orientation >= 1 && priv->orientation <= 8 ?
lookup[priv->orientation - 1] : EOG_TRANSFORM_NONE);
if (type != EOG_TRANSFORM_NONE) {
@@ -750,7 +750,7 @@
priv = img->priv;
-#ifdef HAVE_EXIF
+#ifdef HAVE_EXIF
priv->exif = eog_metadata_reader_get_exif_data (md_reader);
priv->exif_chunk = NULL;
@@ -763,16 +763,16 @@
/* Emit size prepared signal if we have the size */
if (priv->width > 0 &&
priv->height > 0) {
- g_signal_emit (img,
- signals[SIGNAL_SIZE_PREPARED],
- 0,
- priv->width,
+ g_signal_emit (img,
+ signals[SIGNAL_SIZE_PREPARED],
+ 0,
+ priv->width,
priv->height);
}
}
#else
- eog_metadata_reader_get_exif_chunk (md_reader,
- &priv->exif_chunk,
+ eog_metadata_reader_get_exif_chunk (md_reader,
+ &priv->exif_chunk,
&priv->exif_chunk_len);
#endif
}
@@ -798,9 +798,9 @@
}
static gboolean
-eog_image_real_load (EogImage *img,
- guint data2read,
- EogJob *job,
+eog_image_real_load (EogImage *img,
+ guint data2read,
+ EogJob *job,
GError **error)
{
EogImagePrivate *priv;
@@ -815,7 +815,7 @@
gboolean first_run = TRUE;
gboolean set_metadata = TRUE;
gboolean read_image_data = (data2read & EOG_IMAGE_DATA_IMAGE);
- gboolean read_only_dimension = (data2read & EOG_IMAGE_DATA_DIMENSION) &&
+ gboolean read_only_dimension = (data2read & EOG_IMAGE_DATA_DIMENSION) &&
!read_image_data;
priv = img->priv;
@@ -839,9 +839,9 @@
if (read_only_dimension) {
gint width, height;
gboolean done;
-
- done = eog_image_get_dimension_from_thumbnail (img,
- &width,
+
+ done = eog_image_get_dimension_from_thumbnail (img,
+ &width,
&height);
if (done) {
@@ -852,33 +852,33 @@
return TRUE;
}
}
-
+
input_stream = g_file_read (priv->file, NULL, error);
if (input_stream == NULL) {
g_free (mime_type);
if (error != NULL) {
- g_set_error (error,
- EOG_IMAGE_ERROR,
+ g_set_error (error,
+ EOG_IMAGE_ERROR,
EOG_IMAGE_ERROR_VFS,
"Failed to open input stream for file");
}
return FALSE;
}
-
+
buffer = g_new0 (guchar, EOG_IMAGE_READ_BUFFER_SIZE);
-
+
if (read_image_data || read_only_dimension) {
gboolean checked_threadsafety = FALSE;
loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, error);
-
+
if (error && *error) {
g_error_free (*error);
*error = NULL;
- loader = gdk_pixbuf_loader_new ();
+ loader = gdk_pixbuf_loader_new ();
} else {
/* The mimetype-based loader should know the
* format here already. */
@@ -889,15 +889,15 @@
* any possible asyncronous task that could bring deadlocks
* to image loading process. */
if (!checked_threadsafety)
- g_signal_connect (loader,
+ g_signal_connect (loader,
"size-prepared",
G_CALLBACK (eog_image_pre_size_prepared),
img);
- g_signal_connect_object (G_OBJECT (loader),
- "size-prepared",
+ g_signal_connect_object (G_OBJECT (loader),
+ "size-prepared",
G_CALLBACK (eog_image_size_prepared),
- img,
+ img,
0);
}
g_free (mime_type);
@@ -905,8 +905,8 @@
while (!priv->cancel_loading) {
/* FIXME: make this async */
bytes_read = g_input_stream_read (G_INPUT_STREAM (input_stream),
- buffer,
- EOG_IMAGE_READ_BUFFER_SIZE,
+ buffer,
+ EOG_IMAGE_READ_BUFFER_SIZE,
NULL, error);
if (bytes_read == 0) {
@@ -915,15 +915,15 @@
} else if (bytes_read == -1) {
failed = TRUE;
- g_set_error (error,
- EOG_IMAGE_ERROR,
+ g_set_error (error,
+ EOG_IMAGE_ERROR,
EOG_IMAGE_ERROR_VFS,
"Failed to read from input stream");
break;
}
-
- if ((read_image_data || read_only_dimension) &&
+
+ if ((read_image_data || read_only_dimension) &&
!gdk_pixbuf_loader_write (loader, buffer, bytes_read, error)) {
failed = TRUE;
break;
@@ -941,18 +941,18 @@
if (md_reader == NULL) {
if (data2read == EOG_IMAGE_DATA_EXIF) {
- g_set_error (error,
- EOG_IMAGE_ERROR,
+ g_set_error (error,
+ EOG_IMAGE_ERROR,
EOG_IMAGE_ERROR_GENERIC,
_("EXIF not supported for this file format."));
break;
}
if (priv->threadsafe_format)
- g_signal_emit (img,
- signals[SIGNAL_SIZE_PREPARED],
- 0,
- priv->width,
+ g_signal_emit (img,
+ signals[SIGNAL_SIZE_PREPARED],
+ 0,
+ priv->width,
priv->height);
}
@@ -976,7 +976,7 @@
set_metadata = FALSE;
}
- if (data2read == EOG_IMAGE_DATA_EXIF)
+ if (data2read == EOG_IMAGE_DATA_EXIF)
break;
}
}
@@ -1002,10 +1002,10 @@
g_free (buffer);
g_object_unref (G_OBJECT (input_stream));
-
+
failed = (failed ||
- priv->cancel_loading ||
- bytes_read_total == 0 ||
+ priv->cancel_loading ||
+ bytes_read_total == 0 ||
(error && *error != NULL));
if (failed) {
@@ -1034,13 +1034,13 @@
priv->file_type = gdk_pixbuf_format_get_name (format);
}
- /* If it's non-threadsafe loader, then trigger window
+ /* If it's non-threadsafe loader, then trigger window
* showing in the end of the process. */
if (!priv->threadsafe_format)
- g_signal_emit (img,
- signals[SIGNAL_SIZE_PREPARED],
- 0,
- priv->width,
+ g_signal_emit (img,
+ signals[SIGNAL_SIZE_PREPARED],
+ 0,
+ priv->width,
priv->height);
} else {
/* Some loaders don't report errors correctly.
@@ -1057,11 +1057,11 @@
if (md_reader != NULL) {
g_object_unref (md_reader);
md_reader = NULL;
- }
+ }
/* Catch-all in case of poor-error reporting */
if (failed && error && *error == NULL) {
- g_set_error (error,
+ g_set_error (error,
EOG_IMAGE_ERROR,
EOG_IMAGE_ERROR_GENERIC,
_("Image loading failed."));
@@ -1079,7 +1079,7 @@
g_return_val_if_fail (EOG_IS_IMAGE (img), FALSE);
priv = img->priv;
-
+
if ((req_data & EOG_IMAGE_DATA_IMAGE) > 0) {
req_data = (req_data & !EOG_IMAGE_DATA_IMAGE);
has_data = has_data && (priv->image != NULL);
@@ -1171,7 +1171,7 @@
g_object_unref (priv->thumbnail);
priv->thumbnail = NULL;
}
-
+
if (thumbnail != NULL && priv->trans != NULL) {
priv->thumbnail = eog_transform_apply (priv->trans, thumbnail, NULL);
} else {
@@ -1187,7 +1187,7 @@
}
}
-GdkPixbuf *
+GdkPixbuf *
eog_image_get_pixbuf (EogImage *img)
{
GdkPixbuf *image = NULL;
@@ -1215,7 +1215,7 @@
}
#endif
-GdkPixbuf *
+GdkPixbuf *
eog_image_get_thumbnail (EogImage *img)
{
g_return_val_if_fail (EOG_IS_IMAGE (img), NULL);
@@ -1229,7 +1229,7 @@
return NULL;
}
-void
+void
eog_image_get_size (EogImage *img, int *width, int *height)
{
EogImagePrivate *priv;
@@ -1238,17 +1238,17 @@
priv = img->priv;
- *width = priv->width;
+ *width = priv->width;
*height = priv->height;
}
-void
+void
eog_image_transform (EogImage *img, EogTransform *trans, EogJob *job)
{
eog_image_real_transform (img, trans, FALSE, job);
}
-void
+void
eog_image_undo (EogImage *img)
{
EogImagePrivate *priv;
@@ -1308,7 +1308,7 @@
EogImage *image = EOG_IMAGE (user_data);
if (cur_bytes > 0) {
- g_signal_emit (G_OBJECT(image),
+ g_signal_emit (G_OBJECT(image),
signals[SIGNAL_SAVE_PROGRESS],
0,
(gfloat) cur_bytes / (gfloat) total_bytes);
@@ -1316,20 +1316,20 @@
}
static gboolean
-tmp_file_move_to_uri (EogImage *image,
- GFile *tmpfile,
- GFile *file,
- gboolean overwrite,
+tmp_file_move_to_uri (EogImage *image,
+ GFile *tmpfile,
+ GFile *file,
+ gboolean overwrite,
GError **error)
{
gboolean result;
GError **ioerror = NULL;
-
+
result = g_file_move (tmpfile,
file,
(overwrite ? G_FILE_COPY_OVERWRITE : 0) |
G_FILE_COPY_ALL_METADATA,
- NULL,
+ NULL,
(GFileProgressCallback) transfer_progress_cb,
image,
ioerror);
@@ -1342,11 +1342,11 @@
"File exists");
} else {
g_set_error (error, EOG_IMAGE_ERROR,
- EOG_IMAGE_ERROR_VFS,
+ EOG_IMAGE_ERROR_VFS,
"VFS error moving the temp file");
}
g_error_free (*ioerror);
- }
+ }
return result;
}
@@ -1377,7 +1377,7 @@
return result;
}
-static void
+static void
eog_image_reset_modifications (EogImage *image)
{
EogImagePrivate *priv;
@@ -1419,7 +1419,7 @@
}
priv->file = g_object_ref (target->file);
- /* Clear caption and caption key, these will be
+ /* Clear caption and caption key, these will be
* updated on next eog_image_get_caption call.
*/
if (priv->caption != NULL) {
@@ -1439,7 +1439,7 @@
}
gboolean
-eog_image_save_by_info (EogImage *img, EogImageSaveInfo *source, GError **error)
+eog_image_save_by_info (EogImage *img, EogImageSaveInfo *source, GError **error)
{
EogImagePrivate *priv;
EogImageStatus prev_status;
@@ -1478,14 +1478,14 @@
EOG_IMAGE_ERROR_TMP_FILE_FAILED,
_("Temporary file creation failed."));
return FALSE;
- }
+ }
tmp_file_path = g_file_get_path (tmp_file);
#ifdef HAVE_JPEG
/* determine kind of saving */
- if ((g_ascii_strcasecmp (source->format, EOG_FILE_FORMAT_JPEG) == 0) &&
- source->exists && source->modified)
+ if ((g_ascii_strcasecmp (source->format, EOG_FILE_FORMAT_JPEG) == 0) &&
+ source->exists && source->modified)
{
success = eog_image_jpeg_save_file (img, tmp_file_path, source, NULL, error);
}
@@ -1522,16 +1522,16 @@
g_return_val_if_fail (EOG_IS_IMAGE_SAVE_INFO (source), FALSE);
g_return_val_if_fail (EOG_IS_IMAGE_SAVE_INFO (target), FALSE);
-
+
result = g_file_copy (source->file,
target->file,
(target->overwrite ? G_FILE_COPY_OVERWRITE : 0) |
G_FILE_COPY_ALL_METADATA,
- NULL,
+ NULL,
EOG_IS_IMAGE (image) ? transfer_progress_cb :NULL,
image,
&ioerror);
-
+
if (result == FALSE) {
if (ioerror->code == G_IO_ERROR_EXISTS) {
g_set_error (error, EOG_IMAGE_ERROR,
@@ -1539,7 +1539,7 @@
"%s", ioerror->message);
} else {
g_set_error (error, EOG_IMAGE_ERROR,
- EOG_IMAGE_ERROR_VFS,
+ EOG_IMAGE_ERROR_VFS,
"%s", ioerror->message);
}
g_error_free (ioerror);
@@ -1565,7 +1565,7 @@
/* fail if there is no image to save */
if (priv->image == NULL) {
- g_set_error (error,
+ g_set_error (error,
EOG_IMAGE_ERROR,
EOG_IMAGE_ERROR_NOT_LOADED,
_("No image loaded."));
@@ -1577,7 +1577,7 @@
tmp_file = tmp_file_get ();
if (tmp_file == NULL) {
- g_set_error (error,
+ g_set_error (error,
EOG_IMAGE_ERROR,
EOG_IMAGE_ERROR_TMP_FILE_FAILED,
_("Temporary file creation failed."));
@@ -1585,7 +1585,7 @@
return FALSE;
}
tmp_file_path = g_file_get_path (tmp_file);
-
+
/* determine kind of saving */
if (g_ascii_strcasecmp (source->format, target->format) == 0 && !source->modified) {
success = eog_image_copy_file (img, source, target, error);
@@ -1626,7 +1626,7 @@
/*
- * This function is extracted from
+ * This function is extracted from
* File: nautilus/libnautilus-private/nautilus-file.c
* Revision: 1.309
* Author: Darin Adler <darin bentspoon com>
@@ -1636,19 +1636,19 @@
{
static gboolean initialized = FALSE;
static gboolean broken;
-
+
if (initialized) {
return broken;
}
-
+
broken = g_getenv ("G_BROKEN_FILENAMES") != NULL;
-
+
initialized = TRUE;
-
+
return broken;
}
-/*
+/*
* This function is inspired by
* nautilus/libnautilus-private/nautilus-file.c:nautilus_file_get_display_name_nocopy
* Revision: 1.309
@@ -1670,13 +1670,13 @@
if (priv->file == NULL) return NULL;
- if (priv->caption != NULL)
+ if (priv->caption != NULL)
/* Use cached caption string */
return priv->caption;
-
+
name = g_file_get_basename (priv->file);
scheme = g_file_get_uri_scheme (priv->file);
-
+
if (name != NULL && g_ascii_strcasecmp (scheme, "file") == 0) {
/* Support the G_BROKEN_FILENAMES feature of
* glib by using g_filename_to_utf8 to convert
@@ -1699,7 +1699,7 @@
validated = TRUE;
}
}
-
+
if (!validated && !g_utf8_validate (name, -1, NULL)) {
if (name == NULL) {
name = g_strdup ("[Invalid Unicode]");
@@ -1724,17 +1724,17 @@
g_free (short_str);
}
g_free (scheme);
-
+
return priv->caption;
}
-const gchar*
+const gchar*
eog_image_get_collate_key (EogImage *img)
{
EogImagePrivate *priv;
g_return_val_if_fail (EOG_IS_IMAGE (img), NULL);
-
+
priv = img->priv;
if (priv->collate_key == NULL) {
@@ -1754,7 +1754,7 @@
EogImagePrivate *priv;
g_return_if_fail (EOG_IS_IMAGE (img));
-
+
priv = img->priv;
g_mutex_lock (priv->status_mutex);
@@ -1771,9 +1771,9 @@
{
EogImagePrivate *priv;
gpointer data = NULL;
-
+
g_return_val_if_fail (EOG_IS_IMAGE (img), NULL);
-
+
priv = img->priv;
#ifdef HAVE_EXIF
@@ -1794,17 +1794,17 @@
{
EogImagePrivate *priv;
gpointer data = NULL;
-
+
g_return_val_if_fail (EOG_IS_IMAGE (img), NULL);
-
+
priv = img->priv;
-
+
#ifdef HAVE_EXEMPI
g_mutex_lock (priv->status_mutex);
data = (gpointer) xmp_copy (priv->xmp);
g_mutex_unlock (priv->status_mutex);
#endif
-
+
return data;
}
@@ -1813,7 +1813,7 @@
eog_image_get_file (EogImage *img)
{
g_return_val_if_fail (EOG_IS_IMAGE (img), NULL);
-
+
return g_object_ref (img->priv->file);
}
@@ -1821,7 +1821,7 @@
eog_image_is_modified (EogImage *img)
{
g_return_val_if_fail (EOG_IS_IMAGE (img), FALSE);
-
+
return img->priv->modified;
}
@@ -1829,7 +1829,7 @@
eog_image_get_bytes (EogImage *img)
{
g_return_val_if_fail (EOG_IS_IMAGE (img), 0);
-
+
return img->priv->bytes;
}
@@ -1849,7 +1849,7 @@
gchar *str = NULL;
g_return_val_if_fail (EOG_IS_IMAGE (img), NULL);
-
+
priv = img->priv;
if (priv->file != NULL) {
@@ -1887,7 +1887,7 @@
eog_image_data_unref (EogImage *img)
{
g_return_if_fail (EOG_IS_IMAGE (img));
-
+
if (img->priv->data_ref_count > 0) {
img->priv->data_ref_count--;
} else {
@@ -1906,10 +1906,10 @@
static gint
compare_quarks (gconstpointer a, gconstpointer b)
{
- GQuark quark;
-
+ GQuark quark;
+
quark = g_quark_from_string ((const gchar *) a);
-
+
return quark - GPOINTER_TO_INT (b);
}
@@ -1928,7 +1928,7 @@
gdk_pixbuf_format_get_mime_types ((GdkPixbufFormat *) it->data);
for (i = 0; mime_types[i] != NULL; i++) {
- supported_mime_types =
+ supported_mime_types =
g_list_prepend (supported_mime_types,
g_strdup (mime_types[i]));
}
@@ -1936,7 +1936,7 @@
g_strfreev (mime_types);
}
- supported_mime_types = g_list_sort (supported_mime_types,
+ supported_mime_types = g_list_sort (supported_mime_types,
(GCompareFunc) compare_quarks);
g_slist_free (format_list);
@@ -1945,8 +1945,8 @@
return supported_mime_types;
}
-gboolean
-eog_image_is_supported_mime_type (const char *mime_type)
+gboolean
+eog_image_is_supported_mime_type (const char *mime_type)
{
GList *supported_mime_types, *result;
GQuark quark;
@@ -1959,7 +1959,7 @@
quark = g_quark_from_string (mime_type);
- result = g_list_find_custom (supported_mime_types,
+ result = g_list_find_custom (supported_mime_types,
GINT_TO_POINTER (quark),
(GCompareFunc) compare_quarks);
Modified: trunk/src/eog-image.h
==============================================================================
--- trunk/src/eog-image.h (original)
+++ trunk/src/eog-image.h Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - Image
+/* Eye Of Gnome - Image
*
* Copyright (C) 2007 The Free Software Foundation
*
@@ -102,13 +102,13 @@
void (* changed) (EogImage *img);
- void (* size_prepared) (EogImage *img,
- int width,
+ void (* size_prepared) (EogImage *img,
+ int width,
int height);
void (* thumbnail_changed) (EogImage *img);
- void (* save_progress) (EogImage *img,
+ void (* save_progress) (EogImage *img,
gfloat progress);
};
@@ -120,38 +120,38 @@
EogImage *eog_image_new_file (GFile *file);
-gboolean eog_image_load (EogImage *img,
+gboolean eog_image_load (EogImage *img,
EogImageData data2read,
- EogJob *job,
+ EogJob *job,
GError **error);
void eog_image_cancel_load (EogImage *img);
-gboolean eog_image_has_data (EogImage *img,
+gboolean eog_image_has_data (EogImage *img,
EogImageData data);
void eog_image_data_ref (EogImage *img);
void eog_image_data_unref (EogImage *img);
-void eog_image_set_thumbnail (EogImage *img,
+void eog_image_set_thumbnail (EogImage *img,
GdkPixbuf *pixbuf);
-gboolean eog_image_save_as_by_info (EogImage *img,
- EogImageSaveInfo *source,
- EogImageSaveInfo *target,
+gboolean eog_image_save_as_by_info (EogImage *img,
+ EogImageSaveInfo *source,
+ EogImageSaveInfo *target,
GError **error);
-gboolean eog_image_save_by_info (EogImage *img,
- EogImageSaveInfo *source,
+gboolean eog_image_save_by_info (EogImage *img,
+ EogImageSaveInfo *source,
GError **error);
GdkPixbuf* eog_image_get_pixbuf (EogImage *img);
GdkPixbuf* eog_image_get_thumbnail (EogImage *img);
-void eog_image_get_size (EogImage *img,
- gint *width,
+void eog_image_get_size (EogImage *img,
+ gint *width,
gint *height);
goffset eog_image_get_bytes (EogImage *img);
@@ -174,7 +174,7 @@
EogImageStatus eog_image_get_status (EogImage *img);
-void eog_image_transform (EogImage *img,
+void eog_image_transform (EogImage *img,
EogTransform *trans,
EogJob *job);
Modified: trunk/src/eog-job-queue.c
==============================================================================
--- trunk/src/eog-job-queue.c (original)
+++ trunk/src/eog-job-queue.c Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Jobs Queue
+/* Eye Of Gnome - Jobs Queue
*
* Copyright (C) 2006 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on evince code (shell/ev-job-queue.c) by:
+ * Based on evince code (shell/ev-job-queue.c) by:
* - Martin Kretzschmar <martink gnome org>
*
* This program is free software; you can redistribute it and/or modify
@@ -211,7 +211,7 @@
queue = find_queue (job);
g_mutex_lock (eog_queue_mutex);
-
+
add_job_to_queue_locked (queue, job);
g_mutex_unlock (eog_queue_mutex);
@@ -243,6 +243,6 @@
}
g_mutex_unlock (eog_queue_mutex);
-
+
return retval;
}
Modified: trunk/src/eog-job-queue.h
==============================================================================
--- trunk/src/eog-job-queue.h (original)
+++ trunk/src/eog-job-queue.h Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Jobs Queue
+/* Eye Of Gnome - Jobs Queue
*
* Copyright (C) 2006 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on evince code (shell/ev-job-queue.h) by:
+ * Based on evince code (shell/ev-job-queue.h) by:
* - Martin Kretzschmar <martink gnome org>
*
* This program is free software; you can redistribute it and/or modify
Modified: trunk/src/eog-jobs.c
==============================================================================
--- trunk/src/eog-jobs.c (original)
+++ trunk/src/eog-jobs.c Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Jobs
+/* Eye Of Gnome - Jobs
*
* Copyright (C) 2006 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on evince code (shell/ev-jobs.c) by:
+ * Based on evince code (shell/ev-jobs.c) by:
* - Martin Kretzschmar <martink gnome org>
*
* This program is free software; you can redistribute it and/or modify
@@ -57,7 +57,7 @@
static void eog_job_save_real_run (EogJobSave *job);
static void eog_job_save_as_real_run (EogJobSave *job);
-static void eog_job_init (EogJob *job)
+static void eog_job_init (EogJob *job)
{
job->mutex = g_mutex_new();
job->progress = 0.0;
@@ -156,7 +156,7 @@
g_object_unref (job->image);
job->image = NULL;
}
-
+
if (job->thumbnail) {
g_object_unref (job->thumbnail);
job->thumbnail = NULL;
@@ -194,9 +194,9 @@
{
gchar *orig_width, *orig_height;
gint width, height;
-
+
g_return_if_fail (EOG_IS_JOB_THUMBNAIL (job));
-
+
if (EOG_JOB (job)->error) {
g_error_free (EOG_JOB (job)->error);
EOG_JOB (job)->error = NULL;
@@ -230,7 +230,7 @@
GINT_TO_POINTER (height));
g_free (orig_height);
}
-
+
if (EOG_JOB (job)->error) {
g_warning ("%s", EOG_JOB (job)->error->message);
}
@@ -275,7 +275,7 @@
if (image) {
job->image = g_object_ref (image);
}
-
+
return EOG_JOB (job);
}
@@ -293,7 +293,7 @@
EOG_IMAGE_DATA_ALL,
EOG_JOB (job),
&EOG_JOB (job)->error);
-
+
EOG_JOB (job)->finished = TRUE;
}
@@ -344,7 +344,7 @@
file = (GFile *) it->data;
if (file != NULL) {
- file_info = g_file_query_info (file,
+ file_info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STANDARD_TYPE,
0, NULL, NULL);
if (file_info == NULL) {
@@ -361,7 +361,7 @@
*file_list = g_list_prepend (*file_list, g_object_ref (file));
break;
default:
- *error_list = g_list_prepend (*error_list,
+ *error_list = g_list_prepend (*error_list,
g_file_get_uri (file));
break;
}
@@ -384,7 +384,7 @@
filter_files (job->file_list, &filtered_list, &error_list);
job->store = EOG_LIST_STORE (eog_list_store_new ());
-
+
eog_list_store_add_files (job->store, filtered_list);
g_list_foreach (filtered_list, (GFunc) g_object_unref, NULL);
@@ -466,19 +466,19 @@
for (it = job->images; it != NULL; it = it->next) {
EogImage *image = EOG_IMAGE (it->data);
-
+
if (job->trans == NULL) {
eog_image_undo (image);
} else {
eog_image_transform (image, job->trans, EOG_JOB (job));
}
-
+
if (eog_image_is_modified (image) || job->trans == NULL) {
g_object_ref (image);
g_idle_add (eog_job_transform_image_modified, image);
}
}
-
+
EOG_JOB (job)->finished = TRUE;
}
@@ -538,7 +538,7 @@
GList *it;
job->current_pos = 0;
-
+
for (it = job->images; it != NULL; it = it->next, job->current_pos++) {
EogImage *image = EOG_IMAGE (it->data);
EogImageSaveInfo *save_info = NULL;
@@ -551,21 +551,21 @@
eog_image_data_ref (image);
if (!eog_image_has_data (image, EOG_IMAGE_DATA_ALL)) {
- eog_image_load (image,
+ eog_image_load (image,
EOG_IMAGE_DATA_ALL,
- NULL,
+ NULL,
&EOG_JOB (job)->error);
}
- handler_id = g_signal_connect (G_OBJECT (image),
+ handler_id = g_signal_connect (G_OBJECT (image),
"save-progress",
- G_CALLBACK (save_progress_handler),
+ G_CALLBACK (save_progress_handler),
job);
save_info = eog_image_save_info_from_image (image);
- success = eog_image_save_by_info (image,
- save_info,
+ success = eog_image_save_by_info (image,
+ save_info,
&EOG_JOB (job)->error);
if (save_info)
@@ -598,7 +598,7 @@
g_object_unref (job->converter);
job->converter = NULL;
}
-
+
if (job->file != NULL) {
g_object_unref (job->file);
job->file = NULL;
@@ -639,7 +639,7 @@
guint n_images;
g_assert (EOG_IS_JOB_SAVE_AS (job));
-
+
n_images = g_list_length (job->images);
saveas_job = EOG_JOB_SAVE_AS (job);
@@ -652,23 +652,23 @@
EogImage *image = EOG_IMAGE (it->data);
gboolean success = FALSE;
gulong handler_id = 0;
-
+
job->current_image = image;
eog_image_data_ref (image);
if (!eog_image_has_data (image, EOG_IMAGE_DATA_ALL)) {
- eog_image_load (image,
+ eog_image_load (image,
EOG_IMAGE_DATA_ALL,
- NULL,
+ NULL,
&EOG_JOB (job)->error);
}
g_assert (EOG_JOB (job)->error == NULL);
- handler_id = g_signal_connect (G_OBJECT (image),
+ handler_id = g_signal_connect (G_OBJECT (image),
"save-progress",
- G_CALLBACK (save_progress_handler),
+ G_CALLBACK (save_progress_handler),
job);
src_info = eog_image_save_info_from_image (image);
@@ -690,9 +690,9 @@
gboolean result;
result = eog_uri_converter_do (saveas_job->converter,
- image,
+ image,
&dest_file,
- &format,
+ &format,
NULL);
g_assert (result);
@@ -701,9 +701,9 @@
format);
}
- success = eog_image_save_as_by_info (image,
- src_info,
- dest_info,
+ success = eog_image_save_as_by_info (image,
+ src_info,
+ dest_info,
&EOG_JOB (job)->error);
if (src_info)
@@ -716,7 +716,7 @@
g_signal_handler_disconnect (G_OBJECT (image), handler_id);
eog_image_data_unref (image);
-
+
if (!success)
break;
}
Modified: trunk/src/eog-jobs.h
==============================================================================
--- trunk/src/eog-jobs.h (original)
+++ trunk/src/eog-jobs.h Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Jobs
+/* Eye Of Gnome - Jobs
*
* Copyright (C) 2006 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on evince code (shell/ev-jobs.h) by:
+ * Based on evince code (shell/ev-jobs.h) by:
* - Martin Kretzschmar <martink gnome org>
*
* This program is free software; you can redistribute it and/or modify
@@ -201,7 +201,7 @@
EogJobClass parent_class;
void (*run) (EogJobSave *job);
-
+
};
struct _EogJobSaveAs
@@ -243,7 +243,7 @@
/* EogJobLoad */
GType eog_job_load_get_type (void) G_GNUC_CONST;
EogJob *eog_job_load_new (EogImage *image);
-void eog_job_load_run (EogJobLoad *load);
+void eog_job_load_run (EogJobLoad *load);
/* EogJobModel */
GType eog_job_model_get_type (void) G_GNUC_CONST;
Modified: trunk/src/eog-list-store.c
==============================================================================
--- trunk/src/eog-list-store.c (original)
+++ trunk/src/eog-list-store.c Mon Oct 27 19:33:42 2008
@@ -46,18 +46,18 @@
eog_list_store_finalize (GObject *object)
{
EogListStore *store = EOG_LIST_STORE (object);
-
+
if (store->priv != NULL) {
g_free (store->priv);
store->priv = NULL;
}
-
+
G_OBJECT_CLASS (eog_list_store_parent_class)->finalize (object);
}
static void
foreach_monitors_free (gpointer data, gpointer user_data)
-{
+{
g_file_monitor_cancel (G_FILE_MONITOR (data));
}
@@ -66,7 +66,7 @@
{
EogListStore *store = EOG_LIST_STORE (object);
- g_list_foreach (store->priv->monitors,
+ g_list_foreach (store->priv->monitors,
foreach_monitors_free, NULL);
g_list_free (store->priv->monitors);
@@ -100,7 +100,7 @@
}
/*
- Sorting functions
+ Sorting functions
*/
static gint
@@ -113,15 +113,15 @@
EogImage *image_a, *image_b;
- gtk_tree_model_get (model, a,
+ gtk_tree_model_get (model, a,
EOG_LIST_STORE_EOG_IMAGE, &image_a,
-1);
- gtk_tree_model_get (model, b,
+ gtk_tree_model_get (model, b,
EOG_LIST_STORE_EOG_IMAGE, &image_b,
-1);
-
- r_value = strcasecmp (eog_image_get_collate_key (image_a),
+
+ r_value = strcasecmp (eog_image_get_collate_key (image_a),
eog_image_get_collate_key (image_b));
g_object_unref (G_OBJECT (image_a));
@@ -136,12 +136,12 @@
GError *error = NULL;
GtkIconTheme *icon_theme;
GdkPixbuf *pixbuf;
-
+
icon_theme = gtk_icon_theme_get_default ();
pixbuf = gtk_icon_theme_load_icon (icon_theme,
- icon_name,
- EOG_LIST_STORE_THUMB_SIZE,
+ icon_name,
+ EOG_LIST_STORE_THUMB_SIZE,
0,
&error);
@@ -179,9 +179,9 @@
gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (self),
eog_list_store_compare_func,
NULL, NULL);
-
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self),
- GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self),
+ GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
GTK_SORT_ASCENDING);
}
@@ -223,19 +223,19 @@
-1);
if (!image)
continue;
-
+
file = eog_image_get_file (image);
str = g_file_get_uri (file);
-
+
found = (strcmp (str, info_uri) == 0)? TRUE : FALSE;
-
+
g_object_unref (file);
g_free (str);
g_object_unref (G_OBJECT (image));
- } while (!found &&
+ } while (!found &&
gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter));
-
+
if (found && iter_found != NULL) {
*iter_found = iter;
}
@@ -250,7 +250,7 @@
{
gchar *uri_str;
gboolean result;
-
+
uri_str = g_file_get_uri (file);
result = is_file_in_list_store (store, uri_str, iter_found);
@@ -276,21 +276,21 @@
file = eog_image_get_file (job->image);
if (is_file_in_list_store_file (store, file, &iter)) {
- gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
+ gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
EOG_LIST_STORE_EOG_IMAGE, &image,
-1);
if (job->thumbnail) {
eog_image_set_thumbnail (image, job->thumbnail);
- /* Getting the thumbnail, in case it needed
+ /* Getting the thumbnail, in case it needed
* transformations */
thumbnail = eog_image_get_thumbnail (image);
} else {
thumbnail = g_object_ref (store->priv->missing_image);
}
- gtk_list_store_set (GTK_LIST_STORE (store), &iter,
+ gtk_list_store_set (GTK_LIST_STORE (store), &iter,
EOG_LIST_STORE_THUMBNAIL, thumbnail,
EOG_LIST_STORE_THUMB_SET, TRUE,
EOG_LIST_STORE_EOG_JOB, NULL,
@@ -308,7 +308,7 @@
GtkTreePath *path;
GtkTreeIter iter;
gint pos;
-
+
pos = eog_list_store_get_pos_by_image (store, image);
path = gtk_tree_path_new_from_indices (pos, -1);
@@ -357,21 +357,21 @@
g_signal_connect (image, "changed",
G_CALLBACK (on_image_changed),
store);
-
+
gtk_list_store_append (GTK_LIST_STORE (store), &iter);
- gtk_list_store_set (GTK_LIST_STORE (store), &iter,
- EOG_LIST_STORE_EOG_IMAGE, image,
+ gtk_list_store_set (GTK_LIST_STORE (store), &iter,
+ EOG_LIST_STORE_EOG_IMAGE, image,
EOG_LIST_STORE_THUMBNAIL, store->priv->busy_image,
EOG_LIST_STORE_THUMB_SET, FALSE,
-1);
}
-static void
-eog_list_store_append_image_from_file (EogListStore *store,
+static void
+eog_list_store_append_image_from_file (EogListStore *store,
GFile *file)
{
EogImage *image;
-
+
g_return_if_fail (EOG_IS_LIST_STORE (store));
image = eog_image_new_file (file);
@@ -391,7 +391,7 @@
GtkTreeIter iter;
switch (event) {
- case G_FILE_MONITOR_EVENT_CHANGED:
+ case G_FILE_MONITOR_EVENT_CHANGED:
file_info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
0, NULL, NULL);
@@ -399,7 +399,7 @@
break;
}
mimetype = g_file_info_get_content_type (file_info);
-
+
if (is_file_in_list_store_file (store, file, &iter)) {
if (eog_image_is_supported_mime_type (mimetype)) {
eog_list_store_thumbnail_refresh (store, &iter);
@@ -461,7 +461,7 @@
}
}
-/*
+/*
* Called for each file in a directory. Checks if the file is some
* sort of image. If so, it creates an image object and adds it to the
* list.
@@ -474,10 +474,10 @@
GFile *child;
gboolean load_uri = FALSE;
const char *mime_type, *name;
-
+
mime_type = g_file_info_get_content_type (children_info);
name = g_file_info_get_name (children_info);
-
+
if (!g_str_has_prefix (name, ".")) {
if (eog_image_is_supported_mime_type (mime_type)) {
load_uri = TRUE;
@@ -490,17 +490,17 @@
}
}
-static void
-eog_list_store_append_directory (EogListStore *store,
- GFile *file,
+static void
+eog_list_store_append_directory (EogListStore *store,
+ GFile *file,
GFileType file_type)
{
GFileMonitor *file_monitor;
GFileEnumerator *file_enumerator;
GFileInfo *file_info;
-
+
g_return_if_fail (file_type == G_FILE_TYPE_DIRECTORY);
-
+
file_monitor = g_file_monitor_directory (file,
0, NULL, NULL);
@@ -543,7 +543,7 @@
*
**/
void
-eog_list_store_add_files (EogListStore *store, GList *file_list)
+eog_list_store_add_files (EogListStore *store, GList *file_list)
{
GList *it;
GFileInfo *file_info;
@@ -558,10 +558,10 @@
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID,
GTK_SORT_ASCENDING);
-
+
for (it = file_list; it != NULL; it = it->next) {
GFile *file = (GFile *) it->data;
-
+
file_info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STANDARD_TYPE,
0, NULL, NULL);
@@ -570,10 +570,10 @@
}
file_type = g_file_info_get_file_type (file_info);
g_object_unref (file_info);
-
+
if (file_type == G_FILE_TYPE_DIRECTORY) {
eog_list_store_append_directory (store, file, file_type);
- } else if (file_type == G_FILE_TYPE_REGULAR &&
+ } else if (file_type == G_FILE_TYPE_REGULAR &&
g_list_length (file_list) == 1) {
initial_file = g_file_dup (file);
@@ -589,7 +589,7 @@
eog_list_store_append_directory (store, file, file_type);
if (!is_file_in_list_store_file (store,
- initial_file,
+ initial_file,
&iter)) {
eog_list_store_append_image_from_file (store, initial_file);
}
@@ -597,23 +597,23 @@
eog_list_store_append_image_from_file (store, initial_file);
}
g_object_unref (file);
- } else if (file_type == G_FILE_TYPE_REGULAR &&
+ } else if (file_type == G_FILE_TYPE_REGULAR &&
g_list_length (file_list) > 1) {
eog_list_store_append_image_from_file (store, file);
}
}
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
- GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+ GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
GTK_SORT_ASCENDING);
-
- if (initial_file &&
+
+ if (initial_file &&
is_file_in_list_store_file (store, initial_file, &iter)) {
store->priv->initial_image = eog_list_store_get_pos_by_iter (store, &iter);
g_object_unref (initial_file);
} else {
store->priv->initial_image = 0;
- }
+ }
}
/**
@@ -655,9 +655,9 @@
GList *it;
GtkListStore *store = eog_list_store_new ();
-
+
for (it = list; it != NULL; it = it->next) {
- eog_list_store_append_image (EOG_LIST_STORE (store),
+ eog_list_store_append_image (EOG_LIST_STORE (store),
EOG_IMAGE (it->data));
}
@@ -683,7 +683,7 @@
g_return_val_if_fail (EOG_IS_LIST_STORE (store), -1);
g_return_val_if_fail (EOG_IS_IMAGE (image), -1);
-
+
file = eog_image_get_file (image);
if (is_file_in_list_store_file (store, file, &iter)) {
@@ -714,7 +714,7 @@
g_return_val_if_fail (EOG_IS_LIST_STORE (store), NULL);
if (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter, NULL, pos)) {
- gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
+ gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
EOG_LIST_STORE_EOG_IMAGE, &image,
-1);
}
@@ -732,7 +732,7 @@
* Returns: The position of the image pointed by @iter.
**/
gint
-eog_list_store_get_pos_by_iter (EogListStore *store,
+eog_list_store_get_pos_by_iter (EogListStore *store,
GtkTreeIter *iter)
{
gint *indices;
@@ -782,12 +782,12 @@
}
static void
-eog_list_store_remove_thumbnail_job (EogListStore *store,
+eog_list_store_remove_thumbnail_job (EogListStore *store,
GtkTreeIter *iter)
{
EogJob *job;
- gtk_tree_model_get (GTK_TREE_MODEL (store), iter,
+ gtk_tree_model_get (GTK_TREE_MODEL (store), iter,
EOG_LIST_STORE_EOG_JOB, &job,
-1);
@@ -799,8 +799,8 @@
-1);
g_mutex_unlock (store->priv->mutex);
}
-
-
+
+
}
static void
@@ -808,8 +808,8 @@
{
EogImage *image;
EogJob *job;
-
- gtk_tree_model_get (GTK_TREE_MODEL (store), iter,
+
+ gtk_tree_model_get (GTK_TREE_MODEL (store), iter,
EOG_LIST_STORE_EOG_IMAGE, &image,
EOG_LIST_STORE_EOG_JOB, &job,
-1);
@@ -820,15 +820,15 @@
}
job = eog_job_thumbnail_new (image);
-
+
g_signal_connect (job,
"finished",
G_CALLBACK (eog_job_thumbnail_cb),
store);
-
+
g_mutex_lock (store->priv->mutex);
gtk_list_store_set (GTK_LIST_STORE (store), iter,
- EOG_LIST_STORE_EOG_JOB, job,
+ EOG_LIST_STORE_EOG_JOB, job,
-1);
eog_job_queue_add_job (job);
g_mutex_unlock (store->priv->mutex);
@@ -845,12 +845,12 @@
*
**/
void
-eog_list_store_thumbnail_set (EogListStore *store,
+eog_list_store_thumbnail_set (EogListStore *store,
GtkTreeIter *iter)
{
gboolean thumb_set = FALSE;
- gtk_tree_model_get (GTK_TREE_MODEL (store), iter,
+ gtk_tree_model_get (GTK_TREE_MODEL (store), iter,
EOG_LIST_STORE_THUMB_SET, &thumb_set,
-1);
@@ -871,14 +871,14 @@
*
**/
void
-eog_list_store_thumbnail_unset (EogListStore *store,
+eog_list_store_thumbnail_unset (EogListStore *store,
GtkTreeIter *iter)
{
EogImage *image;
eog_list_store_remove_thumbnail_job (store, iter);
-
- gtk_tree_model_get (GTK_TREE_MODEL (store), iter,
+
+ gtk_tree_model_get (GTK_TREE_MODEL (store), iter,
EOG_LIST_STORE_EOG_IMAGE, &image,
-1);
eog_image_set_thumbnail (image, NULL);
Modified: trunk/src/eog-list-store.h
==============================================================================
--- trunk/src/eog-list-store.h (original)
+++ trunk/src/eog-list-store.h Mon Oct 27 19:33:42 2008
@@ -77,32 +77,32 @@
GtkListStore *eog_list_store_new_from_glist (GList *list);
-void eog_list_store_append_image (EogListStore *store,
+void eog_list_store_append_image (EogListStore *store,
EogImage *image);
-void eog_list_store_add_files (EogListStore *store,
+void eog_list_store_add_files (EogListStore *store,
GList *file_list);
-void eog_list_store_remove_image (EogListStore *store,
+void eog_list_store_remove_image (EogListStore *store,
EogImage *image);
-gint eog_list_store_get_pos_by_image (EogListStore *store,
+gint eog_list_store_get_pos_by_image (EogListStore *store,
EogImage *image);
-EogImage *eog_list_store_get_image_by_pos (EogListStore *store,
+EogImage *eog_list_store_get_image_by_pos (EogListStore *store,
const gint pos);
-gint eog_list_store_get_pos_by_iter (EogListStore *store,
+gint eog_list_store_get_pos_by_iter (EogListStore *store,
GtkTreeIter *iter);
gint eog_list_store_length (EogListStore *store);
gint eog_list_store_get_initial_pos (EogListStore *store);
-void eog_list_store_thumbnail_set (EogListStore *store,
+void eog_list_store_thumbnail_set (EogListStore *store,
GtkTreeIter *iter);
-void eog_list_store_thumbnail_unset (EogListStore *store,
+void eog_list_store_thumbnail_unset (EogListStore *store,
GtkTreeIter *iter);
void eog_list_store_thumbnail_refresh (EogListStore *store,
Modified: trunk/src/eog-message-area.c
==============================================================================
--- trunk/src/eog-message-area.c (original)
+++ trunk/src/eog-message-area.c Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Message Area
+/* Eye Of Gnome - Message Area
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-message-area.h) by:
+ * Based on gedit code (gedit/gedit-message-area.h) by:
* - Paolo Maggi <paolo gnome org>
*
* This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -41,10 +41,10 @@
struct _EogMessageAreaPrivate
{
GtkWidget *main_hbox;
-
+
GtkWidget *contents;
GtkWidget *action_area;
-
+
gboolean changing_style;
};
@@ -94,13 +94,13 @@
{
GList *children, *tmp_list;
GtkWidget *child = NULL;
-
+
children = gtk_container_get_children (
GTK_CONTAINER (message_area->priv->action_area));
for (tmp_list = children; tmp_list; tmp_list = tmp_list->next) {
ResponseData *rd = get_response_data (tmp_list->data, FALSE);
-
+
if (rd && rd->response_id == response_id) {
child = tmp_list->data;
break;
@@ -119,8 +119,8 @@
return;
/* Emit response signal */
- eog_message_area_response (EOG_MESSAGE_AREA (message_area),
- GTK_RESPONSE_CANCEL);
+ eog_message_area_response (EOG_MESSAGE_AREA (message_area),
+ GTK_RESPONSE_CANCEL);
}
static void
@@ -136,7 +136,7 @@
GdkEventExpose *event,
gpointer user_data)
{
- gtk_paint_flat_box (widget->style,
+ gtk_paint_flat_box (widget->style,
widget->window,
GTK_STATE_NORMAL,
GTK_SHADOW_OUT,
@@ -147,8 +147,8 @@
widget->allocation.y + 1,
widget->allocation.width - 2,
widget->allocation.height - 2);
-
- return FALSE;
+
+ return FALSE;
}
static void
@@ -177,17 +177,17 @@
gtk_widget_queue_draw (GTK_WIDGET (message_area));
}
-static void
+static void
eog_message_area_class_init (EogMessageAreaClass *class)
{
GObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkBindingSet *binding_set;
-
+
object_class = G_OBJECT_CLASS (class);
widget_class = GTK_WIDGET_CLASS (class);
object_class->finalize = eog_message_area_finalize;
-
+
class->close = eog_message_area_close;
g_type_class_add_private (object_class, sizeof(EogMessageAreaPrivate));
@@ -199,7 +199,7 @@
* The #EogMessageArea::response signal is emitted when one of the
* activatable widgets packed into @message_area is activated.
*/
- signals[SIGNAL_RESPONSE] =
+ signals[SIGNAL_RESPONSE] =
g_signal_new ("response",
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
@@ -209,7 +209,7 @@
G_TYPE_NONE, 1,
G_TYPE_INT);
- signals[SIGNAL_CLOSE] =
+ signals[SIGNAL_CLOSE] =
g_signal_new ("close",
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
@@ -217,9 +217,9 @@
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
-
+
binding_set = gtk_binding_set_by_class (class);
-
+
gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "close", 0);
}
@@ -233,32 +233,32 @@
gtk_widget_show (message_area->priv->main_hbox);
/* FIXME: use style properties */
- gtk_container_set_border_width (GTK_CONTAINER (message_area->priv->main_hbox),
+ gtk_container_set_border_width (GTK_CONTAINER (message_area->priv->main_hbox),
8);
- /* FIXME: use style properties */
- message_area->priv->action_area = gtk_vbox_new (TRUE, 10);
+ /* FIXME: use style properties */
+ message_area->priv->action_area = gtk_vbox_new (TRUE, 10);
gtk_widget_show (message_area->priv->action_area);
- gtk_box_pack_end (GTK_BOX (message_area->priv->main_hbox),
+ gtk_box_pack_end (GTK_BOX (message_area->priv->main_hbox),
message_area->priv->action_area,
- FALSE,
- TRUE,
+ FALSE,
+ TRUE,
0);
- gtk_box_pack_start (GTK_BOX (message_area),
- message_area->priv->main_hbox,
- TRUE,
- TRUE,
+ gtk_box_pack_start (GTK_BOX (message_area),
+ message_area->priv->main_hbox,
+ TRUE,
+ TRUE,
0);
-
- /* CHECK: do we really need it? */
- gtk_widget_set_name (GTK_WIDGET (message_area), "gtk-tooltips");
-
+
+ /* CHECK: do we really need it? */
+ gtk_widget_set_name (GTK_WIDGET (message_area), "gtk-tooltips");
+
g_signal_connect (message_area,
"expose_event",
- G_CALLBACK (paint_message_area),
- NULL);
+ G_CALLBACK (paint_message_area),
+ NULL);
g_signal_connect (message_area,
"size-allocate",
G_CALLBACK (size_allocate),
@@ -292,7 +292,7 @@
action_widget_activated (GtkWidget *widget, EogMessageArea *message_area)
{
gint response_id;
-
+
response_id = get_response_for_widget (message_area, widget);
eog_message_area_response (message_area, response_id);
@@ -314,7 +314,7 @@
{
ResponseData *ad;
guint signal_id;
-
+
g_return_if_fail (EOG_IS_MESSAGE_AREA (message_area));
g_return_if_fail (GTK_IS_WIDGET (child));
@@ -375,11 +375,11 @@
message_area->priv->contents = contents;
- gtk_box_pack_start (GTK_BOX (message_area->priv->main_hbox),
- message_area->priv->contents,
- TRUE,
- TRUE,
- 0);
+ gtk_box_pack_start (GTK_BOX (message_area->priv->main_hbox),
+ message_area->priv->contents,
+ TRUE,
+ TRUE,
+ 0);
}
/**
@@ -398,16 +398,16 @@
gint response_id)
{
GtkWidget *button;
-
+
g_return_val_if_fail (EOG_IS_MESSAGE_AREA (message_area), NULL);
g_return_val_if_fail (button_text != NULL, NULL);
button = gtk_button_new_from_stock (button_text);
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-
+
gtk_widget_show (button);
-
+
eog_message_area_add_action_widget (message_area,
button,
response_id);
@@ -424,22 +424,22 @@
gint response_id;
g_return_if_fail (EOG_IS_MESSAGE_AREA (message_area));
-
+
if (first_button_text == NULL)
return;
-
+
text = first_button_text;
response_id = va_arg (args, gint);
while (text != NULL) {
- eog_message_area_add_button (message_area,
+ eog_message_area_add_button (message_area,
text,
response_id);
text = va_arg (args, gchar*);
if (text == NULL) break;
-
+
response_id = va_arg (args, int);
}
}
@@ -456,7 +456,7 @@
eog_message_area_add_buttons (EogMessageArea *message_area,
const gchar *first_button_text,
...)
-{
+{
va_list args;
va_start (args, first_button_text);
@@ -464,10 +464,10 @@
add_buttons_valist (message_area,
first_button_text,
args);
-
+
va_end (args);
}
-
+
GtkWidget *
eog_message_area_new (void)
{
@@ -489,7 +489,7 @@
{
EogMessageArea *message_area;
va_list args;
-
+
message_area = EOG_MESSAGE_AREA (eog_message_area_new ());
va_start (args, first_button_text);
@@ -497,7 +497,7 @@
add_buttons_valist (message_area,
first_button_text,
args);
-
+
va_end (args);
return GTK_WIDGET (message_area);
@@ -567,7 +567,7 @@
if (rd && rd->response_id == response_id)
gtk_widget_grab_default (widget);
-
+
tmp_list = g_list_next (tmp_list);
}
@@ -606,13 +606,13 @@
* Returns: the newly added #GtkButton.
**/
GtkWidget *
-eog_message_area_add_stock_button_with_text (EogMessageArea *message_area,
+eog_message_area_add_stock_button_with_text (EogMessageArea *message_area,
const gchar *text,
const gchar *stock_id,
gint response_id)
{
GtkWidget *button;
-
+
g_return_val_if_fail (EOG_IS_MESSAGE_AREA (message_area), NULL);
g_return_val_if_fail (text != NULL, NULL);
g_return_val_if_fail (stock_id != NULL, NULL);
@@ -624,9 +624,9 @@
GTK_ICON_SIZE_BUTTON));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-
+
gtk_widget_show (button);
-
+
eog_message_area_add_action_widget (message_area,
button,
response_id);
Modified: trunk/src/eog-message-area.h
==============================================================================
--- trunk/src/eog-message-area.h (original)
+++ trunk/src/eog-message-area.h Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Message Area
+/* Eye Of Gnome - Message Area
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-message-area.h) by:
+ * Based on gedit code (gedit/gedit-message-area.h) by:
* - Paolo Maggi <paolo gnome org>
*
* This program is free software; you can redistribute it and/or modify
@@ -49,7 +49,7 @@
struct _EogMessageAreaClass {
GtkHBoxClass parent_class;
- void (* response) (EogMessageArea *message_area,
+ void (* response) (EogMessageArea *message_area,
gint response_id);
void (* close) (EogMessageArea *message_area);
@@ -64,30 +64,30 @@
void eog_message_area_set_contents (EogMessageArea *message_area,
GtkWidget *contents);
-
+
void eog_message_area_add_action_widget (EogMessageArea *message_area,
GtkWidget *child,
gint response_id);
-
+
GtkWidget *eog_message_area_add_button (EogMessageArea *message_area,
const gchar *button_text,
gint response_id);
-
-GtkWidget *eog_message_area_add_stock_button_with_text
- (EogMessageArea *message_area,
- const gchar *text,
- const gchar *stock_id,
+
+GtkWidget *eog_message_area_add_stock_button_with_text
+ (EogMessageArea *message_area,
+ const gchar *text,
+ const gchar *stock_id,
gint response_id);
void eog_message_area_add_buttons (EogMessageArea *message_area,
const gchar *first_button_text,
...);
-void eog_message_area_set_response_sensitive
+void eog_message_area_set_response_sensitive
(EogMessageArea *message_area,
gint response_id,
gboolean setting);
-void eog_message_area_set_default_response
+void eog_message_area_set_default_response
(EogMessageArea *message_area,
gint response_id);
Modified: trunk/src/eog-metadata-reader-jpg.c
==============================================================================
--- trunk/src/eog-metadata-reader-jpg.c (original)
+++ trunk/src/eog-metadata-reader-jpg.c Mon Oct 27 19:33:42 2008
@@ -69,20 +69,20 @@
/* data fields */
gpointer exif_chunk;
guint exif_len;
-
+
gpointer iptc_chunk;
guint iptc_len;
-
+
gpointer icc_chunk;
guint icc_len;
gpointer xmp_chunk;
guint xmp_len;
-
+
/* management fields */
int size;
int last_marker;
- int bytes_read;
+ int bytes_read;
};
#define EOG_METADATA_READER_JPG_GET_PRIVATE(object) \
@@ -102,7 +102,7 @@
eog_metadata_reader_jpg_dispose (GObject *object)
{
EogMetadataReaderJpg *emr = EOG_METADATA_READER_JPG (object);
-
+
if (emr->priv->exif_chunk != NULL) {
g_free (emr->priv->exif_chunk);
emr->priv->exif_chunk = NULL;
@@ -140,7 +140,7 @@
priv->icc_len = 0;
}
-static void
+static void
eog_metadata_reader_jpg_class_init (EogMetadataReaderJpgClass *klass)
{
GObjectClass *object_class = (GObjectClass*) klass;
@@ -214,7 +214,7 @@
g_return_if_fail (EOG_IS_METADATA_READER_JPG (emr));
priv = emr->priv;
-
+
if (priv->state == EMR_FINISHED) return;
for (i = 0; (i < len) && (priv->state != EMR_FINISHED); i++) {
@@ -244,31 +244,31 @@
priv->state = EMR_READ;
}
break;
-
+
case EMR_READ_SIZE_HIGH_BYTE:
priv->size = (buf [i] & 0xff) << 8;
priv->state = EMR_READ_SIZE_LOW_BYTE;
- break;
-
+ break;
+
case EMR_READ_SIZE_LOW_BYTE:
- priv->size |= (buf [i] & 0xff);
-
+ priv->size |= (buf [i] & 0xff);
+
if (priv->size > 2) /* ignore the two size-bytes */
priv->size -= 2;
-
+
if (priv->size == 0) {
priv->state = EMR_READ;
- } else if (priv->last_marker == EOG_JPEG_MARKER_APP1 &&
- ((priv->exif_chunk == NULL) || (priv->xmp_chunk == NULL)))
+ } else if (priv->last_marker == EOG_JPEG_MARKER_APP1 &&
+ ((priv->exif_chunk == NULL) || (priv->xmp_chunk == NULL)))
{
priv->state = EMR_READ_APP1;
- } else if (priv->last_marker == EOG_JPEG_MARKER_APP2 &&
+ } else if (priv->last_marker == EOG_JPEG_MARKER_APP2 &&
priv->icc_chunk == NULL && priv->size > 14)
{
/* Chunk has 14 bytes identification data */
priv->state = EMR_READ_ICC;
- } else if (priv->last_marker == EOG_JPEG_MARKER_APP14 &&
- priv->iptc_chunk == NULL)
+ } else if (priv->last_marker == EOG_JPEG_MARKER_APP14 &&
+ priv->iptc_chunk == NULL)
{
priv->state = EMR_READ_IPTC;
} else {
@@ -276,16 +276,16 @@
}
priv->last_marker = 0;
- break;
-
+ break;
+
case EMR_SKIP_BYTES:
eog_debug_message (DEBUG_IMAGE_DATA, "Skip bytes: %i", priv->size);
- if (i + priv->size < len) {
+ if (i + priv->size < len) {
i = i + priv->size - 1; /* the for-loop consumes the other byte */
priv->size = 0;
}
- else {
+ else {
priv->size = (i + priv->size) - len;
i = len - 1;
}
@@ -293,15 +293,15 @@
priv->state = EMR_READ;
}
break;
-
- case EMR_READ_APP1:
+
+ case EMR_READ_APP1:
eog_debug_message (DEBUG_IMAGE_DATA, "Read APP1 data, Length: %i", priv->size);
app1_type = eog_metadata_identify_app1 ((gchar*) &buf[i], priv->size);
-
+
switch (app1_type) {
case EJA_EXIF:
- if (priv->exif_chunk == NULL) {
+ if (priv->exif_chunk == NULL) {
priv->exif_chunk = g_new0 (guchar, priv->size);
priv->exif_len = priv->size;
priv->bytes_read = 0;
@@ -310,7 +310,7 @@
}
break;
case EJA_XMP:
- if (priv->xmp_chunk == NULL) {
+ if (priv->xmp_chunk == NULL) {
priv->xmp_chunk = g_new0 (guchar, priv->size);
priv->xmp_len = priv->size;
priv->bytes_read = 0;
@@ -336,8 +336,8 @@
if (IS_FINISHED(priv))
priv->state = EMR_FINISHED;
break;
-
- case EMR_READ_EXIF:
+
+ case EMR_READ_EXIF:
eog_debug_message (DEBUG_IMAGE_DATA, "Read continuation of EXIF data, length: %i", priv->size);
{
eog_metadata_reader_get_next_block (priv, priv->exif_chunk,
@@ -346,7 +346,7 @@
if (IS_FINISHED(priv))
priv->state = EMR_FINISHED;
break;
-
+
case EMR_READ_XMP:
eog_debug_message (DEBUG_IMAGE_DATA, "Read continuation of XMP data, length: %i", priv->size);
{
@@ -356,13 +356,13 @@
if (IS_FINISHED (priv))
priv->state = EMR_FINISHED;
break;
-
- case EMR_READ_ICC:
+
+ case EMR_READ_ICC:
eog_debug_message (DEBUG_IMAGE_DATA,
"Read continuation of ICC data, "
"length: %i", priv->size);
- if (priv->icc_chunk == NULL) {
+ if (priv->icc_chunk == NULL) {
priv->icc_chunk = g_new0 (guchar, priv->size);
priv->icc_len = priv->size;
priv->bytes_read = 0;
@@ -378,7 +378,7 @@
const char* icc_chunk = priv->icc_chunk;
gboolean valid = TRUE;
- /* Chunk should begin with the
+ /* Chunk should begin with the
* ICC_PROFILE\0 identifier */
valid &= strncmp (icc_chunk,
"ICC_PROFILE\0",12) == 0;
@@ -386,7 +386,7 @@
* ICC chunk in the file as we don't
* support merging chunks yet. */
valid &= *(guint16*)(icc_chunk+12) == 0x101;
-
+
if (!valid) {
/* This no ICC data. Throw it away. */
eog_debug_message (DEBUG_IMAGE_DATA,
@@ -401,13 +401,13 @@
if (IS_FINISHED(priv))
priv->state = EMR_FINISHED;
break;
-
+
case EMR_READ_IPTC:
eog_debug_message (DEBUG_IMAGE_DATA,
"Read continuation of IPTC data, "
"length: %i", priv->size);
- if (priv->iptc_chunk == NULL) {
+ if (priv->iptc_chunk == NULL) {
priv->iptc_chunk = g_new0 (guchar, priv->size);
priv->iptc_len = priv->size;
priv->bytes_read = 0;
@@ -417,7 +417,7 @@
priv->iptc_chunk,
&i, buf, len,
EMR_READ_IPTC);
-
+
if (IS_FINISHED(priv))
priv->state = EMR_FINISHED;
break;
@@ -429,19 +429,19 @@
}
/* Returns the raw exif data. NOTE: The caller of this function becomes
- * the new owner of this piece of memory and is responsible for freeing it!
+ * the new owner of this piece of memory and is responsible for freeing it!
*/
static void
eog_metadata_reader_jpg_get_exif_chunk (EogMetadataReaderJpg *emr, guchar **data, guint *len)
{
EogMetadataReaderJpgPrivate *priv;
-
+
g_return_if_fail (EOG_IS_METADATA_READER (emr));
priv = emr->priv;
-
+
*data = (guchar*) priv->exif_chunk;
*len = priv->exif_len;
-
+
priv->exif_chunk = NULL;
priv->exif_len = 0;
}
@@ -452,14 +452,14 @@
{
EogMetadataReaderJpgPrivate *priv;
ExifData *data = NULL;
-
+
g_return_val_if_fail (EOG_IS_METADATA_READER (emr), NULL);
priv = emr->priv;
-
+
if (priv->exif_chunk != NULL) {
data = exif_data_new_from_data (priv->exif_chunk, priv->exif_len);
}
-
+
return data;
}
#endif
@@ -470,7 +470,7 @@
/* skip the signature */
#define EOG_XMP_OFFSET (29)
-static gpointer
+static gpointer
eog_metadata_reader_jpg_get_xmp_data (EogMetadataReaderJpg *emr )
{
EogMetadataReaderJpgPrivate *priv;
@@ -500,12 +500,12 @@
{
EogMetadataReaderJpgPrivate *priv;
cmsHPROFILE profile = NULL;
-
+
g_return_val_if_fail (EOG_IS_METADATA_READER (emr), NULL);
priv = emr->priv;
- if (priv->icc_chunk) {
+ if (priv->icc_chunk) {
cmsErrorAction (LCMS_ERROR_SHOW);
profile = cmsOpenProfileFromMem(priv->icc_chunk + 14, priv->icc_len - 14);
@@ -551,7 +551,7 @@
//profile = cmsCreate_Adobe1998Profile ();
break;
- case 0xFFFF:
+ case 0xFFFF:
{
cmsCIExyY whitepoint;
cmsCIExyYTRIPLE primaries;
@@ -560,7 +560,7 @@
ExifRational r;
const int offset = exif_format_get_size (EXIF_FORMAT_RATIONAL);
-
+
entry = exif_data_get_entry (exif, EXIF_TAG_WHITE_POINT);
if (entry && entry->components == 2) {
@@ -574,7 +574,7 @@
eog_debug_message (DEBUG_LCMS, "No whitepoint found");
break;
}
-
+
entry = exif_data_get_entry (exif, EXIF_TAG_PRIMARY_CHROMATICITIES);
if (entry && entry->components == 6) {
@@ -589,13 +589,13 @@
r = exif_get_rational (entry->data + 3 * offset, o);
primaries.Green.y = (double) r.numerator / r.denominator;
-
+
r = exif_get_rational (entry->data + 4 * offset, o);
primaries.Blue.x = (double) r.numerator / r.denominator;
r = exif_get_rational (entry->data + 5 * offset, o);
- primaries.Blue.y = (double) r.numerator / r.denominator;
-
+ primaries.Blue.y = (double) r.numerator / r.denominator;
+
primaries.Red.Y = primaries.Green.Y = primaries.Blue.Y = 1.0;
} else {
eog_debug_message (DEBUG_LCMS, "No primary chromaticities found");
@@ -611,9 +611,9 @@
eog_debug_message (DEBUG_LCMS, "No gamma found");
gammaValue = 2.2;
}
-
+
gamma[0] = gamma[1] = gamma[2] = cmsBuildGamma (256, gammaValue);
-
+
profile = cmsCreateRGBProfile (&whitepoint, &primaries, gamma);
cmsFreeGamma(gamma[0]);
@@ -638,22 +638,22 @@
iface = (EogMetadataReaderInterface*)g_iface;
- iface->consume =
+ iface->consume =
(void (*) (EogMetadataReader *self, const guchar *buf, guint len))
eog_metadata_reader_jpg_consume;
- iface->finished =
+ iface->finished =
(gboolean (*) (EogMetadataReader *self))
eog_metadata_reader_jpg_finished;
- iface->get_raw_exif =
+ iface->get_raw_exif =
(void (*) (EogMetadataReader *self, guchar **data, guint *len))
eog_metadata_reader_jpg_get_exif_chunk;
#ifdef HAVE_EXIF
- iface->get_exif_data =
- (gpointer (*) (EogMetadataReader *self))
+ iface->get_exif_data =
+ (gpointer (*) (EogMetadataReader *self))
eog_metadata_reader_jpg_get_exif_data;
#endif
#ifdef HAVE_LCMS
- iface->get_icc_profile =
+ iface->get_icc_profile =
(gpointer (*) (EogMetadataReader *self))
eog_metadata_reader_jpg_get_icc_profile;
#endif
Modified: trunk/src/eog-metadata-reader-png.c
==============================================================================
--- trunk/src/eog-metadata-reader-png.c (original)
+++ trunk/src/eog-metadata-reader-png.c Mon Oct 27 19:33:42 2008
@@ -73,7 +73,7 @@
gpointer gAMA_chunk;
guint32 gAMA_len;
-
+
/* management fields */
gsize size;
gsize bytes_read;
@@ -102,7 +102,7 @@
{
EogMetadataReaderPng *emr = EOG_METADATA_READER_PNG (object);
EogMetadataReaderPngPrivate *priv = emr->priv;
-
+
g_free (priv->xmp_chunk);
priv->xmp_chunk = NULL;
@@ -137,13 +137,13 @@
priv->cHRM_len = 0;
priv->gAMA_chunk = NULL;
priv->gAMA_len = 0;
-
+
priv->sub_step = 0;
priv->state = EMR_READ_MAGIC;
priv->hasIHDR = FALSE;
}
-static void
+static void
eog_metadata_reader_png_class_init (EogMetadataReaderPngClass *klass)
{
GObjectClass *object_class = (GObjectClass*) klass;
@@ -198,7 +198,7 @@
g_return_if_fail (EOG_IS_METADATA_READER_PNG (emr));
priv = emr->priv;
-
+
if (priv->state == EMR_FINISHED) return;
for (i = 0; (i < len) && (priv->state != EMR_FINISHED); i++) {
@@ -229,7 +229,7 @@
/* Read the high byte of the size's low word */
priv->size |= (buf [i] & 0xff) << 8;
priv->state = EMR_READ_SIZE_LOW_LOW_BYTE;
- break;
+ break;
case EMR_READ_SIZE_LOW_LOW_BYTE:
/* Read the high byte of the size's low word */
priv->size |= (buf [i] & 0xff);
@@ -261,7 +261,7 @@
if (G_UNLIKELY (!priv->hasIHDR)) {
/* IHDR should be the first chunk in a PNG */
- if (priv->size == 13
+ if (priv->size == 13
&& memcmp (priv->chunk_name, "IHDR", 4) == 0){
priv->hasIHDR = TRUE;
} else {
@@ -305,12 +305,12 @@
"Skip bytes: %" G_GSIZE_FORMAT,
priv->size);
- if (i + priv->size < len) {
+ if (i + priv->size < len) {
i = i + priv->size - 1; /* the for-loop consumes the other byte */
priv->size = 0;
priv->state = EMR_READ_SIZE_HIGH_HIGH_BYTE;
}
- else {
+ else {
priv->size = (i + priv->size) - len;
i = len - 1;
}
@@ -325,7 +325,7 @@
if (priv->sub_step++ != 3)
break;
- /* ...generate the chunks CRC32, merge it with the
+ /* ...generate the chunks CRC32, merge it with the
* chunk name's CRC32 value... */
chunk_crc = crc32 (0L, Z_NULL, 0);
chunk_crc = crc32 (chunk_crc, *priv->crc_chunk, *priv->crc_len);
@@ -353,7 +353,7 @@
"Read XMP Chunk - size: %"
G_GSIZE_FORMAT, priv->size);
- if (priv->xmp_chunk == NULL) {
+ if (priv->xmp_chunk == NULL) {
priv->xmp_chunk = g_new0 (guchar, priv->size);
priv->xmp_len = priv->size;
priv->crc_len = &priv->xmp_len;
@@ -379,13 +379,13 @@
}
break;
case EMR_READ_ICCP:
- /* Extract an iCCP chunk containing a
+ /* Extract an iCCP chunk containing a
* deflated ICC profile. */
eog_debug_message (DEBUG_IMAGE_DATA,
"Read ICC Chunk - size: %"
G_GSIZE_FORMAT, priv->size);
- if (priv->icc_chunk == NULL) {
+ if (priv->icc_chunk == NULL) {
priv->icc_chunk = g_new0 (guchar, priv->size);
priv->icc_len = priv->size;
priv->crc_len = &priv->icc_len;
@@ -405,7 +405,7 @@
eog_debug_message (DEBUG_IMAGE_DATA,
"Read sRGB Chunk - value: %u", *(buf+i));
- if (priv->sRGB_chunk == NULL) {
+ if (priv->sRGB_chunk == NULL) {
priv->sRGB_chunk = g_new0 (guchar, priv->size);
priv->sRGB_len = priv->size;
priv->crc_len = &priv->sRGB_len;
@@ -426,7 +426,7 @@
"Read cHRM Chunk - size: %"
G_GSIZE_FORMAT, priv->size);
- if (priv->cHRM_chunk == NULL) {
+ if (priv->cHRM_chunk == NULL) {
priv->cHRM_chunk = g_new0 (guchar, priv->size);
priv->cHRM_len = priv->size;
priv->crc_len = &priv->cHRM_len;
@@ -441,13 +441,13 @@
EMR_READ_ICCP);
break;
case EMR_READ_GAMA:
- /* Extract the gAMA chunk containing the
+ /* Extract the gAMA chunk containing the
* image's gamma value */
eog_debug_message (DEBUG_IMAGE_DATA,
"Read gAMA-Chunk - size: %"
G_GSIZE_FORMAT, priv->size);
- if (priv->gAMA_chunk == NULL) {
+ if (priv->gAMA_chunk == NULL) {
priv->gAMA_chunk = g_new0 (guchar, priv->size);
priv->gAMA_len = priv->size;
priv->crc_len = &priv->gAMA_len;
@@ -472,7 +472,7 @@
/* skip the chunk ID */
#define EOG_XMP_OFFSET (22)
-static gpointer
+static gpointer
eog_metadata_reader_png_get_xmp_data (EogMetadataReaderPng *emr )
{
EogMetadataReaderPngPrivate *priv;
@@ -496,7 +496,7 @@
#define EXTRACT_DOUBLE_UINT_BLOCK_OFFSET(chunk,offset,divider) \
(double)(GUINT32_FROM_BE(*((guint32*)((chunk)+((offset)*4))))/(double)(divider))
-/* This is the amount of memory the inflate output buffer gets increased by
+/* This is the amount of memory the inflate output buffer gets increased by
* while decompressing the ICC profile */
#define EOG_ICC_INFLATE_BUFFER_STEP 1024
@@ -509,7 +509,7 @@
{
EogMetadataReaderPngPrivate *priv;
cmsHPROFILE profile = NULL;
-
+
g_return_val_if_fail (EOG_IS_METADATA_READER_PNG (emr), NULL);
priv = emr->priv;
@@ -587,7 +587,7 @@
eog_debug_message (DEBUG_LCMS, "PNG is sRGB");
/* If the file has an sRGB chunk the image data is in the sRGB
* colorspace. lcms has a built-in sRGB profile. */
-
+
profile = cmsCreate_sRGBProfile ();
}
@@ -597,9 +597,9 @@
LPGAMMATABLE gamma[3];
double gammaValue = 2.2; // 2.2 should be a sane default gamma
- /* This uglyness extracts the chromacity and whitepoint values
- * from a PNG's cHRM chunk. These can be accurate up to the
- * 5th decimal point.
+ /* This uglyness extracts the chromacity and whitepoint values
+ * from a PNG's cHRM chunk. These can be accurate up to the
+ * 5th decimal point.
* They are saved as integer values multiplied by 100000. */
eog_debug_message (DEBUG_LCMS, "Trying to calculate color profile");
@@ -616,7 +616,7 @@
primaries.Red.Y = primaries.Green.Y = primaries.Blue.Y = 1.0;
- /* If the gAMA_chunk is present use its value which is saved
+ /* If the gAMA_chunk is present use its value which is saved
* the same way as the whitepoint. Use 2.2 as default value if
* the chunk is not present. */
if (priv->gAMA_chunk)
@@ -640,14 +640,14 @@
iface = (EogMetadataReaderInterface*) g_iface;
- iface->consume =
+ iface->consume =
(void (*) (EogMetadataReader *self, const guchar *buf, guint len))
eog_metadata_reader_png_consume;
- iface->finished =
+ iface->finished =
(gboolean (*) (EogMetadataReader *self))
eog_metadata_reader_png_finished;
#ifdef HAVE_LCMS
- iface->get_icc_profile =
+ iface->get_icc_profile =
(cmsHPROFILE (*) (EogMetadataReader *self))
eog_metadata_reader_png_get_icc_profile;
#endif
Modified: trunk/src/eog-metadata-reader.c
==============================================================================
--- trunk/src/eog-metadata-reader.c (original)
+++ trunk/src/eog-metadata-reader.c Mon Oct 27 19:33:42 2008
@@ -48,7 +48,7 @@
eog_metadata_reader_new (EogMetadataFileType type)
{
EogMetadataReader *emr;
-
+
switch (type) {
case EOG_METADATA_JPEG:
emr = EOG_METADATA_READER (g_object_new (EOG_TYPE_METADATA_READER_JPG, NULL));
@@ -80,7 +80,7 @@
}
/* Returns the raw exif data. NOTE: The caller of this function becomes
- * the new owner of this piece of memory and is responsible for freeing it!
+ * the new owner of this piece of memory and is responsible for freeing it!
*/
void
eog_metadata_reader_get_exif_chunk (EogMetadataReader *emr, guchar **data, guint *len)
@@ -89,7 +89,7 @@
g_return_if_fail (data != NULL && len != NULL);
iface = EOG_METADATA_READER_GET_INTERFACE (emr);
-
+
if (iface->get_raw_exif) {
iface->get_raw_exif (emr, data, len);
} else {
@@ -112,7 +112,7 @@
if (iface->get_exif_data)
exif_data = iface->get_exif_data (emr);
-
+
return exif_data;
}
#endif
@@ -125,7 +125,7 @@
EogMetadataReaderInterface *iface;
iface = EOG_METADATA_READER_GET_INTERFACE (emr);
-
+
if (iface->get_xmp_ptr)
xmp_data = iface->get_xmp_ptr (emr);
@@ -144,7 +144,7 @@
if (iface->get_icc_profile)
profile = iface->get_icc_profile (emr);
-
+
return profile;
}
#endif
Modified: trunk/src/eog-metadata-reader.h
==============================================================================
--- trunk/src/eog-metadata-reader.h (original)
+++ trunk/src/eog-metadata-reader.h Mon Oct 27 19:33:42 2008
@@ -25,7 +25,7 @@
#include <glib-object.h>
#if HAVE_EXIF
#include <libexif/exif-data.h>
-#endif
+#endif
#if HAVE_EXEMPI
#include <exempi/xmp.h>
#endif
Modified: trunk/src/eog-module.c
==============================================================================
--- trunk/src/eog-module.c (original)
+++ trunk/src/eog-module.c Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - EOG Module
+/* Eye Of Gnome - EOG Module
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-module.c) by:
+ * Based on gedit code (gedit/gedit-module.c) by:
* - Paolo Maggi <paolo gnome org>
* - Marco Pesenti Gritti <marco gnome org>
* - Christian Persch <chpe gnome org>
@@ -57,7 +57,7 @@
}
/* Extract symbols from the lib */
- if (!g_module_symbol (module->library,
+ if (!g_module_symbol (module->library,
"register_eog_plugin",
(void *) ®ister_func)) {
g_warning ("%s", g_module_error());
Modified: trunk/src/eog-module.h
==============================================================================
--- trunk/src/eog-module.h (original)
+++ trunk/src/eog-module.h Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Main Window
+/* Eye Of Gnome - Main Window
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-module.c) by:
+ * Based on gedit code (gedit/gedit-module.c) by:
* - Paolo Maggi <paolo gnome org>
* - Marco Pesenti Gritti <marco gnome org>
* - Christian Persch <chpe gnome org>
Modified: trunk/src/eog-pixbuf-cell-renderer.c
==============================================================================
--- trunk/src/eog-pixbuf-cell-renderer.c (original)
+++ trunk/src/eog-pixbuf-cell-renderer.c Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Pixbuf Cellrenderer
+/* Eye Of Gnome - Pixbuf Cellrenderer
*
* Copyright (C) 2007 The GNOME Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gnome-control-center code (capplets/appearance/wp-cellrenderer.c) by:
+ * Based on gnome-control-center code (capplets/appearance/wp-cellrenderer.c) by:
* - Denis Washington <denisw svn gnome org>
* - Jens Granseuer <jensgr gmx net>
*
@@ -45,7 +45,7 @@
eog_pixbuf_cell_renderer_class_init (EogPixbufCellRendererClass *klass)
{
GtkCellRendererClass *renderer_class;
-
+
renderer_class = (GtkCellRendererClass *) klass;
renderer_class->render = eog_pixbuf_cell_renderer_render;
}
@@ -80,10 +80,10 @@
y = background_area->y;
w = background_area->width;
h = background_area->height;
-
+
/* Sometimes width is -1 - not sure what to do here */
if (w == -1) return;
-
+
if ((flags & GTK_CELL_RENDERER_SELECTED) != 0) {
if (GTK_WIDGET_HAS_FOCUS (widget))
state = GTK_STATE_SELECTED;
@@ -95,16 +95,16 @@
/* draw the selection indicator */
cr = gdk_cairo_create (GDK_DRAWABLE (window));
gdk_cairo_set_source_color (cr, &widget->style->base[state]);
-
+
cairo_arc (cr, x + radius, y + radius, radius, M_PI, M_PI * 1.5);
cairo_arc (cr, x + w - radius, y + radius, radius, M_PI * 1.5, 0);
cairo_arc (cr, x + w - radius, y + h - radius, radius, 0, M_PI * 0.5);
cairo_arc (cr, x + radius, y + h - radius, radius, M_PI * 0.5, M_PI);
cairo_close_path (cr);
-
+
/* FIXME: this should not be hardcoded to 4 */
cairo_rectangle (cr, x + 4, y + 4, w - 8, h - 8);
-
+
/*cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);*/
cairo_fill (cr);
cairo_destroy (cr);
Modified: trunk/src/eog-pixbuf-cell-renderer.h
==============================================================================
--- trunk/src/eog-pixbuf-cell-renderer.h (original)
+++ trunk/src/eog-pixbuf-cell-renderer.h Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Pixbuf Cellrenderer
+/* Eye Of Gnome - Pixbuf Cellrenderer
*
* Copyright (C) 2007 The GNOME Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gnome-control-center code (capplets/appearance/wp-cellrenderer.c) by:
+ * Based on gnome-control-center code (capplets/appearance/wp-cellrenderer.c) by:
* - Denis Washington <denisw svn gnome org>
*
* This program is free software; you can redistribute it and/or modify
Modified: trunk/src/eog-pixbuf-util.c
==============================================================================
--- trunk/src/eog-pixbuf-util.c (original)
+++ trunk/src/eog-pixbuf-util.c Mon Oct 27 19:33:42 2008
@@ -13,7 +13,7 @@
GSList *it;
list = gdk_pixbuf_get_formats ();
-
+
for (it = list; it != NULL; it = it->next) {
GdkPixbufFormat *format;
@@ -29,7 +29,7 @@
return write_list;
}
-GdkPixbufFormat*
+GdkPixbufFormat*
eog_pixbuf_get_format_by_suffix (const char *suffix)
{
GSList *list;
@@ -39,14 +39,14 @@
g_return_val_if_fail (suffix != NULL, NULL);
list = gdk_pixbuf_get_formats ();
-
+
for (it = list; (it != NULL) && (result == NULL); it = it->next) {
GdkPixbufFormat *format;
gchar **extensions;
int i;
format = (GdkPixbufFormat*) it->data;
-
+
extensions = gdk_pixbuf_format_get_extensions (format);
for (i = 0; extensions[i] != NULL; i++) {
/* g_print ("check extension: %s against %s\n", extensions[i], suffix); */
@@ -61,7 +61,7 @@
g_slist_free (list);
- return result;
+ return result;
}
char*
@@ -90,23 +90,23 @@
}
g_strfreev (extensions);
-
+
return result;
}
-static char*
+static char*
get_suffix_from_basename (const char *basename)
{
char *suffix;
char *suffix_start;
guint len;
-
+
/* FIXME: does this work for all locales? */
- suffix_start = g_utf8_strrchr (basename, -1, '.');
-
- if (suffix_start == NULL)
+ suffix_start = g_utf8_strrchr (basename, -1, '.');
+
+ if (suffix_start == NULL)
return NULL;
-
+
len = strlen (suffix_start) - 1;
suffix = g_strndup (suffix_start+1, len);
@@ -120,17 +120,17 @@
GdkPixbufFormat *format;
char *path, *basename, *suffix;
g_return_val_if_fail (file != NULL, NULL);
-
+
path = g_file_get_path (file);
basename = g_path_get_basename (path);
suffix = get_suffix_from_basename (basename);
-
+
format = eog_pixbuf_get_format_by_suffix (suffix);
-
+
g_free (path);
g_free (basename);
g_free (suffix);
-
+
return format;
}
Modified: trunk/src/eog-plugin-engine.c
==============================================================================
--- trunk/src/eog-plugin-engine.c (original)
+++ trunk/src/eog-plugin-engine.c Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - EOG Plugin Manager
+/* Eye Of Gnome - EOG Plugin Manager
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-module.c) by:
+ * Based on gedit code (gedit/gedit-module.c) by:
* - Paolo Maggi <paolo gnome org>
*
* This program is free software; you can redistribute it and/or modify
@@ -58,7 +58,7 @@
struct _EogPluginInfo
{
gchar *file;
-
+
gchar *location;
EogPluginLoader loader;
GTypeModule *module;
@@ -69,11 +69,11 @@
gchar **authors;
gchar *copyright;
gchar *website;
-
+
EogPlugin *plugin;
-
+
gint active : 1;
-
+
/* A plugin is unavailable if it is not possible to activate it
due to an error loading the plugin module (e.g. for Python plugins
when the interpreter has not been correctly initializated) */
@@ -81,8 +81,8 @@
};
static void eog_plugin_engine_active_plugins_changed (GConfClient *client,
- guint cnxn_id,
- GConfEntry *entry,
+ guint cnxn_id,
+ GConfEntry *entry,
gpointer user_data);
static GList *eog_plugins_list = NULL;
@@ -143,7 +143,7 @@
goto error;
}
-
+
/* Check IAge=2 */
if (g_key_file_get_integer (plugin_file,
"Eog Plugin",
@@ -154,7 +154,7 @@
goto error;
}
-
+
/* Get Location */
str = g_key_file_get_string (plugin_file,
"Eog Plugin",
@@ -168,7 +168,7 @@
goto error;
}
-
+
/* Get the loader for this plugin */
str = g_key_file_get_string (plugin_file,
"Eog Plugin",
@@ -261,11 +261,11 @@
}
g_key_file_free (plugin_file);
-
+
/* If we know nothing about the availability of the plugin,
set it as available */
info->available = TRUE;
-
+
return info;
error:
@@ -295,9 +295,9 @@
if (!g_file_test (dir, G_FILE_TEST_IS_DIR)) {
return;
}
-
+
g_return_if_fail (eog_plugin_engine_gconf_client != NULL);
-
+
eog_debug_message (DEBUG_PLUGINS, "DIR: %s", dir);
d = g_dir_open (dir, 0, &error);
@@ -313,7 +313,7 @@
if (g_str_has_suffix (dirent, PLUGIN_EXT)) {
gchar *plugin_file;
EogPluginInfo *info;
-
+
plugin_file = g_build_filename (dir, dirent, NULL);
info = eog_plugin_engine_load (plugin_file);
g_free (plugin_file);
@@ -373,9 +373,9 @@
eog_plugin_engine_init (void)
{
eog_debug (DEBUG_PLUGINS);
-
+
g_return_val_if_fail (eog_plugins_list == NULL, FALSE);
-
+
if (!g_module_supported ()) {
g_warning ("eog is not able to initialize the plugins engine.");
@@ -472,10 +472,10 @@
g_return_val_if_fail (info->location != NULL, FALSE);
g_return_val_if_fail (info->plugin == NULL, FALSE);
g_return_val_if_fail (info->available, FALSE);
-
+
switch (info->loader) {
case EOG_PLUGIN_LOADER_C:
- dirname = g_path_get_dirname (info->file);
+ dirname = g_path_get_dirname (info->file);
g_return_val_if_fail (dirname != NULL, FALSE);
path = g_module_build_path (dirname, info->location);
@@ -483,22 +483,22 @@
g_free (dirname);
g_return_val_if_fail (path != NULL, FALSE);
-
+
info->module = G_TYPE_MODULE (eog_module_new (path));
g_free (path);
-
+
break;
#ifdef ENABLE_PYTHON
case EOG_PLUGIN_LOADER_PY:
{
gchar *dir;
-
+
if (!eog_python_init ()) {
/* Mark plugin as unavailable and fails */
info->available = FALSE;
-
+
g_warning ("Cannot load Python plugin '%s' since eog "
"was not able to initialize the Python interpreter.",
info->name);
@@ -507,7 +507,7 @@
}
dir = g_path_get_dirname (info->file);
-
+
g_return_val_if_fail ((info->location != NULL) &&
(info->location[0] != '\0'),
FALSE);
@@ -528,20 +528,20 @@
switch (info->loader) {
case EOG_PLUGIN_LOADER_C:
g_warning ("Cannot load plugin '%s' since file '%s' cannot be read.",
- info->name,
+ info->name,
eog_module_get_path (EOG_MODULE (info->module)));
break;
case EOG_PLUGIN_LOADER_PY:
g_warning ("Cannot load Python plugin '%s' since file '%s' cannot be read.",
- info->name,
+ info->name,
info->location);
break;
default:
g_return_val_if_reached (FALSE);
}
-
+
g_object_unref (G_OBJECT (info->module));
info->module = NULL;
@@ -551,16 +551,16 @@
return FALSE;
}
-
+
switch (info->loader) {
case EOG_PLUGIN_LOADER_C:
- info->plugin =
+ info->plugin =
EOG_PLUGIN (eog_module_new_object (EOG_MODULE (info->module)));
break;
#ifdef ENABLE_PYTHON
case EOG_PLUGIN_LOADER_PY:
- info->plugin =
+ info->plugin =
EOG_PLUGIN (eog_python_module_new_object (EOG_PYTHON_MODULE (info->module)));
break;
#endif
@@ -568,7 +568,7 @@
default:
g_return_val_if_reached (FALSE);
}
-
+
g_type_module_unuse (info->module);
eog_debug_message (DEBUG_PLUGINS, "End");
@@ -576,7 +576,7 @@
return TRUE;
}
-static gboolean
+static gboolean
eog_plugin_engine_activate_plugin_real (EogPluginInfo *info)
{
gboolean res = TRUE;
@@ -605,7 +605,7 @@
return res;
}
-gboolean
+gboolean
eog_plugin_engine_activate_plugin (EogPluginInfo *info)
{
eog_debug (DEBUG_PLUGINS);
@@ -614,14 +614,14 @@
if (!info->available)
return FALSE;
-
+
if (info->active)
return TRUE;
if (eog_plugin_engine_activate_plugin_real (info)) {
gboolean res;
GSList *list;
-
+
/* Update plugin state */
info->active = TRUE;
@@ -636,11 +636,11 @@
list = g_slist_next (list);
}
-
- active_plugins = g_slist_insert_sorted (active_plugins,
- g_strdup (info->location),
+
+ active_plugins = g_slist_insert_sorted (active_plugins,
+ g_strdup (info->location),
(GCompareFunc)strcmp);
-
+
res = gconf_client_set_list (eog_plugin_engine_gconf_client,
EOG_CONF_PLUGINS_ACTIVE_PLUGINS,
GCONF_VALUE_STRING,
@@ -660,7 +660,7 @@
eog_plugin_engine_deactivate_plugin_real (EogPluginInfo *info)
{
const GList *wins = eog_application_get_windows (EOG_APP);
-
+
while (wins != NULL) {
eog_plugin_deactivate (info->plugin,
EOG_WINDOW (wins->data));
@@ -674,7 +674,7 @@
{
gboolean res;
GSList *list;
-
+
eog_debug (DEBUG_PLUGINS);
g_return_val_if_fail (info != NULL, FALSE);
@@ -723,7 +723,7 @@
eog_plugin_engine_plugin_is_active (EogPluginInfo *info)
{
g_return_val_if_fail (info != NULL, FALSE);
-
+
return (info->available && info->active);
}
@@ -731,7 +731,7 @@
eog_plugin_engine_plugin_is_available (EogPluginInfo *info)
{
g_return_val_if_fail (info != NULL, FALSE);
-
+
return (info->available != FALSE);
}
@@ -744,25 +744,25 @@
for (pl = eog_plugins_list; pl; pl = pl->next) {
gboolean res = TRUE;
-
+
EogPluginInfo *info = (EogPluginInfo*)pl->data;
/* If plugin is not available, don't try to activate/load it */
- if (info->available && info->active) {
+ if (info->available && info->active) {
if (info->plugin == NULL)
res = load_plugin_module (info);
-
+
if (res)
eog_plugin_activate (info->plugin,
- window);
+ window);
}
}
-
+
eog_debug_message (DEBUG_PLUGINS, "End");
}
void
-eog_plugin_engine_update_plugins_ui (EogWindow *window,
+eog_plugin_engine_update_plugins_ui (EogWindow *window,
gboolean new_window)
{
GList *pl;
@@ -782,7 +782,7 @@
continue;
eog_debug_message (DEBUG_PLUGINS, "Updating UI of %s", info->name);
-
+
eog_plugin_update_ui (info->plugin, window);
}
}
@@ -795,18 +795,18 @@
if ((info->plugin == NULL) || !info->active || !info->available)
return FALSE;
-
+
return eog_plugin_is_configurable (info->plugin);
}
-void
-eog_plugin_engine_configure_plugin (EogPluginInfo *info,
+void
+eog_plugin_engine_configure_plugin (EogPluginInfo *info,
GtkWindow *parent)
{
GtkWidget *conf_dlg;
-
+
GtkWindowGroup *wg;
-
+
eog_debug (DEBUG_PLUGINS);
g_return_if_fail (info != NULL);
@@ -824,16 +824,16 @@
wg = gtk_window_group_new ();
gtk_window_group_add_window (wg, parent);
}
-
+
gtk_window_group_add_window (wg,
GTK_WINDOW (conf_dlg));
-
+
gtk_window_set_modal (GTK_WINDOW (conf_dlg), TRUE);
gtk_widget_show (conf_dlg);
}
-static void
+static void
eog_plugin_engine_active_plugins_changed (GConfClient *client,
guint cnxn_id,
GConfEntry *entry,
@@ -846,13 +846,13 @@
g_return_if_fail (entry->key != NULL);
g_return_if_fail (entry->value != NULL);
-
- if (!((entry->value->type == GCONF_VALUE_LIST) &&
+
+ if (!((entry->value->type == GCONF_VALUE_LIST) &&
(gconf_value_get_list_type (entry->value) == GCONF_VALUE_STRING))) {
g_warning ("The gconf key '%s' may be corrupted.", EOG_CONF_PLUGINS_ACTIVE_PLUGINS);
return;
}
-
+
active_plugins = gconf_client_get_list (eog_plugin_engine_gconf_client,
EOG_CONF_PLUGINS_ACTIVE_PLUGINS,
GCONF_VALUE_STRING,
@@ -875,7 +875,7 @@
info->active = TRUE;
} else {
if (info->active && !to_activate) {
- eog_plugin_engine_deactivate_plugin_real (info);
+ eog_plugin_engine_deactivate_plugin_real (info);
/* Update plugin state */
info->active = FALSE;
@@ -888,7 +888,7 @@
eog_plugin_engine_get_plugin_name (EogPluginInfo *info)
{
g_return_val_if_fail (info != NULL, NULL);
-
+
return info->name;
}
@@ -904,10 +904,10 @@
eog_plugin_engine_get_plugin_icon_name (EogPluginInfo *info)
{
g_return_val_if_fail (info != NULL, NULL);
-
+
/* Use the eog-plugin icon as a default if the plugin does not
have its own */
- if (info->icon_name != NULL &&
+ if (info->icon_name != NULL &&
gtk_icon_theme_has_icon (gtk_icon_theme_get_default (),
info->icon_name))
return info->icon_name;
@@ -919,7 +919,7 @@
eog_plugin_engine_get_plugin_authors (EogPluginInfo *info)
{
g_return_val_if_fail (info != NULL, (const gchar **)NULL);
-
+
return (const gchar **) info->authors;
}
@@ -927,7 +927,7 @@
eog_plugin_engine_get_plugin_website (EogPluginInfo *info)
{
g_return_val_if_fail (info != NULL, NULL);
-
+
return info->website;
}
@@ -935,6 +935,6 @@
eog_plugin_engine_get_plugin_copyright (EogPluginInfo *info)
{
g_return_val_if_fail (info != NULL, NULL);
-
+
return info->copyright;
}
Modified: trunk/src/eog-plugin-engine.h
==============================================================================
--- trunk/src/eog-plugin-engine.h (original)
+++ trunk/src/eog-plugin-engine.h Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - EOG Plugin Engine
+/* Eye Of Gnome - EOG Plugin Engine
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-plugins-engine.h) by:
+ * Based on gedit code (gedit/gedit-plugins-engine.h) by:
* - Paolo Maggi <paolo gnome org>
*
* This program is free software; you can redistribute it and/or modify
@@ -47,13 +47,13 @@
gboolean eog_plugin_engine_plugin_is_available (EogPluginInfo *info);
-gboolean eog_plugin_engine_plugin_is_configurable
+gboolean eog_plugin_engine_plugin_is_configurable
(EogPluginInfo *info);
-void eog_plugin_engine_configure_plugin (EogPluginInfo *info,
+void eog_plugin_engine_configure_plugin (EogPluginInfo *info,
GtkWindow *parent);
-void eog_plugin_engine_update_plugins_ui (EogWindow *window,
+void eog_plugin_engine_update_plugins_ui (EogWindow *window,
gboolean new_window);
const gchar *eog_plugin_engine_get_plugin_name (EogPluginInfo *info);
Modified: trunk/src/eog-plugin-manager.c
==============================================================================
--- trunk/src/eog-plugin-manager.c (original)
+++ trunk/src/eog-plugin-manager.c Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - EOG Plugin Manager
+/* Eye Of Gnome - EOG Plugin Manager
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-module.c) by:
+ * Based on gedit code (gedit/gedit-module.c) by:
* - Paolo Maggi <paolo gnome org>
*
* This program is free software; you can redistribute it and/or modify
@@ -60,15 +60,15 @@
const GList *plugins;
GtkWidget *about;
-
+
GtkWidget *popup_menu;
};
-static EogPluginInfo *plugin_manager_get_selected_plugin (EogPluginManager *pm);
-static void plugin_manager_toggle_active (GtkTreeIter *iter, GtkTreeModel *model);
+static EogPluginInfo *plugin_manager_get_selected_plugin (EogPluginManager *pm);
+static void plugin_manager_toggle_active (GtkTreeIter *iter, GtkTreeModel *model);
static void eog_plugin_manager_finalize (GObject *object);
-static void
+static void
eog_plugin_manager_class_init (EogPluginManagerClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -135,7 +135,7 @@
g_return_if_fail (info != NULL);
- eog_debug_message (DEBUG_PLUGINS, "Configuring: %s\n",
+ eog_debug_message (DEBUG_PLUGINS, "Configuring: %s\n",
eog_plugin_engine_get_plugin_name (info));
toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET(pm)));
@@ -154,7 +154,7 @@
{
EogPluginInfo *info;
gchar *text;
-
+
g_return_if_fail (tree_model != NULL);
g_return_if_fail (tree_column != NULL);
@@ -183,7 +183,7 @@
gpointer data)
{
EogPluginInfo *info;
-
+
g_return_if_fail (tree_model != NULL);
g_return_if_fail (tree_column != NULL);
@@ -239,7 +239,7 @@
info != NULL);
gtk_widget_set_sensitive (GTK_WIDGET (pm->priv->configure_button),
- (info != NULL) &&
+ (info != NULL) &&
eog_plugin_engine_plugin_is_configurable (info));
}
@@ -300,7 +300,7 @@
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (pm->priv->tree));
g_return_if_fail (selection != NULL);
-
+
gtk_tree_selection_select_iter (selection, &iter);
gtk_tree_model_get (GTK_TREE_MODEL (model), &iter,
@@ -318,7 +318,7 @@
{
EogPluginInfo *info;
gboolean res = TRUE;
-
+
eog_debug (DEBUG_PLUGINS);
gtk_tree_model_get (model, iter, INFO_COLUMN, &info, -1);
@@ -328,24 +328,24 @@
if (active) {
/* Activate the plugin */
if (!eog_plugin_engine_activate_plugin (info)) {
- eog_debug_message (DEBUG_PLUGINS, "Could not activate %s.\n",
+ eog_debug_message (DEBUG_PLUGINS, "Could not activate %s.\n",
eog_plugin_engine_get_plugin_name (info));
-
+
res = FALSE;
}
} else {
/* Deactivate the plugin */
if (!eog_plugin_engine_deactivate_plugin (info)) {
- eog_debug_message (DEBUG_PLUGINS, "Could not deactivate %s.\n",
+ eog_debug_message (DEBUG_PLUGINS, "Could not deactivate %s.\n",
eog_plugin_engine_get_plugin_name (info));
res = FALSE;
}
}
-
+
/* Set new value */
- gtk_list_store_set (GTK_LIST_STORE (model),
- iter,
+ gtk_list_store_set (GTK_LIST_STORE (model),
+ iter,
ACTIVE_COLUMN, eog_plugin_engine_plugin_is_active (info),
AVAILABLE_COLUMN, eog_plugin_engine_plugin_is_available (info),
-1);
@@ -358,7 +358,7 @@
GtkTreeModel *model)
{
gboolean active;
-
+
eog_debug (DEBUG_PLUGINS);
gtk_tree_model_get (model, iter, ACTIVE_COLUMN, &active, -1);
@@ -409,7 +409,7 @@
gtk_tree_model_get_iter_first (model, &iter);
do {
- plugin_manager_set_active (&iter, model, active);
+ plugin_manager_set_active (&iter, model, active);
} while (gtk_tree_model_iter_next (model, &iter));
}
@@ -522,7 +522,7 @@
item = gtk_check_menu_item_new_with_mnemonic (_("A_ctivate"));
gtk_widget_set_sensitive (item,
- eog_plugin_engine_plugin_is_available (info));
+ eog_plugin_engine_plugin_is_available (info));
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
eog_plugin_engine_plugin_is_active (info));
g_signal_connect (item, "toggled",
@@ -543,7 +543,7 @@
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show_all (menu);
-
+
return menu;
}
@@ -603,18 +603,18 @@
GdkRectangle rect;
gdk_window_get_origin (GTK_WIDGET (tree)->window, x, y);
-
+
path = gtk_tree_model_get_path (model, &iter);
- gtk_tree_view_get_cell_area (tree,
+ gtk_tree_view_get_cell_area (tree,
path,
gtk_tree_view_get_column (tree, 0), /* FIXME 0 for RTL ? */
&rect);
gtk_tree_path_free (path);
-
+
*x += rect.x;
*y += rect.y + rect.height;
-
+
if (gtk_widget_get_direction (GTK_WIDGET (tree)) == GTK_TEXT_DIR_RTL) {
GtkRequisition requisition;
@@ -640,7 +640,7 @@
pm->priv->popup_menu = create_tree_popup_menu (pm);
if (pm->priv->popup_menu == NULL)
- return;
+ return;
gtk_menu_attach_to_widget (GTK_MENU (pm->priv->popup_menu),
GTK_WIDGET (pm),
@@ -701,14 +701,14 @@
return TRUE;
}
-static gint
+static gint
model_name_sort_func (GtkTreeModel *model,
GtkTreeIter *iter1,
GtkTreeIter *iter2,
gpointer user_data)
{
EogPluginInfo *info1, *info2;
-
+
gtk_tree_model_get (model, iter1, INFO_COLUMN, &info1, -1);
gtk_tree_model_get (model, iter2, INFO_COLUMN, &info2, -1);
@@ -725,9 +725,9 @@
eog_debug (DEBUG_PLUGINS);
- model = gtk_list_store_new (N_COLUMNS,
- G_TYPE_BOOLEAN,
- G_TYPE_BOOLEAN,
+ model = gtk_list_store_new (N_COLUMNS,
+ G_TYPE_BOOLEAN,
+ G_TYPE_BOOLEAN,
G_TYPE_POINTER);
gtk_tree_view_set_model (GTK_TREE_VIEW (pm->priv->tree),
@@ -764,14 +764,14 @@
gtk_tree_view_column_set_cell_data_func (column, cell,
plugin_manager_view_icon_cell_cb,
pm, NULL);
-
+
cell = gtk_cell_renderer_text_new ();
gtk_tree_view_column_pack_start (column, cell, TRUE);
g_object_set (cell, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gtk_tree_view_column_set_cell_data_func (column, cell,
plugin_manager_view_info_cell_cb,
pm, NULL);
-
+
gtk_tree_view_column_set_spacing (column, 6);
gtk_tree_view_append_column (GTK_TREE_VIEW (pm->priv->tree), column);
@@ -815,7 +815,7 @@
gtk_widget_show (pm->priv->tree);
}
-static void
+static void
eog_plugin_manager_init (EogPluginManager *pm)
{
GtkWidget *label;
@@ -833,14 +833,14 @@
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-
+
gtk_box_pack_start (GTK_BOX (pm), label, FALSE, TRUE, 0);
-
+
viewport = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (viewport),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (viewport),
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (viewport),
GTK_SHADOW_IN);
gtk_box_pack_start (GTK_BOX (pm), viewport, TRUE, TRUE, 0);
Modified: trunk/src/eog-plugin-manager.h
==============================================================================
--- trunk/src/eog-plugin-manager.h (original)
+++ trunk/src/eog-plugin-manager.h Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - EOG Plugin Manager
+/* Eye Of Gnome - EOG Plugin Manager
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-module.c) by:
+ * Based on gedit code (gedit/gedit-module.c) by:
* - Paolo Maggi <paolo gnome org>
*
* This program is free software; you can redistribute it and/or modify
Modified: trunk/src/eog-plugin.c
==============================================================================
--- trunk/src/eog-plugin.c (original)
+++ trunk/src/eog-plugin.c Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - EOG Plugin
+/* Eye Of Gnome - EOG Plugin
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-module.c) by:
+ * Based on gedit code (gedit/gedit-module.c) by:
* - Paolo Maggi <paolo gnome org>
*
* This program is free software; you can redistribute it and/or modify
@@ -48,13 +48,13 @@
create_configure_dialog);
}
-static void
+static void
eog_plugin_class_init (EogPluginClass *klass)
{
klass->activate = dummy;
klass->deactivate = dummy;
klass->update_ui = dummy;
-
+
klass->create_configure_dialog = create_configure_dialog;
klass->is_configurable = is_configurable;
}
@@ -81,7 +81,7 @@
EOG_PLUGIN_GET_CLASS (plugin)->deactivate (plugin, window);
}
-
+
void
eog_plugin_update_ui (EogPlugin *plugin, EogWindow *window)
{
@@ -103,6 +103,6 @@
eog_plugin_create_configure_dialog (EogPlugin *plugin)
{
g_return_val_if_fail (EOG_IS_PLUGIN (plugin), NULL);
-
+
return EOG_PLUGIN_GET_CLASS (plugin)->create_configure_dialog (plugin);
}
Modified: trunk/src/eog-plugin.h
==============================================================================
--- trunk/src/eog-plugin.h (original)
+++ trunk/src/eog-plugin.h Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - EOG Plugin
+/* Eye Of Gnome - EOG Plugin
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-module.c) by:
+ * Based on gedit code (gedit/gedit-module.c) by:
* - Paolo Maggi <paolo gnome org>
*
* This program is free software; you can redistribute it and/or modify
@@ -63,7 +63,7 @@
GtkWidget *(*create_configure_dialog)
(EogPlugin *plugin);
- /* Plugins should not override this, it's handled automatically
+ /* Plugins should not override this, it's handled automatically
* by the EogPluginClass */
gboolean (*is_configurable)
(EogPlugin *plugin);
Modified: trunk/src/eog-preferences-dialog.c
==============================================================================
--- trunk/src/eog-preferences-dialog.c (original)
+++ trunk/src/eog-preferences-dialog.c Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - EOG Preferences Dialog
+/* Eye Of Gnome - EOG Preferences Dialog
*
* Copyright (C) 2006 The Free Software Foundation
*
@@ -108,7 +108,7 @@
key = g_object_get_data (G_OBJECT (button), GCONF_OBJECT_KEY);
- if (key == NULL || value == NULL)
+ if (key == NULL || value == NULL)
return;
gconf_client_set_string (GCONF_CLIENT (data),
@@ -123,14 +123,14 @@
{
char *key = NULL;
char *value = NULL;
-
- if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+
+ if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
return;
key = g_object_get_data (G_OBJECT (widget), GCONF_OBJECT_KEY);
value = g_object_get_data (G_OBJECT (widget), GCONF_OBJECT_VALUE);
- if (key == NULL || value == NULL)
+ if (key == NULL || value == NULL)
return;
gconf_client_set_string (GCONF_CLIENT (data),
@@ -213,8 +213,8 @@
eog_dialog_construct (EOG_DIALOG (object),
"eog-preferences-dialog.ui",
"eog_preferences_dialog");
-
- eog_dialog_get_controls (EOG_DIALOG (object),
+
+ eog_dialog_get_controls (EOG_DIALOG (object),
"eog_preferences_dialog", &dlg,
"interpolate_check", &interpolate_check,
"autorotate_check", &autorotate_check,
@@ -228,80 +228,80 @@
"plugin_manager_container", &plugin_manager_container,
NULL);
- g_signal_connect (G_OBJECT (dlg),
+ g_signal_connect (G_OBJECT (dlg),
"response",
- G_CALLBACK (eog_preferences_response_cb),
+ G_CALLBACK (eog_preferences_response_cb),
dlg);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (interpolate_check),
- gconf_client_get_bool (priv->client,
- EOG_CONF_VIEW_INTERPOLATE,
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (interpolate_check),
+ gconf_client_get_bool (priv->client,
+ EOG_CONF_VIEW_INTERPOLATE,
NULL));
- g_object_set_data (G_OBJECT (interpolate_check),
- GCONF_OBJECT_KEY,
+ g_object_set_data (G_OBJECT (interpolate_check),
+ GCONF_OBJECT_KEY,
EOG_CONF_VIEW_INTERPOLATE);
- g_signal_connect (G_OBJECT (interpolate_check),
- "toggled",
- G_CALLBACK (pd_check_toggle_cb),
+ g_signal_connect (G_OBJECT (interpolate_check),
+ "toggled",
+ G_CALLBACK (pd_check_toggle_cb),
priv->client);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autorotate_check),
- gconf_client_get_bool (priv->client,
- EOG_CONF_VIEW_AUTOROTATE,
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autorotate_check),
+ gconf_client_get_bool (priv->client,
+ EOG_CONF_VIEW_AUTOROTATE,
NULL));
- g_object_set_data (G_OBJECT (autorotate_check),
- GCONF_OBJECT_KEY,
+ g_object_set_data (G_OBJECT (autorotate_check),
+ GCONF_OBJECT_KEY,
EOG_CONF_VIEW_AUTOROTATE);
- g_signal_connect (G_OBJECT (autorotate_check),
- "toggled",
- G_CALLBACK (pd_check_toggle_cb),
+ g_signal_connect (G_OBJECT (autorotate_check),
+ "toggled",
+ G_CALLBACK (pd_check_toggle_cb),
priv->client);
- g_object_set_data (G_OBJECT (color_radio),
- GCONF_OBJECT_KEY,
+ g_object_set_data (G_OBJECT (color_radio),
+ GCONF_OBJECT_KEY,
EOG_CONF_VIEW_TRANSPARENCY);
- g_object_set_data (G_OBJECT (color_radio),
- GCONF_OBJECT_VALUE,
+ g_object_set_data (G_OBJECT (color_radio),
+ GCONF_OBJECT_VALUE,
"COLOR");
- g_signal_connect (G_OBJECT (color_radio),
- "toggled",
- G_CALLBACK (pd_radio_toggle_cb),
+ g_signal_connect (G_OBJECT (color_radio),
+ "toggled",
+ G_CALLBACK (pd_radio_toggle_cb),
priv->client);
- g_object_set_data (G_OBJECT (checkpattern_radio),
- GCONF_OBJECT_KEY,
+ g_object_set_data (G_OBJECT (checkpattern_radio),
+ GCONF_OBJECT_KEY,
EOG_CONF_VIEW_TRANSPARENCY);
- g_object_set_data (G_OBJECT (checkpattern_radio),
- GCONF_OBJECT_VALUE,
+ g_object_set_data (G_OBJECT (checkpattern_radio),
+ GCONF_OBJECT_VALUE,
"CHECK_PATTERN");
- g_signal_connect (G_OBJECT (checkpattern_radio),
- "toggled",
- G_CALLBACK (pd_radio_toggle_cb),
+ g_signal_connect (G_OBJECT (checkpattern_radio),
+ "toggled",
+ G_CALLBACK (pd_radio_toggle_cb),
priv->client);
- g_object_set_data (G_OBJECT (background_radio),
- GCONF_OBJECT_KEY,
+ g_object_set_data (G_OBJECT (background_radio),
+ GCONF_OBJECT_KEY,
EOG_CONF_VIEW_TRANSPARENCY);
- g_object_set_data (G_OBJECT (background_radio),
- GCONF_OBJECT_VALUE,
+ g_object_set_data (G_OBJECT (background_radio),
+ GCONF_OBJECT_VALUE,
"NONE");
- g_signal_connect (G_OBJECT (background_radio),
- "toggled",
- G_CALLBACK (pd_radio_toggle_cb),
+ g_signal_connect (G_OBJECT (background_radio),
+ "toggled",
+ G_CALLBACK (pd_radio_toggle_cb),
priv->client);
- value = gconf_client_get_string (priv->client,
- EOG_CONF_VIEW_TRANSPARENCY,
+ value = gconf_client_get_string (priv->client,
+ EOG_CONF_VIEW_TRANSPARENCY,
NULL);
if (g_ascii_strcasecmp (value, "COLOR") == 0) {
@@ -316,8 +316,8 @@
g_free (value);
- value = gconf_client_get_string (priv->client,
- EOG_CONF_VIEW_TRANS_COLOR,
+ value = gconf_client_get_string (priv->client,
+ EOG_CONF_VIEW_TRANS_COLOR,
NULL);
if (gdk_color_parse (value, &color)) {
@@ -325,8 +325,8 @@
&color);
}
- g_object_set_data (G_OBJECT (color_button),
- GCONF_OBJECT_KEY,
+ g_object_set_data (G_OBJECT (color_button),
+ GCONF_OBJECT_KEY,
EOG_CONF_VIEW_TRANS_COLOR);
g_signal_connect (G_OBJECT (color_button),
@@ -336,46 +336,46 @@
g_free (value);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (upscale_check),
- gconf_client_get_bool (priv->client,
- EOG_CONF_FULLSCREEN_UPSCALE,
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (upscale_check),
+ gconf_client_get_bool (priv->client,
+ EOG_CONF_FULLSCREEN_UPSCALE,
NULL));
- g_object_set_data (G_OBJECT (upscale_check),
- GCONF_OBJECT_KEY,
+ g_object_set_data (G_OBJECT (upscale_check),
+ GCONF_OBJECT_KEY,
EOG_CONF_FULLSCREEN_UPSCALE);
- g_signal_connect (G_OBJECT (upscale_check),
- "toggled",
- G_CALLBACK (pd_check_toggle_cb),
+ g_signal_connect (G_OBJECT (upscale_check),
+ "toggled",
+ G_CALLBACK (pd_check_toggle_cb),
priv->client);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (loop_check),
- gconf_client_get_bool (priv->client,
- EOG_CONF_FULLSCREEN_LOOP,
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (loop_check),
+ gconf_client_get_bool (priv->client,
+ EOG_CONF_FULLSCREEN_LOOP,
NULL));
- g_object_set_data (G_OBJECT (loop_check),
- GCONF_OBJECT_KEY,
+ g_object_set_data (G_OBJECT (loop_check),
+ GCONF_OBJECT_KEY,
EOG_CONF_FULLSCREEN_LOOP);
- g_signal_connect (G_OBJECT (loop_check),
- "toggled",
- G_CALLBACK (pd_check_toggle_cb),
+ g_signal_connect (G_OBJECT (loop_check),
+ "toggled",
+ G_CALLBACK (pd_check_toggle_cb),
priv->client);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (seconds_spin),
- gconf_client_get_int (priv->client,
- EOG_CONF_FULLSCREEN_SECONDS,
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (seconds_spin),
+ gconf_client_get_int (priv->client,
+ EOG_CONF_FULLSCREEN_SECONDS,
NULL));
- g_object_set_data (G_OBJECT (seconds_spin),
- GCONF_OBJECT_KEY,
+ g_object_set_data (G_OBJECT (seconds_spin),
+ GCONF_OBJECT_KEY,
EOG_CONF_FULLSCREEN_SECONDS);
- g_signal_connect (G_OBJECT (seconds_spin),
- "value-changed",
- G_CALLBACK (pd_spin_button_changed_cb),
+ g_signal_connect (G_OBJECT (seconds_spin),
+ "value-changed",
+ G_CALLBACK (pd_spin_button_changed_cb),
priv->client);
plugin_manager = eog_plugin_manager_new ();
@@ -390,7 +390,7 @@
gtk_widget_show_all (plugin_manager);
- return object;
+ return object;
}
static void
@@ -408,10 +408,10 @@
"GConf Client",
"GConf Client",
GCONF_TYPE_CLIENT,
- G_PARAM_READWRITE |
- G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_NAME |
+ G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB));
g_type_class_add_private (g_object_class, sizeof (EogPreferencesDialogPrivate));
@@ -429,7 +429,7 @@
eog_preferences_dialog_get_instance (GtkWindow *parent, GConfClient *client)
{
if (instance == NULL) {
- instance = g_object_new (EOG_TYPE_PREFERENCES_DIALOG,
+ instance = g_object_new (EOG_TYPE_PREFERENCES_DIALOG,
"parent-window", parent,
"gconf-client", client,
NULL);
Modified: trunk/src/eog-preferences-dialog.h
==============================================================================
--- trunk/src/eog-preferences-dialog.h (original)
+++ trunk/src/eog-preferences-dialog.h Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - EOG Preferences Dialog
+/* Eye Of Gnome - EOG Preferences Dialog
*
* Copyright (C) 2006 The Free Software Foundation
*
Modified: trunk/src/eog-print-image-setup.c
==============================================================================
--- trunk/src/eog-print-image-setup.c (original)
+++ trunk/src/eog-print-image-setup.c Mon Oct 27 19:33:42 2008
@@ -40,7 +40,7 @@
* SECTION:
* @Title: Printing Custom Widget
* @Short_Description: a custom widget to setup image prints.
- * @Stability_Level:
+ * @Stability_Level:
* @See_Also: #EogPrintPreview
*
* This widget is to be used as the custom widget in a #GtkPrintUnixDialog in
@@ -58,7 +58,7 @@
GtkWidget *right;
GtkWidget *top;
GtkWidget *bottom;
-
+
GtkWidget *center;
GtkWidget *width;
@@ -66,7 +66,7 @@
GtkWidget *scaling;
GtkWidget *unit;
-
+
GtkUnit current_unit;
EogImage *image;
@@ -119,7 +119,7 @@
block_handlers (EogPrintImageSetup *setup)
{
EogPrintImageSetupPrivate *priv = setup->priv;
-
+
g_signal_handlers_block_by_func (priv->left, on_left_value_changed, setup);
g_signal_handlers_block_by_func (priv->right, on_right_value_changed, setup);
g_signal_handlers_block_by_func (priv->width, on_width_value_changed, setup);
@@ -132,7 +132,7 @@
unblock_handlers (EogPrintImageSetup *setup)
{
EogPrintImageSetupPrivate *priv = setup->priv;
-
+
g_signal_handlers_unblock_by_func (priv->left, on_left_value_changed, setup);
g_signal_handlers_unblock_by_func (priv->right, on_right_value_changed, setup);
g_signal_handlers_unblock_by_func (priv->width, on_width_value_changed, setup);
@@ -147,7 +147,7 @@
gdouble factor = 0.;
switch (setup->priv->current_unit) {
- case GTK_UNIT_MM:
+ case GTK_UNIT_MM:
factor = FACTOR_MM_TO_PIXEL;
break;
case GTK_UNIT_INCH:
@@ -168,21 +168,21 @@
gdouble width, height;
gint pix_width, pix_height;
gdouble perc;
-
+
p_width = gtk_page_setup_get_page_width (priv->page_setup, GTK_UNIT_INCH);
p_height = gtk_page_setup_get_page_height (priv->page_setup, GTK_UNIT_INCH);
eog_image_get_size (priv->image, &pix_width, &pix_height);
-
+
width = (gdouble)pix_width/FACTOR_INCH_TO_PIXEL;
height = (gdouble)pix_height/FACTOR_INCH_TO_PIXEL;
-
+
if (p_width > width && p_height > height) {
perc = 1.;
} else {
perc = MIN (p_width/width, p_height/height);
- }
-
+ }
+
return perc;
}
@@ -201,7 +201,7 @@
}
static void
-on_center_changed (GtkComboBox *combobox,
+on_center_changed (GtkComboBox *combobox,
gpointer user_data)
{
EogPrintImageSetup *setup;
@@ -249,27 +249,27 @@
}
static void
-update_image_pos_ranges (EogPrintImageSetup *setup,
- gdouble page_width,
- gdouble page_height,
- gdouble width,
+update_image_pos_ranges (EogPrintImageSetup *setup,
+ gdouble page_width,
+ gdouble page_height,
+ gdouble width,
gdouble height)
{
EogPrintImageSetupPrivate *priv;
priv = setup->priv;
- gtk_spin_button_set_range (GTK_SPIN_BUTTON (priv->left),
+ gtk_spin_button_set_range (GTK_SPIN_BUTTON (priv->left),
0, page_width - width);
- gtk_spin_button_set_range (GTK_SPIN_BUTTON (priv->right),
+ gtk_spin_button_set_range (GTK_SPIN_BUTTON (priv->right),
0, page_width - width);
- gtk_spin_button_set_range (GTK_SPIN_BUTTON (priv->top),
+ gtk_spin_button_set_range (GTK_SPIN_BUTTON (priv->top),
0, page_height - height);
- gtk_spin_button_set_range (GTK_SPIN_BUTTON (priv->bottom),
+ gtk_spin_button_set_range (GTK_SPIN_BUTTON (priv->bottom),
0, page_height - height);
}
-static gboolean
+static gboolean
on_scale_changed (GtkRange *range,
gpointer user_data)
{
@@ -302,15 +302,15 @@
scale = CLAMP (0.01*gtk_range_get_value (range), 0, get_max_percentage (setup));
eog_print_preview_set_scale (EOG_PRINT_PREVIEW (priv->preview), scale);
-
+
width *= scale;
height *= scale;
page_width = gtk_page_setup_get_page_width (priv->page_setup, priv->current_unit);
page_height = gtk_page_setup_get_page_height (priv->page_setup, priv->current_unit);
-
+
update_image_pos_ranges (setup, page_width, page_height, width, height);
-
+
right = page_width - left - width;
bottom = page_height - top - height;
@@ -318,7 +318,7 @@
gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->height), height);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->right), right);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->bottom), bottom);
-
+
return FALSE;
}
@@ -330,8 +330,8 @@
}
static void
-position_values_changed (EogPrintImageSetup *setup,
- GtkWidget *w_changed,
+position_values_changed (EogPrintImageSetup *setup,
+ GtkWidget *w_changed,
GtkWidget *w_to_update,
GtkWidget *w_size,
gdouble total_size,
@@ -340,7 +340,7 @@
EogPrintImageSetupPrivate *priv;
gdouble changed, to_update, size;
gdouble pos;
-
+
priv = setup->priv;
size = gtk_spin_button_get_value (GTK_SPIN_BUTTON (w_size));
changed = gtk_spin_button_get_value (GTK_SPIN_BUTTON (w_changed));
@@ -376,10 +376,10 @@
setup = EOG_PRINT_IMAGE_SETUP (user_data);
priv = setup->priv;
-
- position_values_changed (setup,
+
+ position_values_changed (setup,
priv->left, priv->right, priv->width,
- gtk_page_setup_get_page_width (priv->page_setup,
+ gtk_page_setup_get_page_width (priv->page_setup,
priv->current_unit),
CHANGE_HORIZ);
}
@@ -389,12 +389,12 @@
gpointer user_data)
{
EogPrintImageSetupPrivate *priv;
-
+
priv = EOG_PRINT_IMAGE_SETUP (user_data)->priv;
- position_values_changed (EOG_PRINT_IMAGE_SETUP (user_data),
+ position_values_changed (EOG_PRINT_IMAGE_SETUP (user_data),
priv->right, priv->left, priv->width,
- gtk_page_setup_get_page_width (priv->page_setup,
+ gtk_page_setup_get_page_width (priv->page_setup,
priv->current_unit),
CHANGE_HORIZ);
}
@@ -407,9 +407,9 @@
priv = EOG_PRINT_IMAGE_SETUP (user_data)->priv;
- position_values_changed (EOG_PRINT_IMAGE_SETUP (user_data),
+ position_values_changed (EOG_PRINT_IMAGE_SETUP (user_data),
priv->top, priv->bottom, priv->height,
- gtk_page_setup_get_page_height (priv->page_setup,
+ gtk_page_setup_get_page_height (priv->page_setup,
priv->current_unit),
CHANGE_VERT);
}
@@ -422,9 +422,9 @@
priv = EOG_PRINT_IMAGE_SETUP (user_data)->priv;
- position_values_changed (EOG_PRINT_IMAGE_SETUP (user_data),
+ position_values_changed (EOG_PRINT_IMAGE_SETUP (user_data),
priv->bottom, priv->top, priv->height,
- gtk_page_setup_get_page_height (priv->page_setup,
+ gtk_page_setup_get_page_height (priv->page_setup,
priv->current_unit),
CHANGE_VERT);
}
@@ -448,7 +448,7 @@
gdouble size_x, size_y;
gint pix_width, pix_height;
gdouble factor;
-
+
priv = setup->priv;
size_x = gtk_spin_button_get_value (GTK_SPIN_BUTTON (w_size_x));
@@ -458,7 +458,7 @@
eog_image_get_size (priv->image, &pix_width, &pix_height);
factor = get_scale_to_px_factor (setup);
-
+
switch (change) {
case CHANGE_HORIZ:
orig_size_x = (gdouble) pix_width / factor;
@@ -473,12 +473,12 @@
scale = CLAMP (size_x / orig_size_x, 0, 1);
size_y = scale * orig_size_y;
-
+
margin_x_2 = page_size_x - margin_x_1 - size_x;
margin_y_2 = page_size_y - margin_y_1 - size_y;
eog_print_preview_set_scale (EOG_PRINT_PREVIEW (priv->preview), scale);
-
+
switch (change) {
case CHANGE_HORIZ:
update_image_pos_ranges (setup, page_size_x, page_size_y, size_x, size_y);
@@ -487,13 +487,13 @@
update_image_pos_ranges (setup, page_size_y, page_size_x, size_y, size_x);
break;
}
-
+
gtk_range_set_value (GTK_RANGE (priv->scaling), 100*scale);
-
+
gtk_spin_button_set_value (GTK_SPIN_BUTTON (w_margin_x_2), margin_x_2);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (w_size_y), size_y);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (w_margin_y_2), margin_y_2);
-
+
gtk_combo_box_set_active (GTK_COMBO_BOX (priv->center), CENTER_NONE);
}
@@ -503,13 +503,13 @@
{
EogPrintImageSetupPrivate *priv = EOG_PRINT_IMAGE_SETUP (user_data)->priv;
- size_changed (EOG_PRINT_IMAGE_SETUP (user_data),
- priv->width, priv->height,
- priv->left, priv->right,
+ size_changed (EOG_PRINT_IMAGE_SETUP (user_data),
+ priv->width, priv->height,
+ priv->left, priv->right,
priv->top, priv->bottom,
- gtk_page_setup_get_page_width (priv->page_setup,
+ gtk_page_setup_get_page_width (priv->page_setup,
priv->current_unit),
- gtk_page_setup_get_page_height (priv->page_setup,
+ gtk_page_setup_get_page_height (priv->page_setup,
priv->current_unit),
CHANGE_HORIZ);
}
@@ -519,21 +519,21 @@
gpointer user_data)
{
EogPrintImageSetupPrivate *priv = EOG_PRINT_IMAGE_SETUP (user_data)->priv;
-
- size_changed (EOG_PRINT_IMAGE_SETUP (user_data),
+
+ size_changed (EOG_PRINT_IMAGE_SETUP (user_data),
priv->height, priv->width,
priv->top, priv->bottom,
priv->left, priv->right,
- gtk_page_setup_get_page_height (priv->page_setup,
+ gtk_page_setup_get_page_height (priv->page_setup,
priv->current_unit),
- gtk_page_setup_get_page_width (priv->page_setup,
+ gtk_page_setup_get_page_width (priv->page_setup,
priv->current_unit),
CHANGE_VERT);
}
-static void
-change_unit (GtkSpinButton *spinbutton,
- gdouble factor,
+static void
+change_unit (GtkSpinButton *spinbutton,
+ gdouble factor,
gint digits,
gdouble step,
gdouble page)
@@ -581,7 +581,7 @@
default:
g_assert_not_reached ();
}
-
+
block_handlers (setup);
change_unit (GTK_SPIN_BUTTON (priv->width), factor, digits, step, page);
@@ -593,11 +593,11 @@
unblock_handlers (setup);
- priv->current_unit = unit;
+ priv->current_unit = unit;
}
static void
-on_unit_changed (GtkComboBox *combobox,
+on_unit_changed (GtkComboBox *combobox,
gpointer user_data)
{
GtkUnit unit = GTK_UNIT_INCH;
@@ -622,47 +622,47 @@
{
EogPrintImageSetupPrivate *priv = EOG_PRINT_IMAGE_SETUP (user_data)->priv;
gdouble x, y;
-
+
eog_print_preview_get_image_position (preview, &x, &y);
if (priv->current_unit == GTK_UNIT_MM) {
x *= FACTOR_INCH_TO_MM;
y *= FACTOR_INCH_TO_MM;
}
-
+
gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->left), x);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->top), y);
}
/* Function taken from gtkprintunixdialog.c */
static GtkWidget *
-wrap_in_frame (const gchar *label,
+wrap_in_frame (const gchar *label,
GtkWidget *child)
{
GtkWidget *frame, *alignment, *label_widget;
gchar *bold_text;
-
+
label_widget = gtk_label_new ("");
gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5);
gtk_widget_show (label_widget);
-
+
bold_text = g_markup_printf_escaped ("<b>%s</b>", label);
gtk_label_set_markup (GTK_LABEL (label_widget), bold_text);
g_free (bold_text);
-
+
frame = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE, 0);
-
+
alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
0, 0, 12, 0);
gtk_box_pack_start (GTK_BOX (frame), alignment, FALSE, FALSE, 0);
-
+
gtk_container_add (GTK_CONTAINER (alignment), child);
-
+
gtk_widget_show (frame);
gtk_widget_show (alignment);
-
+
return frame;
}
@@ -672,22 +672,22 @@
gint left, gint top)
{
GtkWidget *label, *spin_button;
-
+
label = gtk_label_new_with_mnemonic (text_label);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
spin_button = gtk_spin_button_new_with_range (0, 100, 0.01);
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spin_button), 2);
gtk_entry_set_width_chars (GTK_ENTRY (spin_button), 6);
- gtk_table_attach (GTK_TABLE (table), label, left, left + 1,
+ gtk_table_attach (GTK_TABLE (table), label, left, left + 1,
top, top + 1, GTK_FILL, GTK_FILL, 0, 0);
- gtk_table_attach (GTK_TABLE (table), spin_button, left + 1, left + 2,
+ gtk_table_attach (GTK_TABLE (table), spin_button, left + 1, left + 2,
top, top + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin_button);
return spin_button;
}
-static void
+static void
eog_print_image_setup_set_property (GObject *object,
guint prop_id,
const GValue *value,
@@ -696,7 +696,7 @@
EogPrintImageSetup *setup = EOG_PRINT_IMAGE_SETUP (object);
EogPrintImageSetupPrivate *priv = setup->priv;
GdkPixbuf *pixbuf;
-
+
switch (prop_id) {
case PROP_IMAGE:
if (priv->image) {
@@ -739,7 +739,7 @@
}
}
-static void
+static void
set_initial_values (EogPrintImageSetup *setup)
{
EogPrintImageSetupPrivate *priv;
@@ -754,7 +754,7 @@
priv = setup->priv;
page_setup = priv->page_setup;
image = priv->image;
-
+
factor = get_scale_to_px_factor (setup);
eog_image_get_size (image, &pix_width, &pix_height);
@@ -765,7 +765,7 @@
width *= max_perc;
height *= max_perc;
-
+
gtk_range_set_range (GTK_RANGE (priv->scaling), 1, 100*max_perc);
gtk_range_set_increments (GTK_RANGE (priv->scaling), max_perc, 10*max_perc);
gtk_range_set_value (GTK_RANGE (priv->scaling), 100*max_perc);
@@ -775,10 +775,10 @@
gtk_spin_button_set_range (GTK_SPIN_BUTTON (priv->height), 0, height);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->width), width);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->height), height);
-
- gtk_combo_box_set_active (GTK_COMBO_BOX (priv->center),
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (priv->center),
CENTER_BOTH);
-
+
center (gtk_page_setup_get_page_width (priv->page_setup, priv->current_unit),
gtk_spin_button_get_value (GTK_SPIN_BUTTON (priv->width)),
GTK_SPIN_BUTTON (priv->left), GTK_SPIN_BUTTON (priv->right));
@@ -794,7 +794,7 @@
}
-static void
+static void
connect_signals (EogPrintImageSetup *setup)
{
EogPrintImageSetupPrivate *priv;
@@ -805,15 +805,15 @@
G_CALLBACK (on_left_value_changed), setup);
g_signal_connect (G_OBJECT (priv->right), "value-changed",
G_CALLBACK (on_right_value_changed), setup);
- g_signal_connect (G_OBJECT (priv->top), "value-changed",
+ g_signal_connect (G_OBJECT (priv->top), "value-changed",
G_CALLBACK (on_top_value_changed), setup);
- g_signal_connect (G_OBJECT (priv->bottom), "value-changed",
+ g_signal_connect (G_OBJECT (priv->bottom), "value-changed",
G_CALLBACK (on_bottom_value_changed), setup);
- g_signal_connect (G_OBJECT (priv->width), "value-changed",
+ g_signal_connect (G_OBJECT (priv->width), "value-changed",
G_CALLBACK (on_width_value_changed), setup);
- g_signal_connect (G_OBJECT (priv->height), "value-changed",
+ g_signal_connect (G_OBJECT (priv->height), "value-changed",
G_CALLBACK (on_height_value_changed), setup);
- g_signal_connect (G_OBJECT (priv->scaling), "value-changed",
+ g_signal_connect (G_OBJECT (priv->scaling), "value-changed",
G_CALLBACK (on_scale_changed), setup);
g_signal_connect (G_OBJECT (priv->scaling), "format-value",
G_CALLBACK (on_scale_format_value), NULL);
@@ -863,7 +863,7 @@
priv = setup->priv = EOG_PRINT_IMAGE_SETUP_GET_PRIVATE (setup);
priv->image = NULL;
-
+
table = gtk_table_new (3, 4, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
@@ -879,26 +879,26 @@
label = gtk_label_new_with_mnemonic (_("C_enter:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-
+
combobox = gtk_combo_box_new_text ();
- gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox),
+ gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox),
CENTER_NONE, _("None"));
- gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox),
+ gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox),
CENTER_HORIZONTAL, _("Horizontal"));
- gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox),
+ gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox),
CENTER_VERTICAL, _("Vertical"));
- gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox),
+ gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox),
CENTER_BOTH, _("Both"));
gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), CENTER_NONE);
- gtk_table_attach (GTK_TABLE (table), label,
- 0, 1, 2, 3, GTK_FILL, GTK_FILL,
+ gtk_table_attach (GTK_TABLE (table), label,
+ 0, 1, 2, 3, GTK_FILL, GTK_FILL,
0, 0);
- gtk_table_attach (GTK_TABLE (table), combobox,
- 1, 4, 2, 3, GTK_FILL | GTK_EXPAND, GTK_FILL,
+ gtk_table_attach (GTK_TABLE (table), combobox,
+ 1, 4, 2, 3, GTK_FILL | GTK_EXPAND, GTK_FILL,
0, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combobox);
priv->center = combobox;
- g_signal_connect (G_OBJECT (combobox), "changed",
+ g_signal_connect (G_OBJECT (combobox), "changed",
G_CALLBACK (on_center_changed), setup);
table = gtk_table_new (3, 4, FALSE);
@@ -911,25 +911,25 @@
priv->width = table_attach_spin_button_with_label (table, _("_Width:"),
0, 0);
- priv->height = table_attach_spin_button_with_label (table, _("_Height:"),
+ priv->height = table_attach_spin_button_with_label (table, _("_Height:"),
2, 0);
-
+
label = gtk_label_new_with_mnemonic (_("_Scaling:"));
hscale = gtk_hscale_new_with_range (1, 100, 1);
gtk_scale_set_value_pos (GTK_SCALE (hscale), GTK_POS_RIGHT);
gtk_range_set_value (GTK_RANGE (hscale), 100);
- gtk_table_attach (GTK_TABLE (table), label,
- 0, 1, 1, 2, GTK_FILL, GTK_FILL,
+ gtk_table_attach (GTK_TABLE (table), label,
+ 0, 1, 1, 2, GTK_FILL, GTK_FILL,
0, 0);
- gtk_table_attach (GTK_TABLE (table), hscale,
- 1, 4, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL,
+ gtk_table_attach (GTK_TABLE (table), hscale,
+ 1, 4, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL,
0, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), hscale);
priv->scaling = hscale;
label = gtk_label_new_with_mnemonic (_("_Unit:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-
+
combobox = gtk_combo_box_new_text ();
gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox), UNIT_MM,
_("Millimeters"));
@@ -948,22 +948,22 @@
set_scale_unit (setup, GTK_UNIT_MM);
}
- gtk_table_attach (GTK_TABLE (table), label,
- 0, 1, 2, 3, GTK_FILL, GTK_FILL,
+ gtk_table_attach (GTK_TABLE (table), label,
+ 0, 1, 2, 3, GTK_FILL, GTK_FILL,
0, 0);
- gtk_table_attach (GTK_TABLE (table), combobox,
- 1, 4, 2, 3, GTK_FILL | GTK_EXPAND, GTK_FILL,
+ gtk_table_attach (GTK_TABLE (table), combobox,
+ 1, 4, 2, 3, GTK_FILL | GTK_EXPAND, GTK_FILL,
0, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combobox);
priv->unit = combobox;
- g_signal_connect (G_OBJECT (combobox), "changed",
+ g_signal_connect (G_OBJECT (combobox), "changed",
G_CALLBACK (on_unit_changed), setup);
priv->preview = eog_print_preview_new ();
/* FIXME: This shouldn't be set by hand */
gtk_widget_set_size_request (priv->preview, 250, 250);
-
+
frame = wrap_in_frame (_("Preview"), priv->preview);
gtk_table_attach (GTK_TABLE (setup), frame,
1, 2, 0, 2, GTK_FILL, GTK_FILL,
@@ -978,11 +978,11 @@
* @image: the #EogImage to print
* @page_setup: a #GtkPageSetup specifying the page where
* the image will be print
- *
+ *
* Creates a new #EogPrintImageSetup widget, to be used as a custom
* widget in a #GtkPrinUnixDialog. This widgets allows to set
* the image position and scale in a page.
- *
+ *
* Returns: a new #EogPrintImageSetup
**/
GtkWidget *
@@ -991,10 +991,10 @@
GtkWidget *setup;
GtkWidget *preview;
- setup = g_object_new (EOG_TYPE_PRINT_IMAGE_SETUP,
- "n-rows", 2,
+ setup = g_object_new (EOG_TYPE_PRINT_IMAGE_SETUP,
+ "n-rows", 2,
"n-columns", 2,
- "homogeneous", FALSE,
+ "homogeneous", FALSE,
"row-spacing", 18,
"column-spacing", 18,
"border-width", 12,
@@ -1007,9 +1007,9 @@
preview = EOG_PRINT_IMAGE_SETUP (setup)->priv->preview;
eog_print_preview_set_from_page_setup (EOG_PRINT_PREVIEW (preview),
page_setup);
-
+
connect_signals (EOG_PRINT_IMAGE_SETUP (setup));
-
+
return setup;
}
@@ -1020,12 +1020,12 @@
* @top: a pointer where to store the image's top position
* @scale: a pointer where to store the image's scale
* @unit: a pointer where to store the #GtkUnit used by the @left and @top values.
- *
+ *
* Gets the options set by the #EogPrintImageSetup.
**/
void
eog_print_image_setup_get_options (EogPrintImageSetup *setup,
- gdouble *left,
+ gdouble *left,
gdouble *top,
gdouble *scale,
GtkUnit *unit)
@@ -1033,7 +1033,7 @@
EogPrintImageSetupPrivate *priv;
g_return_if_fail (EOG_IS_PRINT_IMAGE_SETUP (setup));
-
+
priv = setup->priv;
*left = gtk_spin_button_get_value (GTK_SPIN_BUTTON (priv->left));
Modified: trunk/src/eog-print-preview.c
==============================================================================
--- trunk/src/eog-print-preview.c (original)
+++ trunk/src/eog-print-preview.c Mon Oct 27 19:33:42 2008
@@ -61,7 +61,7 @@
gfloat i_scale;
/* scale of the page, relative to the widget size */
- gfloat p_scale;
+ gfloat p_scale;
/* whether we are currently grabbing the image */
gboolean grabbed;
@@ -160,7 +160,7 @@
g_object_unref (priv->image);
}
priv->image = GDK_PIXBUF (g_value_dup_object (value));
-
+
if (priv->image_scaled) {
g_object_unref (priv->image_scaled);
priv->image_scaled = NULL;
@@ -207,8 +207,8 @@
"ratio", priv->p_width/priv->p_height,
NULL);
}
-
- update_relative_sizes (EOG_PRINT_PREVIEW (object));
+
+ update_relative_sizes (EOG_PRINT_PREVIEW (object));
gtk_widget_queue_draw (priv->area);
}
@@ -222,7 +222,7 @@
gobject_class->get_property = eog_print_preview_get_property;
gobject_class->set_property = eog_print_preview_set_property;
gobject_class->finalize = eog_print_preview_finalize;
-
+
/**
* EogPrintPreview:image:
*
@@ -236,7 +236,7 @@
"",
G_TYPE_OBJECT,
G_PARAM_READWRITE));
-
+
/**
* EogPrintPreview:image-x-align:
*
@@ -268,7 +268,7 @@
1,
0.5,
G_PARAM_READWRITE));
-
+
/**
* EogPrintPreview:image-scale:
*
@@ -387,7 +387,7 @@
G_SIGNAL_RUN_FIRST, 0, NULL, NULL,
g_cclosure_marshal_VOID__VOID, G_TYPE_NONE,
0, NULL);
-
+
g_type_class_add_private (klass, sizeof (EogPrintPreviewPrivate));
}
@@ -412,7 +412,7 @@
cairo_surface_destroy (priv->surface);
priv->surface = NULL;
}
-
+
G_OBJECT_CLASS (eog_print_preview_parent_class)->finalize (object);
}
@@ -421,7 +421,7 @@
{
EogPrintPreviewPrivate *priv;
gfloat ratio;
-
+
priv = preview->priv = EOG_PRINT_PREVIEW_GET_PRIVATE (preview);
priv->area = GTK_WIDGET (gtk_drawing_area_new ());
@@ -432,7 +432,7 @@
priv->p_height = 11.0;
ratio = priv->p_width/priv->p_height;
-
+
gtk_aspect_frame_set (GTK_ASPECT_FRAME (preview),
0.5, 0.5, ratio, FALSE);
@@ -446,7 +446,7 @@
priv->flag_create_surface = TRUE;
priv->p_scale = 0;
-
+
priv->l_margin = 0.25;
priv->r_margin = 0.25;
priv->t_margin = 0.25;
@@ -470,17 +470,17 @@
/**
* eog_print_preview_new_with_pixbuf:
* @pixbuf: a #GdkPixbuf
- *
+ *
* Creates a new #EogPrintPreview widget, and sets the #GdkPixbuf to preview
* on it.
- *
+ *
* Returns: A new #EogPrintPreview widget.
**/
GtkWidget *
eog_print_preview_new_with_pixbuf (GdkPixbuf *pixbuf)
{
EogPrintPreview *preview;
-
+
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
preview = EOG_PRINT_PREVIEW (eog_print_preview_new ());
@@ -494,11 +494,11 @@
/**
* eog_print_preview_new:
- *
+ *
* Creates a new #EogPrintPreview widget, setting it to the default values,
* and leaving the page empty. You still need to set the #EogPrintPreview:image
* property to make it useful.
- *
+ *
* Returns: A new and empty #EogPrintPreview widget.
**/
GtkWidget *
@@ -510,7 +510,7 @@
preview = g_object_new (EOG_TYPE_PRINT_PREVIEW, NULL);
area = preview->priv->area;
-
+
gtk_widget_set_events (area,
GDK_EXPOSURE_MASK |
GDK_POINTER_MOTION_MASK |
@@ -523,7 +523,7 @@
NULL);
/* update_relative_sizes (preview); */
-
+
g_signal_connect (G_OBJECT (area), "expose-event",
G_CALLBACK (expose_event_cb), preview);
@@ -553,32 +553,32 @@
GtkWidget *widget;
EogPrintPreviewPrivate *priv;
cairo_t *cr;
-
+
widget = GTK_WIDGET (drawing_area);
priv = EOG_PRINT_PREVIEW (user_data)->priv;
update_relative_sizes (EOG_PRINT_PREVIEW (user_data));
-
+
cr = gdk_cairo_create (widget->window);
eog_print_preview_draw (EOG_PRINT_PREVIEW (user_data), cr);
-
+
if (cairo_status (cr) != CAIRO_STATUS_SUCCESS) {
fprintf (stderr, "Cairo is unhappy: %s\n",
cairo_status_to_string (cairo_status (cr)));
}
cairo_destroy (cr);
-
+
gdk_window_get_pointer (widget->window, NULL, NULL, NULL);
}
/**
* get_current_image_coordinates:
- * @preview:
+ * @preview:
* @x0: A pointer where to store the x coordinate.
* @y0: A pointer where to store the y coordinate.
- *
+ *
* This function returns the current image coordinates, according
* with the properties of the given @preview widget.
**/
@@ -588,7 +588,7 @@
{
EogPrintPreviewPrivate *priv;
gint p_width, p_height;
-
+
priv = preview->priv;
p_width = priv->area->allocation.width;
p_height = priv->area->allocation.height;
@@ -599,12 +599,12 @@
/**
* press_inside_image_area:
- * @preview:
- * @x:
- * @y:
- *
+ * @preview:
+ * @x:
+ * @y:
+ *
* Returns whether the given point is inside the image area.
- *
+ *
* Returns: %TRUE if the given point is inside of the image area,
* %FALSE otherwise.
**/
@@ -618,11 +618,11 @@
priv = preview->priv;
get_current_image_coordinates (preview, &x0, &y0);
-
+
if (x >= x0 && y >= y0 &&
x <= x0 + priv->r_width && y <= y0 + priv->r_height)
return TRUE;
-
+
return FALSE;
}
@@ -633,7 +633,7 @@
if (!priv->image_scaled) {
gint a_width, a_height, i_width, i_height;
-
+
GtkWidget *area = priv->area;
a_width = area->allocation.width;
a_height = area->allocation.height;
@@ -643,9 +643,9 @@
if ((i_width > a_width) || (i_height > a_height)) {
gdouble scale;
scale = MIN ((gdouble) a_width/i_width, (gdouble)a_height/i_height);
- priv->image_scaled = gdk_pixbuf_scale_simple (priv->image,
- i_width*scale,
- i_height*scale,
+ priv->image_scaled = gdk_pixbuf_scale_simple (priv->image,
+ i_width*scale,
+ i_height*scale,
GDK_INTERP_TILES);
} else {
priv->image_scaled = priv->image;
@@ -660,19 +660,19 @@
GdkPixbuf *pixbuf;
gint width, height;
GdkInterpType type = GDK_INTERP_TILES;
-
+
if (preview->priv->image == NULL) {
return NULL;
}
create_image_scaled (preview);
-
+
width = gdk_pixbuf_get_width (preview->priv->image);
height = gdk_pixbuf_get_height (preview->priv->image);
width *= preview->priv->i_scale * preview->priv->p_scale;
height *= preview->priv->i_scale * preview->priv->p_scale;
-
+
if (width < 1 || height < 1)
return NULL;
@@ -687,7 +687,7 @@
pixbuf = gdk_pixbuf_scale_simple (preview->priv->image,
width, height, type);
}
-
+
return pixbuf;
}
@@ -730,14 +730,14 @@
if (n_channels == 3)
{
guchar *end = p + 3 * width;
-
+
while (p < end)
{
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
q[0] = p[2];
q[1] = p[1];
q[2] = p[0];
-#else
+#else
q[1] = p[0];
q[2] = p[1];
q[3] = p[2];
@@ -750,7 +750,7 @@
{
guchar *end = p + 4 * width;
guint t1,t2,t3;
-
+
#define MULT(d,c,a,t) G_STMT_START { t = c * a + 0x7f; d = ((t >> 8) + t) >> 8; } G_STMT_END
while (p < end)
@@ -760,17 +760,17 @@
MULT(q[1], p[1], p[3], t2);
MULT(q[2], p[0], p[3], t3);
q[3] = p[3];
-#else
+#else
q[0] = p[3];
MULT(q[1], p[0], p[3], t1);
MULT(q[2], p[1], p[3], t2);
MULT(q[3], p[2], p[3], t3);
#endif
-
+
p += 4;
q += 4;
}
-
+
#undef MULT
}
@@ -791,7 +791,7 @@
cairo_surface_destroy (priv->surface);
priv->surface = NULL;
}
-
+
pixbuf = create_preview_buffer (preview);
if (pixbuf) {
priv->surface = create_surface_from_pixbuf (pixbuf);
@@ -799,7 +799,7 @@
}
priv->flag_create_surface = FALSE;
}
-
+
static gboolean
create_surface_when_idle (EogPrintPreview *preview)
{
@@ -817,7 +817,7 @@
preview->priv->cursorx = event->x;
preview->priv->cursory = event->y;
-
+
switch (event->button) {
case 1:
preview->priv->grabbed = press_inside_image_area (preview, event->x, event->y);
@@ -829,7 +829,7 @@
}
gtk_widget_grab_focus (preview->priv->area);
-
+
return FALSE;
}
@@ -846,7 +846,7 @@
preview->priv->r_dx = 0;
preview->priv->r_dy = 0;
gtk_widget_queue_draw (GTK_WIDGET (preview));
-
+
}
return FALSE;
}
@@ -860,7 +860,7 @@
gfloat delta, align;
gboolean stop_emission = FALSE;
const gchar *property;
-
+
priv = EOG_PRINT_PREVIEW (user_data)->priv;
delta = 0;
@@ -883,24 +883,24 @@
delta = 0.01;
break;
}
-
+
if (delta != 0) {
g_object_get (G_OBJECT (user_data),
property, &align,
NULL);
-
+
align += delta;
align = CLAMP (align, 0, 1);
g_object_set (G_OBJECT (user_data),
property, align,
NULL);
-
+
stop_emission = TRUE;
g_signal_emit (G_OBJECT (user_data),
preview_signals
[SIGNAL_IMAGE_MOVED], 0);
}
-
+
return stop_emission;
}
@@ -912,7 +912,7 @@
EogPrintPreviewPrivate *priv = EOG_PRINT_PREVIEW (user_data)->priv;
gdouble dx, dy;
gint p_width, p_height;
-
+
if (priv->grabbed) {
dx = event->x - priv->cursorx;
dy = event->y - priv->cursory;
@@ -921,7 +921,7 @@
p_height = widget->allocation.height;
/* Make sure the image stays inside the margins */
-
+
priv->image_x_align += (dx + priv->r_dx)/(p_width - priv->r_width - priv->l_rmargin - priv->r_rmargin);
if (priv->image_x_align < 0. || priv->image_x_align > 1.) {
priv->image_x_align = CLAMP (priv->image_x_align, 0., 1.);
@@ -929,23 +929,23 @@
}
else
priv->r_dx = 0;
-
+
priv->image_y_align += (dy + priv->r_dy)/(p_height - priv->r_height - priv->t_rmargin - priv->b_rmargin);
if (priv->image_y_align < 0. || priv->image_y_align > 1.) {
priv->image_y_align = CLAMP (priv->image_y_align, 0., 1.);
priv->r_dy += dy;
} else
priv->r_dy = 0;
-
+
/* we do this to correctly change the property values */
g_object_set (EOG_PRINT_PREVIEW (user_data),
"image-x-align", priv->image_x_align,
"image-y-align", priv->image_y_align,
NULL);
-
+
priv->cursorx = event->x;
priv->cursory = event->y;
-
+
g_signal_emit (G_OBJECT (user_data),
preview_signals
[SIGNAL_IMAGE_MOVED], 0);
@@ -992,14 +992,14 @@
gint x0, y0;
GtkStyle *style;
gboolean has_focus;
-
+
priv = preview->priv;
area = priv->area;
has_focus = GTK_WIDGET_HAS_FOCUS (area);
-
+
style = area->style;
-
+
w_width = area->allocation.width;
w_height = area->allocation.height;
@@ -1028,9 +1028,9 @@
cairo_paint (cr);
} else if (priv->image_scaled) {
/* just in the remote case we don't have the surface */
-
+
/* adjust (x0, y0) to the new scale */
- gdouble scale = priv->i_scale * priv->p_scale *
+ gdouble scale = priv->i_scale * priv->p_scale *
gdk_pixbuf_get_width (priv->image) / gdk_pixbuf_get_width (priv->image_scaled);
x0 /= scale;
y0 /= scale;
@@ -1040,7 +1040,7 @@
cairo_paint (cr);
} else if (priv->image) {
/* just in the remote case we don't have the surface */
-
+
/* adjust (x0, y0) to the new scale */
x0 /= priv->i_scale * priv->p_scale;
y0 /= priv->i_scale * priv->p_scale;
@@ -1063,20 +1063,20 @@
EogPrintPreviewPrivate *priv;
gint p_width;
gint i_width, i_height;
-
+
priv = preview->priv;
-
+
if (priv->image != NULL) {
i_width = gdk_pixbuf_get_width (priv->image);
i_height = gdk_pixbuf_get_height (priv->image);
} else {
i_width = i_height = 0;
}
-
+
p_width = priv->area->allocation.width;
-
+
priv->p_scale = (gfloat)p_width / (priv->p_width * 72.0);
-
+
priv->r_width = (gint) i_width * priv->i_scale * priv->p_scale;
priv->r_height = (gint) i_height * priv->i_scale * priv->p_scale;
@@ -1093,7 +1093,7 @@
* @r_margin: Right margin.
* @t_margin: Top margin.
* @b_margin: Bottom margin.
- *
+ *
* Manually set the margins, in inches.
**/
void
@@ -1117,7 +1117,7 @@
* eog_print_preview_set_from_page_setup:
* @preview: a #EogPrintPreview
* @setup: a #GtkPageSetup to set the properties from
- *
+ *
* Sets up the page properties from a #GtkPageSetup. Useful when using the
* widget with the GtkPrint API.
**/
@@ -1136,7 +1136,7 @@
"paper-width", gtk_page_setup_get_paper_width (setup, GTK_UNIT_INCH),
"paper-height", gtk_page_setup_get_paper_height (setup, GTK_UNIT_INCH),
NULL);
-
+
}
/**
@@ -1144,7 +1144,7 @@
* @preview: a #EogPrintPreview
* @x: a pointer to a #gdouble, or %NULL to ignore it
* @y: a pointer to a #gdouble, or %NULL to ignore it
- *
+ *
* Gets current image position in inches, relative to the margins. A
* (0, 0) position is the intersection between the left and top margins.
**/
@@ -1157,7 +1157,7 @@
gdouble width, height;
g_return_if_fail (EOG_IS_PRINT_PREVIEW (preview));
-
+
priv = preview->priv;
if (x != NULL) {
@@ -1172,10 +1172,10 @@
/**
* eog_print_preview_set_image_position:
- * @preview: a #EogPrintPreview
+ * @preview: a #EogPrintPreview
* @x: The X coordinate, in inches, or -1 to ignore it.
* @y: The Y coordinate, in inches, or -1 to ignore it.
- *
+ *
* Sets the image position. You can pass -1 to one of the coordinates if you
* only want to set the other.
**/
@@ -1187,7 +1187,7 @@
EogPrintPreviewPrivate *priv;
gfloat x_align, y_align;
gdouble width, height;
-
+
g_return_if_fail (EOG_IS_PRINT_PREVIEW (preview));
priv = preview->priv;
@@ -1209,7 +1209,7 @@
* eog_print_preview_set_scale:
* @preview: a #EogPrintPreview
* @scale: a scale value, between 0 and 1.
- *
+ *
* Sets the scale for the image.
**/
void
@@ -1217,7 +1217,7 @@
gfloat scale)
{
g_return_if_fail (EOG_IS_PRINT_PREVIEW (preview));
-
+
g_object_set (preview,
"image-scale", scale,
NULL);
Modified: trunk/src/eog-print-preview.h
==============================================================================
--- trunk/src/eog-print-preview.h (original)
+++ trunk/src/eog-print-preview.h Mon Oct 27 19:33:42 2008
@@ -36,7 +36,7 @@
struct _EogPrintPreview {
GtkAspectFrame aspect_frame;
-
+
EogPrintPreviewPrivate *priv;
};
Modified: trunk/src/eog-print.c
==============================================================================
--- trunk/src/eog-print.c (original)
+++ trunk/src/eog-print.c Mon Oct 27 19:33:42 2008
@@ -42,7 +42,7 @@
eog_print_draw_page (GtkPrintOperation *operation,
GtkPrintContext *context,
gint page_nr,
- gpointer user_data)
+ gpointer user_data)
{
cairo_t *cr;
gdouble dpi_x, dpi_y;
@@ -53,9 +53,9 @@
GdkPixbuf *pixbuf;
EogPrintData *data;
GtkPageSetup *page_setup;
-
+
eog_debug (DEBUG_PRINTING);
-
+
data = (EogPrintData *) user_data;
scale_factor = data->scale_factor/100;
@@ -63,7 +63,7 @@
dpi_x = gtk_print_context_get_dpi_x (context);
dpi_y = gtk_print_context_get_dpi_y (context);
-
+
switch (data->unit) {
case GTK_UNIT_INCH:
x0 = data->left_margin * dpi_x;
@@ -101,20 +101,20 @@
}
static GObject *
-eog_print_create_custom_widget (GtkPrintOperation *operation,
+eog_print_create_custom_widget (GtkPrintOperation *operation,
gpointer user_data)
{
GtkPageSetup *page_setup;
EogPrintData *data;
-
+
eog_debug (DEBUG_PRINTING);
-
+
data = (EogPrintData *)user_data;
-
+
page_setup = gtk_print_operation_get_default_page_setup (operation);
-
+
g_assert (page_setup != NULL);
-
+
return G_OBJECT (eog_print_image_setup_new (data->image, page_setup));
}
@@ -126,15 +126,15 @@
EogPrintData *data;
gdouble left_margin, top_margin, scale_factor;
GtkUnit unit;
-
+
eog_debug (DEBUG_PRINTING);
-
+
data = (EogPrintData *)user_data;
-
- eog_print_image_setup_get_options (EOG_PRINT_IMAGE_SETUP (widget),
- &left_margin, &top_margin,
+
+ eog_print_image_setup_get_options (EOG_PRINT_IMAGE_SETUP (widget),
+ &left_margin, &top_margin,
&scale_factor, &unit);
-
+
data->left_margin = left_margin;
data->top_margin = top_margin;
data->scale_factor = scale_factor;
@@ -149,7 +149,7 @@
EogPrintData *data = (EogPrintData*) user_data;
eog_debug (DEBUG_PRINTING);
-
+
g_object_unref (data->image);
g_slice_free (EogPrintData, data);
}
@@ -175,22 +175,22 @@
data->unit = GTK_UNIT_INCH;
gtk_print_operation_set_print_settings (print, print_settings);
- gtk_print_operation_set_default_page_setup (print,
+ gtk_print_operation_set_default_page_setup (print,
page_setup);
gtk_print_operation_set_n_pages (print, 1);
gtk_print_operation_set_job_name (print,
eog_image_get_caption (image));
- g_signal_connect (print, "draw_page",
- G_CALLBACK (eog_print_draw_page),
+ g_signal_connect (print, "draw_page",
+ G_CALLBACK (eog_print_draw_page),
data);
- g_signal_connect (print, "create-custom-widget",
+ g_signal_connect (print, "create-custom-widget",
G_CALLBACK (eog_print_create_custom_widget),
data);
- g_signal_connect (print, "custom-widget-apply",
- G_CALLBACK (eog_print_custom_widget_apply),
+ g_signal_connect (print, "custom-widget-apply",
+ G_CALLBACK (eog_print_custom_widget_apply),
data);
- g_signal_connect (print, "end-print",
+ g_signal_connect (print, "end-print",
G_CALLBACK (eog_print_end_print),
data);
@@ -257,7 +257,7 @@
if (key_file)
g_key_file_free (key_file);
-
+
return page_setup;
}
@@ -325,7 +325,7 @@
if (key_file)
g_key_file_free (key_file);
-
+
return print_settings;
}
Modified: trunk/src/eog-properties-dialog.c
==============================================================================
--- trunk/src/eog-properties-dialog.c (original)
+++ trunk/src/eog-properties-dialog.c Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - Image Properties Dialog
+/* Eye Of Gnome - Image Properties Dialog
*
* Copyright (C) 2006 The Free Software Foundation
*
@@ -107,7 +107,7 @@
};
static void
-pd_update_general_tab (EogPropertiesDialog *prop_dlg,
+pd_update_general_tab (EogPropertiesDialog *prop_dlg,
EogImage *image)
{
gchar *bytes_str, *dir_str, *uri_str;
@@ -123,7 +123,7 @@
"pixbuf", eog_image_get_thumbnail (image),
NULL);
- gtk_label_set_text (GTK_LABEL (prop_dlg->priv->name_label),
+ gtk_label_set_text (GTK_LABEL (prop_dlg->priv->name_label),
eog_image_get_caption (image));
eog_image_get_size (image, &width, &height);
@@ -135,12 +135,12 @@
gtk_label_set_text (GTK_LABEL (prop_dlg->priv->width_label), width_str);
- gtk_label_set_text (GTK_LABEL (prop_dlg->priv->height_label),
+ gtk_label_set_text (GTK_LABEL (prop_dlg->priv->height_label),
height_str);
g_free (height_str);
g_free (width_str);
-
+
file = eog_image_get_file (image);
file_info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
@@ -163,7 +163,7 @@
uri_str = eog_image_get_uri_for_display (image);
dir_str = g_path_get_dirname (uri_str);
- gtk_label_set_text (GTK_LABEL (prop_dlg->priv->location_label),
+ gtk_label_set_text (GTK_LABEL (prop_dlg->priv->location_label),
dir_str);
g_free (type_str);
@@ -183,7 +183,7 @@
if (exif_data) {
buf_ptr = eog_exif_util_get_value (exif_data, tag_id,
exif_buffer, 512);
-
+
if (tag_id == EXIF_TAG_DATE_TIME_ORIGINAL && buf_ptr)
label_text = eog_exif_util_format_date (buf_ptr);
else
@@ -227,7 +227,7 @@
the image was taken.*/
fl_text = g_strdup_printf (_("%.1f (lens)"), f_val);
- }
+ }
if (entry35mm && G_LIKELY (entry35mm->format == EXIF_FORMAT_SHORT)) {
ExifShort s_val;
@@ -262,9 +262,9 @@
#if HAVE_EXEMPI
static void
-eog_xmp_set_label (XmpPtr xmp,
- const char *ns,
- const char *propname,
+eog_xmp_set_label (XmpPtr xmp,
+ const char *ns,
+ const char *propname,
GtkWidget *w)
{
uint32_t options;
@@ -275,9 +275,9 @@
if (XMP_IS_PROP_SIMPLE (options)) {
gtk_label_set_text (GTK_LABEL (w), xmp_string_cstr (value));
} else if (XMP_IS_PROP_ARRAY (options)) {
- XmpIteratorPtr iter = xmp_iterator_new (xmp,
- ns,
- propname,
+ XmpIteratorPtr iter = xmp_iterator_new (xmp,
+ ns,
+ propname,
XMP_ITER_JUSTLEAFNODES);
GString *string = g_string_new ("");
@@ -294,8 +294,8 @@
first = FALSE;
}
- g_string_append_printf (string,
- "%s",
+ g_string_append_printf (string,
+ "%s",
xmp_string_cstr (value));
}
@@ -317,7 +317,7 @@
#if HAVE_METADATA
static void
-pd_update_metadata_tab (EogPropertiesDialog *prop_dlg,
+pd_update_metadata_tab (EogPropertiesDialog *prop_dlg,
EogImage *image)
{
EogPropertiesDialogPrivate *priv;
@@ -370,7 +370,7 @@
eog_exif_set_label (priv->exif_flash_label,
exif_data, EXIF_TAG_FLASH);
- eog_exif_set_label (priv->exif_iso_label,
+ eog_exif_set_label (priv->exif_iso_label,
exif_data, EXIF_TAG_ISO_SPEED_RATINGS);
@@ -383,7 +383,7 @@
eog_exif_set_label (priv->exif_date_label,
exif_data, EXIF_TAG_DATE_TIME_ORIGINAL);
- eog_exif_details_update (EOG_EXIF_DETAILS (priv->exif_details),
+ eog_exif_details_update (EOG_EXIF_DETAILS (priv->exif_details),
exif_data);
/* exif_data_unref can handle NULL-values */
@@ -394,29 +394,29 @@
xmp_data = (XmpPtr) eog_image_get_xmp_info (image);
if (xmp_data != NULL) {
- eog_xmp_set_label (xmp_data,
- NS_IPTC4XMP,
- "Location",
+ eog_xmp_set_label (xmp_data,
+ NS_IPTC4XMP,
+ "Location",
priv->xmp_location_label);
- eog_xmp_set_label (xmp_data,
- NS_DC,
- "description",
+ eog_xmp_set_label (xmp_data,
+ NS_DC,
+ "description",
priv->xmp_description_label);
- eog_xmp_set_label (xmp_data,
- NS_DC,
- "subject",
+ eog_xmp_set_label (xmp_data,
+ NS_DC,
+ "subject",
priv->xmp_keywords_label);
- eog_xmp_set_label (xmp_data,
- NS_DC,
- "creator",
+ eog_xmp_set_label (xmp_data,
+ NS_DC,
+ "creator",
priv->xmp_creator_label);
- eog_xmp_set_label (xmp_data,
- NS_DC,
- "rights",
+ eog_xmp_set_label (xmp_data,
+ NS_DC,
+ "rights",
priv->xmp_rights_label);
eog_exif_details_xmp_update (EOG_EXIF_DETAILS (priv->exif_details), xmp_data);
@@ -442,8 +442,8 @@
{
gint width, height;
- gtk_window_get_size (GTK_WINDOW (user_data),
- &width,
+ gtk_window_get_size (GTK_WINDOW (user_data),
+ &width,
&height);
gtk_window_resize (GTK_WINDOW (user_data), width, 1);
@@ -453,22 +453,22 @@
static void
pd_exif_details_activated_cb (GtkExpander *expander,
- GParamSpec *param_spec,
+ GParamSpec *param_spec,
GtkWidget *dialog)
{
gboolean expanded;
expanded = gtk_expander_get_expanded (expander);
- /*FIXME: this is depending on the expander animation
+ /*FIXME: this is depending on the expander animation
* duration. Need to find a safer way for doing that. */
if (!expanded)
- g_timeout_add (150, pd_resize_dialog, dialog);
+ g_timeout_add (150, pd_resize_dialog, dialog);
}
#endif
static void
-pd_close_button_clicked_cb (GtkButton *button,
+pd_close_button_clicked_cb (GtkButton *button,
gpointer user_data)
{
eog_dialog_hide (EOG_DIALOG (user_data));
@@ -476,20 +476,20 @@
static gboolean
eog_properties_dialog_page_switch (GtkNotebook *notebook,
- GtkNotebookPage *page,
- gint page_index,
+ GtkNotebookPage *page,
+ gint page_index,
EogPropertiesDialog *prop_dlg)
{
- if (prop_dlg->priv->update_page)
+ if (prop_dlg->priv->update_page)
prop_dlg->priv->current_page = page_index;
return TRUE;
}
static gint
-eog_properties_dialog_delete (GtkWidget *widget,
- GdkEventAny *event,
+eog_properties_dialog_delete (GtkWidget *widget,
+ GdkEventAny *event,
gpointer user_data)
{
g_return_val_if_fail (EOG_IS_PROPERTIES_DIALOG (user_data), FALSE);
@@ -534,7 +534,7 @@
{
EogPropertiesDialog *prop_dlg;
EogPropertiesDialogPrivate *priv;
-
+
g_return_if_fail (object != NULL);
g_return_if_fail (EOG_IS_PROPERTIES_DIALOG (object));
@@ -564,10 +564,10 @@
"Thumbview",
"Thumbview",
EOG_TYPE_THUMB_VIEW,
- G_PARAM_READWRITE |
- G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_NAME |
+ G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB));
g_type_class_add_private (g_object_class, sizeof (EogPropertiesDialogPrivate));
@@ -594,8 +594,8 @@
eog_dialog_construct (EOG_DIALOG (prop_dlg),
"eog-image-properties-dialog.ui",
"eog_image_properties_dialog");
-
- eog_dialog_get_controls (EOG_DIALOG (prop_dlg),
+
+ eog_dialog_get_controls (EOG_DIALOG (prop_dlg),
"eog_image_properties_dialog", &dlg,
"notebook", &priv->notebook,
"previous_button", &priv->previous_button,
@@ -657,7 +657,7 @@
#ifdef HAVE_METADATA
sw = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
@@ -673,8 +673,8 @@
gtk_container_add (GTK_CONTAINER (priv->exif_details_expander), sw);
g_signal_connect_after (G_OBJECT (priv->exif_details_expander),
- "notify::expanded",
- G_CALLBACK (pd_exif_details_activated_cb),
+ "notify::expanded",
+ G_CALLBACK (pd_exif_details_activated_cb),
dlg);
#ifndef HAVE_EXEMPI
@@ -683,13 +683,13 @@
#endif
#else
- gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook),
+ gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook),
EOG_PROPERTIES_DIALOG_PAGE_EXIF);
#endif
}
GObject *
-eog_properties_dialog_new (GtkWindow *parent,
+eog_properties_dialog_new (GtkWindow *parent,
EogThumbView *thumbview,
GtkAction *next_image_action,
GtkAction *previous_image_action)
@@ -701,15 +701,15 @@
g_return_val_if_fail (GTK_IS_ACTION (next_image_action), NULL);
g_return_val_if_fail (GTK_IS_ACTION (previous_image_action), NULL);
- prop_dlg = g_object_new (EOG_TYPE_PROPERTIES_DIALOG,
+ prop_dlg = g_object_new (EOG_TYPE_PROPERTIES_DIALOG,
"parent-window", parent,
"thumbview", thumbview,
NULL);
- gtk_action_connect_proxy (next_image_action,
+ gtk_action_connect_proxy (next_image_action,
EOG_PROPERTIES_DIALOG (prop_dlg)->priv->next_button);
- gtk_action_connect_proxy (previous_image_action,
+ gtk_action_connect_proxy (previous_image_action,
EOG_PROPERTIES_DIALOG (prop_dlg)->priv->previous_button);
return prop_dlg;
Modified: trunk/src/eog-properties-dialog.h
==============================================================================
--- trunk/src/eog-properties-dialog.h (original)
+++ trunk/src/eog-properties-dialog.h Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - Image Properties Dialog
+/* Eye Of Gnome - Image Properties Dialog
*
* Copyright (C) 2006 The Free Software Foundation
*
Modified: trunk/src/eog-python-module.c
==============================================================================
--- trunk/src/eog-python-module.c (original)
+++ trunk/src/eog-python-module.c Mon Oct 27 19:33:42 2008
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -71,7 +71,7 @@
PyObject *main_module, *main_locals, *locals, *key, *value;
PyObject *module, *fromlist;
Py_ssize_t pos = 0;
-
+
g_return_val_if_fail (Py_IsInitialized (), FALSE);
main_module = PyImport_AddModule ("__main__");
@@ -91,14 +91,14 @@
Py_DECREF(path);
}
-
+
main_locals = PyModule_GetDict (main_module);
- /* We need a fromlist to be able to import modules with
+ /* We need a fromlist to be able to import modules with
* a '.' in the name. */
fromlist = PyTuple_New(0);
- module = PyImport_ImportModuleEx (priv->module, main_locals, main_locals, fromlist);
+ module = PyImport_ImportModuleEx (priv->module, main_locals, main_locals, fromlist);
Py_DECREF(fromlist);
@@ -128,7 +128,7 @@
EogPythonModulePrivate *priv = EOG_PYTHON_MODULE_GET_PRIVATE (module);
eog_debug_message (DEBUG_PLUGINS, "Unloading Python module");
-
+
priv->type = 0;
}
@@ -213,7 +213,7 @@
"The Python module to load for this plugin",
NULL,
G_PARAM_WRITABLE | G_PARAM_READABLE | G_PARAM_CONSTRUCT_ONLY));
-
+
g_object_class_install_property
(object_class,
PROP_PATH,
@@ -224,7 +224,7 @@
G_PARAM_WRITABLE | G_PARAM_READABLE | G_PARAM_CONSTRUCT_ONLY));
g_type_class_add_private (object_class, sizeof (EogPythonModulePrivate));
-
+
module_class->load = eog_python_module_load;
module_class->unload = eog_python_module_unload;
}
@@ -338,7 +338,7 @@
struct sigaction old_sigint;
gint res;
char *argv[] = { "eog", NULL };
-
+
static gboolean init_failed = FALSE;
if (init_failed) {
@@ -393,13 +393,13 @@
goto python_init_error;
}
- /* import gobject */
+ /* import gobject */
eog_init_pygobject ();
if (PyErr_Occurred ()) {
g_warning ("Error initializing Python interpreter: could not import pygobject.");
- goto python_init_error;
+ goto python_init_error;
}
/* import gtk */
@@ -410,7 +410,7 @@
goto python_init_error;
}
-
+
/* sys.path.insert(0, ...) for system-wide plugins */
sys_path = PySys_GetObject ("path");
path = PyString_FromString (EOG_PLUGIN_DIR "/");
@@ -425,16 +425,16 @@
pyeog_add_constants (eog, "EOG_");
/* eog version */
- tuple = Py_BuildValue("(iii)",
+ tuple = Py_BuildValue("(iii)",
EOG_MAJOR_VERSION,
EOG_MINOR_VERSION,
EOG_MICRO_VERSION);
PyDict_SetItemString(mdict, "version", tuple);
Py_DECREF(tuple);
-
+
/* Retrieve the Python type for eog.Plugin */
PyEogPlugin_Type = (PyTypeObject *) PyDict_GetItemString (mdict, "Plugin");
-
+
if (PyEogPlugin_Type == NULL) {
PyErr_Print ();
@@ -455,12 +455,12 @@
gettext_args = Py_BuildValue ("ss", GETTEXT_PACKAGE, EOG_LOCALE_DIR);
PyObject_CallObject (install, gettext_args);
Py_DECREF (gettext_args);
-
+
/* Python has been successfully initialized */
init_failed = FALSE;
-
+
return TRUE;
-
+
python_init_error:
g_warning ("Please check the installation of all the Python related packages required "
@@ -483,7 +483,7 @@
}
while (PyGC_Collect ())
- ;
+ ;
Py_Finalize ();
}
Modified: trunk/src/eog-python-module.h
==============================================================================
--- trunk/src/eog-python-module.h (original)
+++ trunk/src/eog-python-module.h Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Python Module
+/* Eye Of Gnome - Python Module
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-python-module.h) by:
+ * Based on gedit code (gedit/gedit-python-module.h) by:
* - Raphael Slinckx <raphael slinckx net>
*
* This program is free software; you can redistribute it and/or modify
Modified: trunk/src/eog-python-plugin.c
==============================================================================
--- trunk/src/eog-python-plugin.c (original)
+++ trunk/src/eog-python-plugin.c Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Python Plugin
+/* Eye Of Gnome - Python Plugin
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-python-module.h) by:
+ * Based on gedit code (gedit/gedit-python-module.h) by:
* - Raphael Slinckx <raphael slinckx net>
*
* This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,7 @@
"(N)",
pygobject_new (G_OBJECT (window)));
}
-
+
if (!py_ret)
PyErr_Print ();
@@ -91,10 +91,10 @@
PyGILState_STATE state = pyg_gil_state_ensure ();
EogPythonPlugin *pyplugin = (EogPythonPlugin *) plugin;
-
+
if (PyObject_HasAttrString (pyplugin->instance, "update_ui")) {
PyObject *py_ret = call_python_method (pyplugin, window, "update_ui");
-
+
if (py_ret)
{
Py_XDECREF (py_ret);
@@ -113,10 +113,10 @@
PyGILState_STATE state = pyg_gil_state_ensure ();
EogPythonPlugin *pyplugin = (EogPythonPlugin *) plugin;
-
- if (PyObject_HasAttrString (pyplugin->instance, "deactivate")) {
+
+ if (PyObject_HasAttrString (pyplugin->instance, "deactivate")) {
PyObject *py_ret = call_python_method (pyplugin, window, "deactivate");
-
+
if (py_ret) {
Py_XDECREF (py_ret);
}
@@ -134,7 +134,7 @@
PyGILState_STATE state = pyg_gil_state_ensure ();
EogPythonPlugin *pyplugin = (EogPythonPlugin *) plugin;
-
+
if (PyObject_HasAttrString (pyplugin->instance, "activate")) {
PyObject *py_ret = call_python_method (pyplugin, window, "activate");
@@ -143,7 +143,7 @@
}
} else {
EOG_PLUGIN_CLASS (parent_class)->activate (plugin, window);
- }
+ }
pyg_gil_state_release (state);
}
@@ -154,10 +154,10 @@
PyGILState_STATE state = pyg_gil_state_ensure ();
EogPythonPlugin *pyplugin = (EogPythonPlugin *) plugin;
GtkWidget *ret = NULL;
-
+
if (PyObject_HasAttrString (pyplugin->instance, "create_configure_dialog")) {
PyObject *py_ret = call_python_method (pyplugin, NULL, "create_configure_dialog");
-
+
if (py_ret) {
if (check_py_object_is_gtk_widget (py_ret)) {
ret = GTK_WIDGET (pygobject_get (py_ret));
@@ -166,12 +166,12 @@
PyErr_SetString(PyExc_TypeError, "Return value for create_configure_dialog is not a GtkWidget");
PyErr_Print();
}
-
+
Py_DECREF (py_ret);
}
} else {
ret = EOG_PLUGIN_CLASS (parent_class)->create_configure_dialog (plugin);
- }
+ }
pyg_gil_state_release (state);
@@ -185,23 +185,23 @@
EogPythonPlugin *pyplugin = (EogPythonPlugin *) plugin;
- PyObject *dict = pyplugin->instance->ob_type->tp_dict;
+ PyObject *dict = pyplugin->instance->ob_type->tp_dict;
gboolean result;
-
+
if (dict == NULL)
result = FALSE;
else if (!PyDict_Check(dict))
result = FALSE;
- else
+ else
result = PyDict_GetItemString(dict, "create_configure_dialog") != NULL;
pyg_gil_state_release (state);
-
+
return result;
}
-
-static void
+
+static void
eog_python_plugin_init (EogPythonPlugin *plugin)
{
EogPythonPluginClass *class;
@@ -246,7 +246,7 @@
}
GType
-eog_python_plugin_get_type (GTypeModule *module,
+eog_python_plugin_get_type (GTypeModule *module,
PyObject *type)
{
GType gtype;
@@ -271,7 +271,7 @@
eog_debug_message (DEBUG_PLUGINS, "Registering Python plugin instance: %s", type_name);
- gtype = g_type_module_register_type (module,
+ gtype = g_type_module_register_type (module,
EOG_TYPE_PLUGIN,
type_name,
&info, 0);
Modified: trunk/src/eog-python-plugin.h
==============================================================================
--- trunk/src/eog-python-plugin.h (original)
+++ trunk/src/eog-python-plugin.h Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Python Plugin
+/* Eye Of Gnome - Python Plugin
*
* Copyright (C) 2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-python-module.h) by:
+ * Based on gedit code (gedit/gedit-python-module.h) by:
* - Raphael Slinckx <raphael slinckx net>
*
* This program is free software; you can redistribute it and/or modify
Modified: trunk/src/eog-save-as-dialog-helper.c
==============================================================================
--- trunk/src/eog-save-as-dialog-helper.c (original)
+++ trunk/src/eog-save-as-dialog-helper.c Mon Oct 27 19:33:42 2008
@@ -29,7 +29,7 @@
GdkPixbufFormat *format;
GtkTreeModel *store;
GtkTreeIter iter;
-
+
gtk_combo_box_get_active_iter (combobox, &iter);
store = gtk_combo_box_get_model (combobox);
gtk_tree_model_get (store, &iter, 1, &format, -1);
@@ -46,7 +46,7 @@
gboolean convert_spaces;
gulong counter_start;
GdkPixbufFormat *format;
-
+
data = g_object_get_data (G_OBJECT (user_data), "data");
g_assert (data != NULL);
@@ -54,9 +54,9 @@
/* obtain required dialog data */
token_str = gtk_entry_get_text (GTK_ENTRY (data->token_entry));
- convert_spaces = gtk_toggle_button_get_active
+ convert_spaces = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (data->replace_spaces_check));
- counter_start = gtk_spin_button_get_value_as_int
+ counter_start = gtk_spin_button_get_value_as_int
(GTK_SPIN_BUTTON (data->counter_spin));
format = get_selected_format (GTK_COMBO_BOX (data->format_combobox));
@@ -64,7 +64,7 @@
if (token_str != NULL) {
/* generate preview filename */
preview_str = eog_uri_converter_preview (token_str, data->image, format,
- (counter_start + data->nth_image),
+ (counter_start + data->nth_image),
data->n_images,
convert_spaces, '_' /* FIXME: make this editable */);
}
@@ -82,7 +82,7 @@
request_preview_update (GtkWidget *dlg)
{
SaveAsData *data;
-
+
data = g_object_get_data (G_OBJECT (dlg), "data");
g_assert (data != NULL);
@@ -210,7 +210,7 @@
GtkWidget *dlg;
SaveAsData *data;
GtkWidget *label;
-
+
filepath = g_build_filename (EOG_DATA_DIR,
"eog-multiple-save-as-dialog.ui",
NULL);
@@ -218,7 +218,7 @@
xml = gtk_builder_new ();
gtk_builder_set_translation_domain (xml, GETTEXT_PACKAGE);
g_assert (gtk_builder_add_from_file (xml, filepath, NULL));
-
+
g_free (filepath);
dlg = GTK_WIDGET (g_object_ref (gtk_builder_get_object (xml, "eog_multiple_save_as_dialog")));
@@ -264,13 +264,13 @@
gtk_label_set_text (GTK_LABEL (label), eog_image_get_caption (data->image));
prepare_format_combobox (data);
-
+
set_default_values (dlg, base_file);
g_object_unref (xml);
return dlg;
}
-EogURIConverter*
+EogURIConverter*
eog_save_as_dialog_get_converter (GtkWidget *dlg)
{
EogURIConverter *conv;
@@ -289,10 +289,10 @@
/* obtain required dialog data */
format_str = gtk_entry_get_text (GTK_ENTRY (data->token_entry));
- convert_spaces = gtk_toggle_button_get_active
+ convert_spaces = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (data->replace_spaces_check));
- counter_start = gtk_spin_button_get_value_as_int
+ counter_start = gtk_spin_button_get_value_as_int
(GTK_SPIN_BUTTON (data->counter_spin));
format = get_selected_format (GTK_COMBO_BOX (data->format_combobox));
Modified: trunk/src/eog-scroll-view.c
==============================================================================
--- trunk/src/eog-scroll-view.c (original)
+++ trunk/src/eog-scroll-view.c Mon Oct 27 19:33:42 2008
@@ -383,7 +383,7 @@
gtk_widget_size_request (priv->vbar, &req);
bar_width = req.width;
- eog_debug_message (DEBUG_WINDOW, "Widget Size allocate: %i, %i Bar: %i, %i\n",
+ eog_debug_message (DEBUG_WINDOW, "Widget Size allocate: %i, %i Bar: %i, %i\n",
width, height, bar_width, bar_height);
hbar_visible = vbar_visible = FALSE;
@@ -428,7 +428,7 @@
return DOUBLE_EQUAL (priv->zoom, 1.0);
}
-/* Returns wether the image is movable, that means if it is larger then
+/* Returns wether the image is movable, that means if it is larger then
* the actual visible area.
*/
static gboolean
@@ -541,7 +541,7 @@
paint_background (view, &r, rect);
return;
}
-
+
/* Compute image offsets with respect to the window */
if (scaled_width <= width)
@@ -554,7 +554,7 @@
else
yofs = -priv->yofs;
- eog_debug_message (DEBUG_WINDOW, "zoom %.2f, xofs: %i, yofs: %i scaled w: %i h: %i\n",
+ eog_debug_message (DEBUG_WINDOW, "zoom %.2f, xofs: %i, yofs: %i scaled w: %i h: %i\n",
priv->zoom, xofs, yofs, scaled_width, scaled_height);
/* Draw background if necessary, in four steps */
@@ -623,7 +623,7 @@
str = "ALIASED";
}
- eog_debug_message (DEBUG_WINDOW, "%s: x0: %i,\t y0: %i,\t x1: %i,\t y1: %i\n",
+ eog_debug_message (DEBUG_WINDOW, "%s: x0: %i,\t y0: %i,\t x1: %i,\t y1: %i\n",
str, d.x0, d.y0, d.x1, d.y1);
/* Short-circuit the fast case to avoid a memcpy() */
@@ -757,7 +757,7 @@
priv = view->priv;
- eog_debug_message (DEBUG_WINDOW, "x: %i, y: %i, width: %i, height: %i\n",
+ eog_debug_message (DEBUG_WINDOW, "x: %i, y: %i, width: %i, height: %i\n",
area->x, area->y, area->width, area->height);
if (!GTK_WIDGET_DRAWABLE (priv->display))
@@ -960,7 +960,7 @@
set_minimum_zoom_factor (EogScrollView *view)
{
g_return_if_fail (EOG_IS_SCROLL_VIEW (view));
-
+
view->priv->min_zoom = MAX (1.0 / gdk_pixbuf_get_width (view->priv->pixbuf),
MAX(1.0 / gdk_pixbuf_get_height (view->priv->pixbuf),
MIN_ZOOM_FACTOR) );
@@ -1229,7 +1229,7 @@
switch (event->button) {
case 1:
case 2:
- if (event->button == 1 && !priv->scroll_wheel_zoom &&
+ if (event->button == 1 && !priv->scroll_wheel_zoom &&
!(event->state & GDK_CONTROL_MASK))
break;
@@ -1525,7 +1525,7 @@
view = (EogScrollView*) data;
priv = view->priv;
- eog_debug_message (DEBUG_IMAGE_LOAD, "x: %i, y: %i, width: %i, height: %i\n",
+ eog_debug_message (DEBUG_IMAGE_LOAD, "x: %i, y: %i, width: %i, height: %i\n",
x, y, width, height);
if (priv->pixbuf == NULL) {
@@ -1572,7 +1572,7 @@
else if (priv->interp_type != GDK_INTERP_NEAREST &&
!is_unity_zoom (view))
{
- // paint antialiased image version
+ // paint antialiased image version
priv->progressive_state = PROGRESSIVE_POLISHING;
gtk_widget_queue_draw (GTK_WIDGET (priv->display));
}
@@ -1835,7 +1835,7 @@
set_minimum_zoom_factor (view);
- return DOUBLE_EQUAL (view->priv->zoom, MIN_ZOOM_FACTOR) ||
+ return DOUBLE_EQUAL (view->priv->zoom, MIN_ZOOM_FACTOR) ||
DOUBLE_EQUAL (view->priv->zoom, view->priv->min_zoom);
}
@@ -1892,14 +1892,14 @@
priv->image_changed_id = g_signal_connect (image, "changed",
(GCallback) image_changed_cb, view);
}
-
+
priv->image = image;
}
-gboolean
+gboolean
eog_scroll_view_scrollbars_visible (EogScrollView *view)
{
- if (!GTK_WIDGET_VISIBLE (GTK_WIDGET (view->priv->hbar)) &&
+ if (!GTK_WIDGET_VISIBLE (GTK_WIDGET (view->priv->hbar)) &&
!GTK_WIDGET_VISIBLE (GTK_WIDGET (view->priv->vbar)))
return FALSE;
@@ -1945,7 +1945,7 @@
view = EOG_SCROLL_VIEW (object);
priv = view->priv;
-
+
if (priv->uta != NULL) {
art_uta_free (priv->uta);
priv->uta = NULL;
@@ -2121,14 +2121,14 @@
return widget;
}
-static void
+static void
eog_scroll_view_popup_menu (EogScrollView *view, GdkEventButton *event)
{
GtkWidget *popup;
int button, event_time;
popup = view->priv->menu;
-
+
if (event) {
button = event->button;
event_time = event->time;
@@ -2136,15 +2136,15 @@
button = 0;
event_time = gtk_get_current_event_time ();
}
-
- gtk_menu_popup (GTK_MENU (popup), NULL, NULL, NULL, NULL,
+
+ gtk_menu_popup (GTK_MENU (popup), NULL, NULL, NULL, NULL,
button, event_time);
}
static gboolean
-view_on_button_press_event_cb (GtkWidget *view, GdkEventButton *event,
+view_on_button_press_event_cb (GtkWidget *view, GdkEventButton *event,
gpointer user_data)
-{
+{
/* Ignore double-clicks and triple-clicks */
if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
{
@@ -2152,7 +2152,7 @@
return TRUE;
}
-
+
return FALSE;
}
@@ -2165,8 +2165,8 @@
view->priv->menu = g_object_ref (menu);
- gtk_menu_attach_to_widget (GTK_MENU (view->priv->menu),
- GTK_WIDGET (view),
+ gtk_menu_attach_to_widget (GTK_MENU (view->priv->menu),
+ GTK_WIDGET (view),
NULL);
g_signal_connect (G_OBJECT (view), "button_press_event",
@@ -2183,7 +2183,7 @@
}
void
-eog_scroll_view_set_scroll_wheel_zoom (EogScrollView *view,
+eog_scroll_view_set_scroll_wheel_zoom (EogScrollView *view,
gboolean scroll_wheel_zoom)
{
g_return_if_fail (EOG_IS_SCROLL_VIEW (view));
@@ -2192,7 +2192,7 @@
}
void
-eog_scroll_view_set_zoom_multiplier (EogScrollView *view,
+eog_scroll_view_set_zoom_multiplier (EogScrollView *view,
gdouble zoom_multiplier)
{
g_return_if_fail (EOG_IS_SCROLL_VIEW (view));
Modified: trunk/src/eog-session.c
==============================================================================
--- trunk/src/eog-session.c (original)
+++ trunk/src/eog-session.c Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Session Handler
+/* Eye Of Gnome - Session Handler
*
* Copyright (C) 2006 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-session.h) by:
+ * Based on gedit code (gedit/gedit-session.h) by:
* - Gedit Team
* - Federico Mena-Quintero <federico ximian com>
*
@@ -56,7 +56,7 @@
client = gnome_master_client ();
g_signal_connect (client, "save_yourself",
- G_CALLBACK (save_session), application);
+ G_CALLBACK (save_session), application);
g_signal_connect (client, "die",
G_CALLBACK (removed_from_session), application);
}
Modified: trunk/src/eog-session.h
==============================================================================
--- trunk/src/eog-session.h (original)
+++ trunk/src/eog-session.h Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Session Handler
+/* Eye Of Gnome - Session Handler
*
* Copyright (C) 2006 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on gedit code (gedit/gedit-session.h) by:
+ * Based on gedit code (gedit/gedit-session.h) by:
* - Gedit Team
* - Federico Mena-Quintero <federico ximian com>
*
Modified: trunk/src/eog-sidebar.c
==============================================================================
--- trunk/src/eog-sidebar.c (original)
+++ trunk/src/eog-sidebar.c Mon Oct 27 19:33:42 2008
@@ -5,7 +5,7 @@
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on evince code (shell/ev-sidebar.c) by:
+ * Based on evince code (shell/ev-sidebar.c) by:
* - Jonathan Blandford <jrb alum mit edu>
*
* This program is free software; you can redistribute it and/or modify
@@ -78,12 +78,12 @@
gtk_menu_detach (GTK_MENU (eog_sidebar->priv->menu));
eog_sidebar->priv->menu = NULL;
}
-
+
if (eog_sidebar->priv->page_model) {
g_object_unref (eog_sidebar->priv->page_model);
eog_sidebar->priv->page_model = NULL;
}
-
+
(* GTK_OBJECT_CLASS (eog_sidebar_parent_class)->destroy) (object);
}
@@ -94,7 +94,7 @@
gint index;
gtk_tree_model_get (eog_sidebar->priv->page_model, iter,
- PAGE_COLUMN_TITLE, &title,
+ PAGE_COLUMN_TITLE, &title,
PAGE_COLUMN_NOTEBOOK_INDEX, &index,
-1);
@@ -112,14 +112,14 @@
gboolean valid;
valid = gtk_tree_model_get_iter_first (eog_sidebar->priv->page_model, &iter);
-
+
while (valid) {
GtkWidget *widget;
gtk_tree_model_get (eog_sidebar->priv->page_model, &iter,
PAGE_COLUMN_MAIN_WIDGET, &widget,
-1);
-
+
if (widget == main_widget) {
eog_sidebar_select_page (eog_sidebar, &iter);
valid = FALSE;
@@ -152,7 +152,7 @@
switch (prop_id) {
case PROP_CURRENT_PAGE:
- eog_sidebar_set_page (sidebar, g_value_get_object (value));
+ eog_sidebar_set_page (sidebar, g_value_get_object (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -182,13 +182,13 @@
GObjectClass *g_object_class;
GtkWidgetClass *widget_class;
GtkObjectClass *gtk_object_klass;
-
+
g_object_class = G_OBJECT_CLASS (eog_sidebar_class);
widget_class = GTK_WIDGET_CLASS (eog_sidebar_class);
gtk_object_klass = GTK_OBJECT_CLASS (eog_sidebar_class);
-
+
g_type_class_add_private (g_object_class, sizeof (EogSidebarPrivate));
-
+
gtk_object_klass->destroy = eog_sidebar_destroy;
g_object_class->get_property = eog_sidebar_get_property;
g_object_class->set_property = eog_sidebar_set_property;
@@ -237,12 +237,12 @@
g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data));
widget = GTK_WIDGET (user_data);
-
+
gdk_window_get_origin (widget->window, x, y);
-
+
*x += widget->allocation.x;
*y += widget->allocation.y + widget->allocation.height;
-
+
*push_in = FALSE;
}
@@ -256,16 +256,16 @@
if (event->button == 1) {
GtkRequisition requisition;
gint width;
-
+
width = widget->allocation.width;
gtk_widget_set_size_request (eog_sidebar->priv->menu, -1, -1);
gtk_widget_size_request (eog_sidebar->priv->menu, &requisition);
gtk_widget_set_size_request (eog_sidebar->priv->menu,
MAX (width, requisition.width), -1);
-
+
gtk_widget_grab_focus (widget);
-
+
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
gtk_menu_popup (GTK_MENU (eog_sidebar->priv->menu),
@@ -284,7 +284,7 @@
gpointer user_data)
{
EogSidebar *eog_sidebar = EOG_SIDEBAR (user_data);
-
+
if (event->keyval == GDK_space ||
event->keyval == GDK_KP_Space ||
event->keyval == GDK_Return ||
@@ -317,7 +317,7 @@
GtkWidget *menu_button;
menu_button = GTK_WIDGET (user_data);
-
+
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (menu_button), FALSE);
}
@@ -326,7 +326,7 @@
GtkMenu *menu)
{
EogSidebar *eog_sidebar = EOG_SIDEBAR (widget);
-
+
eog_sidebar->priv->menu = NULL;
}
@@ -341,12 +341,12 @@
menu_item = gtk_menu_get_active (GTK_MENU (eog_sidebar->priv->menu));
valid = gtk_tree_model_get_iter_first (eog_sidebar->priv->page_model, &iter);
-
+
while (valid) {
gtk_tree_model_get (eog_sidebar->priv->page_model, &iter,
PAGE_COLUMN_MENU_ITEM, &item,
-1);
-
+
if (item == menu_item) {
eog_sidebar_select_page (eog_sidebar, &iter);
valid = FALSE;
@@ -386,7 +386,7 @@
gtk_widget_show (hbox);
eog_sidebar->priv->select_button = gtk_toggle_button_new ();
- gtk_button_set_relief (GTK_BUTTON (eog_sidebar->priv->select_button),
+ gtk_button_set_relief (GTK_BUTTON (eog_sidebar->priv->select_button),
GTK_RELIEF_NONE);
g_signal_connect (eog_sidebar->priv->select_button, "button_press_event",
@@ -424,15 +424,15 @@
g_signal_connect (close_button, "clicked",
G_CALLBACK (eog_sidebar_close_clicked_cb),
eog_sidebar);
-
+
image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,
GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (close_button), image);
gtk_widget_show (image);
-
+
gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
gtk_widget_show (close_button);
-
+
eog_sidebar->priv->menu = gtk_menu_new ();
g_signal_connect (eog_sidebar->priv->menu, "deactivate",
@@ -475,13 +475,13 @@
GtkWidget *menu_item;
gchar *label_title;
gint index;
-
+
g_return_if_fail (EOG_IS_SIDEBAR (eog_sidebar));
g_return_if_fail (GTK_IS_WIDGET (main_widget));
-
+
index = gtk_notebook_append_page (GTK_NOTEBOOK (eog_sidebar->priv->notebook),
main_widget, NULL);
-
+
menu_item = gtk_image_menu_item_new_with_label (title);
g_signal_connect (menu_item, "activate",
@@ -503,7 +503,7 @@
-1);
gtk_list_store_move_before (GTK_LIST_STORE(eog_sidebar->priv->page_model),
- &iter,
+ &iter,
NULL);
/* Set the first item added as active */
@@ -523,7 +523,7 @@
g_free (label_title);
- g_signal_emit (G_OBJECT (eog_sidebar),
+ g_signal_emit (G_OBJECT (eog_sidebar),
signals[SIGNAL_PAGE_ADDED], 0, main_widget);
}
@@ -539,18 +539,18 @@
g_return_if_fail (GTK_IS_WIDGET (main_widget));
valid = gtk_tree_model_get_iter_first (eog_sidebar->priv->page_model, &iter);
-
+
while (valid) {
gtk_tree_model_get (eog_sidebar->priv->page_model, &iter,
PAGE_COLUMN_NOTEBOOK_INDEX, &index,
PAGE_COLUMN_MENU_ITEM, &menu_item,
PAGE_COLUMN_MAIN_WIDGET, &widget,
-1);
-
+
if (widget == main_widget) {
break;
} else {
- valid = gtk_tree_model_iter_next (eog_sidebar->priv->page_model,
+ valid = gtk_tree_model_iter_next (eog_sidebar->priv->page_model,
&iter);
}
@@ -559,15 +559,15 @@
}
if (valid) {
- gtk_notebook_remove_page (GTK_NOTEBOOK (eog_sidebar->priv->notebook),
+ gtk_notebook_remove_page (GTK_NOTEBOOK (eog_sidebar->priv->notebook),
index);
gtk_container_remove (GTK_CONTAINER (eog_sidebar->priv->menu), menu_item);
- gtk_list_store_remove (GTK_LIST_STORE (eog_sidebar->priv->page_model),
+ gtk_list_store_remove (GTK_LIST_STORE (eog_sidebar->priv->page_model),
&iter);
- g_signal_emit (G_OBJECT (eog_sidebar),
+ g_signal_emit (G_OBJECT (eog_sidebar),
signals[SIGNAL_PAGE_REMOVED], 0, main_widget);
}
}
Modified: trunk/src/eog-sidebar.h
==============================================================================
--- trunk/src/eog-sidebar.h (original)
+++ trunk/src/eog-sidebar.h Mon Oct 27 19:33:42 2008
@@ -5,7 +5,7 @@
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on evince code (shell/ev-sidebar.h) by:
+ * Based on evince code (shell/ev-sidebar.h) by:
* - Jonathan Blandford <jrb alum mit edu>
*
* This program is free software; you can redistribute it and/or modify
@@ -50,10 +50,10 @@
struct _EogSidebarClass {
GtkVBoxClass base_class;
- void (* page_added) (EogSidebar *eog_sidebar,
+ void (* page_added) (EogSidebar *eog_sidebar,
GtkWidget *main_widget);
- void (* page_removed) (EogSidebar *eog_sidebar,
+ void (* page_removed) (EogSidebar *eog_sidebar,
GtkWidget *main_widget);
};
Modified: trunk/src/eog-statusbar.c
==============================================================================
--- trunk/src/eog-statusbar.c (original)
+++ trunk/src/eog-statusbar.c Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye of Gnome - Statusbar
+/* Eye of Gnome - Statusbar
*
* Copyright (C) 2000-2006 The Free Software Foundation
*
@@ -35,7 +35,7 @@
G_DEFINE_TYPE (EogStatusbar, eog_statusbar, GTK_TYPE_STATUSBAR)
-struct _EogStatusbarPrivate
+struct _EogStatusbarPrivate
{
GtkWidget *progressbar;
GtkWidget *img_num_statusbar;
@@ -67,24 +67,24 @@
gtk_box_pack_end (GTK_BOX (statusbar),
priv->img_num_statusbar,
- FALSE,
- TRUE,
+ FALSE,
+ TRUE,
0);
vbox = gtk_vbox_new (FALSE, 0);
gtk_box_pack_end (GTK_BOX (statusbar),
vbox,
- FALSE,
- FALSE,
+ FALSE,
+ FALSE,
2);
statusbar->priv->progressbar = gtk_progress_bar_new ();
gtk_box_pack_end (GTK_BOX (vbox),
priv->progressbar,
- TRUE,
- TRUE,
+ TRUE,
+ TRUE,
2);
gtk_widget_set_size_request (priv->progressbar, -1, 10);
@@ -142,6 +142,6 @@
{
g_return_if_fail (EOG_IS_STATUSBAR (statusbar));
- gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (statusbar),
+ gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (statusbar),
has_resize_grip);
}
Modified: trunk/src/eog-statusbar.h
==============================================================================
--- trunk/src/eog-statusbar.h (original)
+++ trunk/src/eog-statusbar.h Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye of Gnome - Statusbar
+/* Eye of Gnome - Statusbar
*
* Copyright (C) 2000-2006 The Free Software Foundation
*
@@ -40,14 +40,14 @@
#define EOG_IS_STATUSBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EOG_TYPE_STATUSBAR))
#define EOG_STATUSBAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EOG_TYPE_STATUSBAR, EogStatusbarClass))
-struct _EogStatusbar
+struct _EogStatusbar
{
GtkStatusbar parent;
EogStatusbarPrivate *priv;
};
-struct _EogStatusbarClass
+struct _EogStatusbarClass
{
GtkStatusbarClass parent_class;
};
Modified: trunk/src/eog-thumb-nav.c
==============================================================================
--- trunk/src/eog-thumb-nav.c (original)
+++ trunk/src/eog-thumb-nav.c Mon Oct 27 19:33:42 2008
@@ -39,7 +39,7 @@
#define EOG_THUMB_NAV_SCROLL_INC 20
#define EOG_THUMB_NAV_SCROLL_MOVE 20
-#define EOG_THUMB_NAV_SCROLL_TIMEOUT 20
+#define EOG_THUMB_NAV_SCROLL_TIMEOUT 20
enum
{
@@ -75,7 +75,7 @@
switch (event->direction) {
case GDK_SCROLL_UP:
case GDK_SCROLL_LEFT:
- inc *= -1;
+ inc *= -1;
break;
case GDK_SCROLL_DOWN:
@@ -121,7 +121,7 @@
gtk_widget_set_sensitive (priv->button_left, adj->value > 0);
- gtk_widget_set_sensitive (priv->button_right,
+ gtk_widget_set_sensitive (priv->button_right,
adj->value < adj->upper - adj->page_size);
}
@@ -145,7 +145,7 @@
if ((gint) (nav->priv->adj->value + (gdouble) delta) >= 0 &&
(gint) (nav->priv->adj->value + (gdouble) delta) <= nav->priv->adj->upper - nav->priv->adj->page_size) {
- nav->priv->adj->value += (gdouble) delta;
+ nav->priv->adj->value += (gdouble) delta;
nav->priv->scroll_pos++;
gtk_adjustment_value_changed (nav->priv->adj);
} else {
@@ -155,12 +155,12 @@
nav->priv->adj->value = 0;
nav->priv->scroll_pos = 0;
-
+
gtk_adjustment_value_changed (nav->priv->adj);
return FALSE;
}
-
+
return TRUE;
}
@@ -179,8 +179,8 @@
{
nav->priv->scroll_dir = (GTK_WIDGET (button) == nav->priv->button_right);
- nav->priv->scroll_id = g_timeout_add (EOG_THUMB_NAV_SCROLL_TIMEOUT,
- eog_thumb_nav_scroll_step,
+ nav->priv->scroll_id = g_timeout_add (EOG_THUMB_NAV_SCROLL_TIMEOUT,
+ eog_thumb_nav_scroll_step,
nav);
}
@@ -194,10 +194,10 @@
}
}
-static void
-eog_thumb_nav_get_property (GObject *object,
- guint property_id,
- GValue *value,
+static void
+eog_thumb_nav_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
GParamSpec *pspec)
{
EogThumbNav *nav = EOG_THUMB_NAV (object);
@@ -205,7 +205,7 @@
switch (property_id)
{
case PROP_SHOW_BUTTONS:
- g_value_set_boolean (value,
+ g_value_set_boolean (value,
eog_thumb_nav_get_show_buttons (nav));
break;
@@ -214,16 +214,16 @@
break;
case PROP_MODE:
- g_value_set_int (value,
+ g_value_set_int (value,
eog_thumb_nav_get_mode (nav));
break;
}
}
-static void
-eog_thumb_nav_set_property (GObject *object,
- guint property_id,
- const GValue *value,
+static void
+eog_thumb_nav_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
GParamSpec *pspec)
{
EogThumbNav *nav = EOG_THUMB_NAV (object);
@@ -231,17 +231,17 @@
switch (property_id)
{
case PROP_SHOW_BUTTONS:
- eog_thumb_nav_set_show_buttons (nav,
+ eog_thumb_nav_set_show_buttons (nav,
g_value_get_boolean (value));
break;
case PROP_THUMB_VIEW:
- nav->priv->thumbview =
+ nav->priv->thumbview =
GTK_WIDGET (g_value_get_object (value));
break;
case PROP_MODE:
- eog_thumb_nav_set_mode (nav,
+ eog_thumb_nav_set_mode (nav,
g_value_get_int (value));
break;
}
@@ -292,7 +292,7 @@
"The internal thumbnail viewer widget",
EOG_TYPE_THUMB_VIEW,
(G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_READABLE |
+ G_PARAM_READABLE |
G_PARAM_WRITABLE)));
g_object_class_install_property (g_object_class,
@@ -325,55 +325,55 @@
priv->button_left = gtk_button_new ();
gtk_button_set_relief (GTK_BUTTON (priv->button_left), GTK_RELIEF_NONE);
- arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_ETCHED_IN);
+ arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_ETCHED_IN);
gtk_container_add (GTK_CONTAINER (priv->button_left), arrow);
gtk_widget_set_size_request (GTK_WIDGET (priv->button_left), 25, 0);
gtk_box_pack_start (GTK_BOX (nav), priv->button_left, FALSE, FALSE, 0);
- g_signal_connect (priv->button_left,
- "clicked",
- G_CALLBACK (eog_thumb_nav_button_clicked),
+ g_signal_connect (priv->button_left,
+ "clicked",
+ G_CALLBACK (eog_thumb_nav_button_clicked),
nav);
- g_signal_connect (priv->button_left,
- "pressed",
- G_CALLBACK (eog_thumb_nav_start_scroll),
+ g_signal_connect (priv->button_left,
+ "pressed",
+ G_CALLBACK (eog_thumb_nav_start_scroll),
nav);
- g_signal_connect (priv->button_left,
- "released",
- G_CALLBACK (eog_thumb_nav_stop_scroll),
+ g_signal_connect (priv->button_left,
+ "released",
+ G_CALLBACK (eog_thumb_nav_stop_scroll),
nav);
priv->sw = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_set_name (GTK_SCROLLED_WINDOW (priv->sw)->hscrollbar,
+ gtk_widget_set_name (GTK_SCROLLED_WINDOW (priv->sw)->hscrollbar,
"eog-image-collection-scrollbar");
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->sw),
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->sw),
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->sw),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_NEVER);
- g_signal_connect (priv->sw,
- "scroll-event",
- G_CALLBACK (eog_thumb_nav_scroll_event),
+ g_signal_connect (priv->sw,
+ "scroll-event",
+ G_CALLBACK (eog_thumb_nav_scroll_event),
nav);
priv->adj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->sw));
- g_signal_connect (priv->adj,
- "changed",
- G_CALLBACK (eog_thumb_nav_adj_changed),
+ g_signal_connect (priv->adj,
+ "changed",
+ G_CALLBACK (eog_thumb_nav_adj_changed),
nav);
- g_signal_connect (priv->adj,
- "value-changed",
- G_CALLBACK (eog_thumb_nav_adj_value_changed),
+ g_signal_connect (priv->adj,
+ "value-changed",
+ G_CALLBACK (eog_thumb_nav_adj_value_changed),
nav);
gtk_box_pack_start (GTK_BOX (nav), priv->sw, TRUE, TRUE, 0);
@@ -381,26 +381,26 @@
priv->button_right = gtk_button_new ();
gtk_button_set_relief (GTK_BUTTON (priv->button_right), GTK_RELIEF_NONE);
- arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+ arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
gtk_container_add (GTK_CONTAINER (priv->button_right), arrow);
gtk_widget_set_size_request (GTK_WIDGET (priv->button_right), 25, 0);
gtk_box_pack_start (GTK_BOX (nav), priv->button_right, FALSE, FALSE, 0);
- g_signal_connect (priv->button_right,
- "clicked",
- G_CALLBACK (eog_thumb_nav_button_clicked),
+ g_signal_connect (priv->button_right,
+ "clicked",
+ G_CALLBACK (eog_thumb_nav_button_clicked),
nav);
- g_signal_connect (priv->button_right,
- "pressed",
- G_CALLBACK (eog_thumb_nav_start_scroll),
+ g_signal_connect (priv->button_right,
+ "pressed",
+ G_CALLBACK (eog_thumb_nav_start_scroll),
nav);
- g_signal_connect (priv->button_right,
- "released",
- G_CALLBACK (eog_thumb_nav_stop_scroll),
+ g_signal_connect (priv->button_right,
+ "released",
+ G_CALLBACK (eog_thumb_nav_stop_scroll),
nav);
gtk_adjustment_value_changed (priv->adj);
@@ -417,19 +417,19 @@
* Returns: a new #EogThumbNav object.
**/
GtkWidget *
-eog_thumb_nav_new (GtkWidget *thumbview,
- EogThumbNavMode mode,
+eog_thumb_nav_new (GtkWidget *thumbview,
+ EogThumbNavMode mode,
gboolean show_buttons)
{
GObject *nav;
- nav = g_object_new (EOG_TYPE_THUMB_NAV,
+ nav = g_object_new (EOG_TYPE_THUMB_NAV,
"show-buttons", show_buttons,
"mode", mode,
"thumbview", thumbview,
"homogeneous", FALSE,
"spacing", 0,
- NULL);
+ NULL);
return GTK_WIDGET (nav);
}
@@ -448,7 +448,7 @@
{
g_return_val_if_fail (EOG_IS_THUMB_NAV (nav), FALSE);
- return nav->priv->show_buttons;
+ return nav->priv->show_buttons;
}
/**
@@ -459,7 +459,7 @@
* Sets whether the navigation buttons to the left and right of the
* widget should be visible.
**/
-void
+void
eog_thumb_nav_set_show_buttons (EogThumbNav *nav, gboolean show_buttons)
{
g_return_if_fail (EOG_IS_THUMB_NAV (nav));
@@ -468,7 +468,7 @@
nav->priv->show_buttons = show_buttons;
- if (show_buttons &&
+ if (show_buttons &&
nav->priv->mode == EOG_THUMB_NAV_MODE_ONE_ROW) {
gtk_widget_show_all (nav->priv->button_left);
gtk_widget_show_all (nav->priv->button_right);
@@ -491,7 +491,7 @@
{
g_return_val_if_fail (EOG_IS_THUMB_NAV (nav), FALSE);
- return nav->priv->mode;
+ return nav->priv->mode;
}
/**
@@ -501,7 +501,7 @@
*
* Sets the navigation mode in @nav. See #EogThumbNavMode for details.
**/
-void
+void
eog_thumb_nav_set_mode (EogThumbNav *nav, EogThumbNavMode mode)
{
EogThumbNavPrivate *priv;
@@ -515,11 +515,11 @@
switch (mode)
{
case EOG_THUMB_NAV_MODE_ONE_ROW:
- gtk_icon_view_set_columns (GTK_ICON_VIEW (priv->thumbview),
+ gtk_icon_view_set_columns (GTK_ICON_VIEW (priv->thumbview),
G_MAXINT);
gtk_widget_set_size_request (priv->thumbview, -1, 123);
- eog_thumb_view_set_item_height (EOG_THUMB_VIEW (priv->thumbview),
+ eog_thumb_view_set_item_height (EOG_THUMB_VIEW (priv->thumbview),
115);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->sw),
@@ -534,7 +534,7 @@
gtk_icon_view_set_columns (GTK_ICON_VIEW (priv->thumbview), 1);
gtk_widget_set_size_request (priv->thumbview, 113, -1);
- eog_thumb_view_set_item_height (EOG_THUMB_VIEW (priv->thumbview),
+ eog_thumb_view_set_item_height (EOG_THUMB_VIEW (priv->thumbview),
-1);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->sw),
@@ -543,14 +543,14 @@
gtk_widget_hide_all (priv->button_left);
gtk_widget_hide_all (priv->button_right);
-
+
break;
case EOG_THUMB_NAV_MODE_MULTIPLE_ROWS:
gtk_icon_view_set_columns (GTK_ICON_VIEW (priv->thumbview), -1);
gtk_widget_set_size_request (priv->thumbview, -1, 220);
- eog_thumb_view_set_item_height (EOG_THUMB_VIEW (priv->thumbview),
+ eog_thumb_view_set_item_height (EOG_THUMB_VIEW (priv->thumbview),
-1);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->sw),
@@ -559,14 +559,14 @@
gtk_widget_hide_all (priv->button_left);
gtk_widget_hide_all (priv->button_right);
-
+
break;
case EOG_THUMB_NAV_MODE_MULTIPLE_COLUMNS:
gtk_icon_view_set_columns (GTK_ICON_VIEW (priv->thumbview), -1);
gtk_widget_set_size_request (priv->thumbview, 230, -1);
- eog_thumb_view_set_item_height (EOG_THUMB_VIEW (priv->thumbview),
+ eog_thumb_view_set_item_height (EOG_THUMB_VIEW (priv->thumbview),
-1);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->sw),
@@ -575,7 +575,7 @@
gtk_widget_hide_all (priv->button_left);
gtk_widget_hide_all (priv->button_right);
-
+
break;
}
}
Modified: trunk/src/eog-thumb-nav.h
==============================================================================
--- trunk/src/eog-thumb-nav.h (original)
+++ trunk/src/eog-thumb-nav.h Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - Thumbnail Navigator
+/* Eye Of Gnome - Thumbnail Navigator
*
* Copyright (C) 2006 The Free Software Foundation
*
@@ -61,17 +61,17 @@
GType eog_thumb_nav_get_type (void) G_GNUC_CONST;
GtkWidget *eog_thumb_nav_new (GtkWidget *thumbview,
- EogThumbNavMode mode,
+ EogThumbNavMode mode,
gboolean show_buttons);
gboolean eog_thumb_nav_get_show_buttons (EogThumbNav *nav);
-void eog_thumb_nav_set_show_buttons (EogThumbNav *nav,
+void eog_thumb_nav_set_show_buttons (EogThumbNav *nav,
gboolean show_buttons);
EogThumbNavMode eog_thumb_nav_get_mode (EogThumbNav *nav);
-void eog_thumb_nav_set_mode (EogThumbNav *nav,
+void eog_thumb_nav_set_mode (EogThumbNav *nav,
EogThumbNavMode mode);
G_END_DECLS
Modified: trunk/src/eog-thumb-view.c
==============================================================================
--- trunk/src/eog-thumb-view.c (original)
+++ trunk/src/eog-thumb-view.c Mon Oct 27 19:33:42 2008
@@ -47,7 +47,7 @@
static EogImage* eog_thumb_view_get_image_from_path (EogThumbView *thumbview,
GtkTreePath *path);
-static void eog_thumb_view_popup_menu (EogThumbView *widget,
+static void eog_thumb_view_popup_menu (EogThumbView *widget,
GdkEventButton *event);
struct _EogThumbViewPrivate {
@@ -70,7 +70,7 @@
EogThumbView *thumbview;
g_return_if_fail (EOG_IS_THUMB_VIEW (object));
thumbview = EOG_THUMB_VIEW (object);
-
+
G_OBJECT_CLASS (eog_thumb_view_parent_class)->finalize (object);
}
@@ -89,7 +89,7 @@
{
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
-
+
gobject_class->finalize = eog_thumb_view_finalize;
object_class->destroy = eog_thumb_view_destroy;
@@ -97,8 +97,8 @@
}
static void
-eog_thumb_view_clear_range (EogThumbView *thumbview,
- const gint start_thumb,
+eog_thumb_view_clear_range (EogThumbView *thumbview,
+ const gint start_thumb,
const gint end_thumb)
{
GtkTreePath *path;
@@ -106,9 +106,9 @@
EogListStore *store = EOG_LIST_STORE (gtk_icon_view_get_model (GTK_ICON_VIEW (thumbview)));
gint thumb = start_thumb;
gboolean result;
-
+
g_assert (start_thumb <= end_thumb);
-
+
path = gtk_tree_path_new_from_indices (start_thumb, -1);
for (result = gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path);
result && thumb <= end_thumb;
@@ -119,8 +119,8 @@
}
static void
-eog_thumb_view_add_range (EogThumbView *thumbview,
- const gint start_thumb,
+eog_thumb_view_add_range (EogThumbView *thumbview,
+ const gint start_thumb,
const gint end_thumb)
{
GtkTreePath *path;
@@ -128,9 +128,9 @@
EogListStore *store = EOG_LIST_STORE (gtk_icon_view_get_model (GTK_ICON_VIEW (thumbview)));
gint thumb = start_thumb;
gboolean result;
-
+
g_assert (start_thumb <= end_thumb);
-
+
path = gtk_tree_path_new_from_indices (start_thumb, -1);
for (result = gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path);
result && thumb <= end_thumb;
@@ -141,8 +141,8 @@
}
static void
-eog_thumb_view_update_visible_range (EogThumbView *thumbview,
- const gint start_thumb,
+eog_thumb_view_update_visible_range (EogThumbView *thumbview,
+ const gint start_thumb,
const gint end_thumb)
{
EogThumbViewPrivate *priv = thumbview->priv;
@@ -150,12 +150,12 @@
old_start_thumb= priv->start_thumb;
old_end_thumb = priv->end_thumb;
-
+
if (start_thumb == old_start_thumb &&
end_thumb == old_end_thumb) {
return;
}
-
+
if (old_start_thumb < start_thumb)
eog_thumb_view_clear_range (thumbview, old_start_thumb, MIN (start_thumb - 1, old_end_thumb));
@@ -163,7 +163,7 @@
eog_thumb_view_clear_range (thumbview, MAX (end_thumb + 1, old_start_thumb), old_end_thumb);
eog_thumb_view_add_range (thumbview, start_thumb, end_thumb);
-
+
priv->start_thumb = start_thumb;
priv->end_thumb = end_thumb;
}
@@ -177,7 +177,7 @@
if (!gtk_icon_view_get_visible_range (GTK_ICON_VIEW (thumbview), &path1, &path2)) {
return;
}
-
+
if (path1 == NULL) {
path1 = gtk_tree_path_new_first ();
}
@@ -185,7 +185,7 @@
gint n_items = gtk_tree_model_iter_n_children (gtk_icon_view_get_model (GTK_ICON_VIEW (thumbview)), NULL);
path2 = gtk_tree_path_new_from_indices (n_items - 1 , -1);
}
-
+
eog_thumb_view_update_visible_range (thumbview, gtk_tree_path_get_indices (path1) [0],
gtk_tree_path_get_indices (path2) [0]);
@@ -199,11 +199,11 @@
{
GtkTreePath *path1, *path2;
gint start_thumb, end_thumb;
-
+
if (!gtk_icon_view_get_visible_range (GTK_ICON_VIEW (thumbview), &path1, &path2)) {
return;
}
-
+
if (path1 == NULL) {
path1 = gtk_tree_path_new_first ();
}
@@ -215,7 +215,7 @@
start_thumb = gtk_tree_path_get_indices (path1) [0];
end_thumb = gtk_tree_path_get_indices (path2) [0];
- eog_thumb_view_add_range (thumbview, start_thumb, end_thumb);
+ eog_thumb_view_add_range (thumbview, start_thumb, end_thumb);
/* case we added an image, we need to make sure that the shifted thumbnail is cleared */
eog_thumb_view_clear_range (thumbview, end_thumb + 1, end_thumb + 1);
@@ -241,13 +241,13 @@
if (!GTK_IS_SCROLLED_WINDOW (parent)) {
return;
}
-
+
/* if we have been set to a ScrolledWindow, we connect to the callback
to set and unset thumbnails. */
sw = GTK_SCROLLED_WINDOW (parent);
hadjustment = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (sw));
vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw));
-
+
/* when scrolling */
g_signal_connect_data (G_OBJECT (hadjustment), "value-changed",
G_CALLBACK (thumbview_on_visible_range_changed_cb),
@@ -255,7 +255,7 @@
g_signal_connect_data (G_OBJECT (vadjustment), "value-changed",
G_CALLBACK (thumbview_on_visible_range_changed_cb),
thumbview, NULL, G_CONNECT_SWAPPED | G_CONNECT_AFTER);
-
+
/* when the adjustment is changed, ie. probably we have new images added. */
g_signal_connect_data (G_OBJECT (hadjustment), "changed",
G_CALLBACK (thumbview_on_adjustment_changed_cb),
@@ -271,15 +271,15 @@
}
static gboolean
-thumbview_on_button_press_event_cb (GtkWidget *thumbview, GdkEventButton *event,
+thumbview_on_button_press_event_cb (GtkWidget *thumbview, GdkEventButton *event,
gpointer user_data)
{
GtkTreePath *path;
-
+
/* Ignore double-clicks and triple-clicks */
if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
{
- path = gtk_icon_view_get_path_at_pos (GTK_ICON_VIEW (thumbview),
+ path = gtk_icon_view_get_path_at_pos (GTK_ICON_VIEW (thumbview),
(gint) event->x, (gint) event->y);
if (path == NULL) {
return FALSE;
@@ -292,12 +292,12 @@
gtk_icon_view_set_cursor (GTK_ICON_VIEW (thumbview), path, NULL, FALSE);
}
eog_thumb_view_popup_menu (EOG_THUMB_VIEW (thumbview), event);
-
+
gtk_tree_path_free (path);
return TRUE;
}
-
+
return FALSE;
}
@@ -307,7 +307,7 @@
GtkSelectionData *data,
guint info,
guint time,
- gpointer user_data)
+ gpointer user_data)
{
GList *list;
GList *node;
@@ -335,7 +335,7 @@
g_list_free (list);
}
-static gboolean
+static gboolean
thumbview_on_query_tooltip_cb (GtkWidget *widget,
gint x,
gint y,
@@ -355,14 +355,14 @@
GFileInfo *file_info;
#ifdef HAVE_EXIF
ExifData *exif_data;
-#endif
+#endif
- if (!gtk_icon_view_get_tooltip_context (GTK_ICON_VIEW (widget),
+ if (!gtk_icon_view_get_tooltip_context (GTK_ICON_VIEW (widget),
&x, &y, keyboard_mode,
NULL, &path, NULL)) {
return FALSE;
}
-
+
image = eog_thumb_view_get_image_from_path (EOG_THUMB_VIEW (widget),
path);
gtk_tree_path_free (path);
@@ -382,20 +382,20 @@
}
#ifdef HAVE_EXIF
- exif_data = (ExifData *) eog_image_get_exif_info (image);
+ exif_data = (ExifData *) eog_image_get_exif_info (image);
#endif
if (!eog_image_has_data (image, EOG_IMAGE_DATA_DIMENSION)) {
eog_image_load (image,
EOG_IMAGE_DATA_DIMENSION,
- NULL,
+ NULL,
&error);
}
bytes = g_format_size_for_display (eog_image_get_bytes (image));
eog_image_get_size (image, &width, &height);
-
+
file = eog_image_get_file (image);
file_info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
@@ -406,7 +406,7 @@
}
mime_str = g_file_info_get_content_type (file_info);
-
+
if (G_UNLIKELY (mime_str == NULL)) {
g_free (bytes);
#ifdef HAVE_EXIF
@@ -425,11 +425,11 @@
"%s\n"
"%s",
eog_image_get_caption (image),
- width,
- height,
+ width,
+ height,
ngettext ("pixel",
"pixels",
- height),
+ height),
bytes,
type_str);
} else {
@@ -445,10 +445,10 @@
#ifdef HAVE_EXIF
if (exif_data) {
gchar *extra_info, *tmp, *date;
- /* The EXIF standard says that the DATE_TIME tag is
+ /* The EXIF standard says that the DATE_TIME tag is
* 20 bytes long. A 32-byte buffer should be large enough. */
gchar time_buffer[32];
-
+
date = eog_exif_util_format_date (
eog_exif_util_get_value (exif_data, EXIF_TAG_DATE_TIME_ORIGINAL, time_buffer, 32));
@@ -468,12 +468,12 @@
#endif
gtk_tooltip_set_markup (tooltip, tooltip_string);
-
+
g_free (type_str);
g_free (bytes);
g_free (tooltip_string);
g_object_unref (image);
-
+
return TRUE;
}
@@ -481,29 +481,29 @@
eog_thumb_view_init (EogThumbView *thumbview)
{
thumbview->priv = EOG_THUMB_VIEW_GET_PRIVATE (thumbview);
-
+
thumbview->priv->pixbuf_cell = eog_pixbuf_cell_renderer_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (thumbview),
- thumbview->priv->pixbuf_cell,
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (thumbview),
+ thumbview->priv->pixbuf_cell,
FALSE);
-
- g_object_set (thumbview->priv->pixbuf_cell,
- "follow-state", FALSE,
- "height", 100,
- "width", 115,
- "yalign", 0.5,
- "xalign", 0.5,
+
+ g_object_set (thumbview->priv->pixbuf_cell,
+ "follow-state", FALSE,
+ "height", 100,
+ "width", 115,
+ "yalign", 0.5,
+ "xalign", 0.5,
NULL);
-
+
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (thumbview),
- thumbview->priv->pixbuf_cell,
+ thumbview->priv->pixbuf_cell,
"pixbuf", EOG_LIST_STORE_THUMBNAIL,
NULL);
gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (thumbview),
GTK_SELECTION_MULTIPLE);
-
+
gtk_icon_view_set_column_spacing (GTK_ICON_VIEW (thumbview),
EOG_THUMB_VIEW_SPACING);
@@ -512,23 +512,23 @@
g_object_set (thumbview, "has-tooltip", TRUE, NULL);
- g_signal_connect (thumbview,
+ g_signal_connect (thumbview,
"query-tooltip",
- G_CALLBACK (thumbview_on_query_tooltip_cb),
+ G_CALLBACK (thumbview_on_query_tooltip_cb),
NULL);
thumbview->priv->start_thumb = 0;
thumbview->priv->end_thumb = 0;
thumbview->priv->menu = NULL;
-
- g_signal_connect (G_OBJECT (thumbview), "parent-set",
+
+ g_signal_connect (G_OBJECT (thumbview), "parent-set",
G_CALLBACK (thumbview_on_parent_set_cb), NULL);
gtk_icon_view_enable_model_drag_source (GTK_ICON_VIEW (thumbview), 0,
- target_table, G_N_ELEMENTS (target_table),
+ target_table, G_N_ELEMENTS (target_table),
GDK_ACTION_COPY);
- g_signal_connect (G_OBJECT (thumbview), "drag-data-get",
+ g_signal_connect (G_OBJECT (thumbview), "drag-data-get",
G_CALLBACK (thumbview_on_drag_data_get_cb), NULL);
}
@@ -543,7 +543,7 @@
eog_thumb_view_new (void)
{
EogThumbView *thumbview;
-
+
thumbview = g_object_new (EOG_TYPE_THUMB_VIEW, NULL);
return GTK_WIDGET (thumbview);
@@ -562,10 +562,10 @@
eog_thumb_view_set_model (EogThumbView *thumbview, EogListStore *store)
{
gint index;
-
+
g_return_if_fail (EOG_IS_THUMB_VIEW (thumbview));
g_return_if_fail (EOG_IS_LIST_STORE (store));
-
+
index = eog_list_store_get_initial_pos (store);
gtk_icon_view_set_model (GTK_ICON_VIEW (thumbview), GTK_TREE_MODEL (store));
@@ -592,8 +592,8 @@
{
g_return_if_fail (EOG_IS_THUMB_VIEW (thumbview));
- g_object_set (thumbview->priv->pixbuf_cell,
- "height", height,
+ g_object_set (thumbview->priv->pixbuf_cell,
+ "height", height,
NULL);
}
@@ -647,7 +647,7 @@
gtk_tree_model_get (model, &iter,
EOG_LIST_STORE_EOG_IMAGE, &image,
-1);
-
+
return image;
}
@@ -664,7 +664,7 @@
EogImage *
eog_thumb_view_get_first_selected_image (EogThumbView *thumbview)
{
- /* The returned list is not sorted! We need to find the
+ /* The returned list is not sorted! We need to find the
smaller tree path value => tricky and expensive. Do we really need this?
*/
EogImage *image;
@@ -746,7 +746,7 @@
if (deselect_other) {
gtk_icon_view_unselect_all (GTK_ICON_VIEW (thumbview));
}
-
+
gtk_icon_view_select_path (GTK_ICON_VIEW (thumbview), path);
gtk_icon_view_set_cursor (GTK_ICON_VIEW (thumbview), path, NULL, FALSE);
gtk_icon_view_scroll_to_path (GTK_ICON_VIEW (thumbview), path, FALSE, 0, 0);
@@ -769,7 +769,7 @@
*
**/
void
-eog_thumb_view_select_single (EogThumbView *thumbview,
+eog_thumb_view_select_single (EogThumbView *thumbview,
EogThumbViewSelectionChange change)
{
GtkTreePath *path = NULL;
@@ -786,7 +786,7 @@
if (n_items == 0) {
return;
}
-
+
if (eog_thumb_view_get_n_selected (thumbview) == 0) {
switch (change) {
case EOG_THUMB_VIEW_SELECT_CURRENT:
@@ -804,9 +804,9 @@
path = gtk_tree_path_copy ((GtkTreePath *) list->data);
g_list_foreach (list, (GFunc) gtk_tree_path_free , NULL);
g_list_free (list);
-
+
gtk_icon_view_unselect_all (GTK_ICON_VIEW (thumbview));
-
+
switch (change) {
case EOG_THUMB_VIEW_SELECT_CURRENT:
break;
@@ -859,24 +859,24 @@
thumbview->priv->menu = g_object_ref (menu);
- gtk_menu_attach_to_widget (GTK_MENU (thumbview->priv->menu),
- GTK_WIDGET (thumbview),
+ gtk_menu_attach_to_widget (GTK_MENU (thumbview->priv->menu),
+ GTK_WIDGET (thumbview),
NULL);
g_signal_connect (G_OBJECT (thumbview), "button_press_event",
G_CALLBACK (thumbview_on_button_press_event_cb), NULL);
-
+
}
-static void
+static void
eog_thumb_view_popup_menu (EogThumbView *thumbview, GdkEventButton *event)
{
GtkWidget *popup;
int button, event_time;
popup = thumbview->priv->menu;
-
+
if (event) {
button = event->button;
event_time = event->time;
@@ -884,7 +884,7 @@
button = 0;
event_time = gtk_get_current_event_time ();
}
-
- gtk_menu_popup (GTK_MENU (popup), NULL, NULL, NULL, NULL,
+
+ gtk_menu_popup (GTK_MENU (popup), NULL, NULL, NULL, NULL,
button, event_time);
}
Modified: trunk/src/eog-thumb-view.h
==============================================================================
--- trunk/src/eog-thumb-view.h (original)
+++ trunk/src/eog-thumb-view.h Mon Oct 27 19:33:42 2008
@@ -59,7 +59,7 @@
GtkWidget *eog_thumb_view_new (void);
-void eog_thumb_view_set_model (EogThumbView *thumbview,
+void eog_thumb_view_set_model (EogThumbView *thumbview,
EogListStore *store);
void eog_thumb_view_set_item_height (EogThumbView *thumbview,
@@ -71,14 +71,14 @@
GList *eog_thumb_view_get_selected_images (EogThumbView *thumbview);
-void eog_thumb_view_select_single (EogThumbView *thumbview,
+void eog_thumb_view_select_single (EogThumbView *thumbview,
EogThumbViewSelectionChange change);
-void eog_thumb_view_set_current_image (EogThumbView *thumbview,
+void eog_thumb_view_set_current_image (EogThumbView *thumbview,
EogImage *image,
gboolean deselect_other);
-void eog_thumb_view_set_thumbnail_popup (EogThumbView *thumbview,
+void eog_thumb_view_set_thumbnail_popup (EogThumbView *thumbview,
GtkMenu *menu);
G_END_DECLS
Modified: trunk/src/eog-thumbnail.c
==============================================================================
--- trunk/src/eog-thumbnail.c (original)
+++ trunk/src/eog-thumbnail.c Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Thumbnailing functions
+/* Eye Of Gnome - Thumbnailing functions
*
* Copyright (C) 2000-2008 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on eel code (eel/eel-graphic-effects.c) by:
+ * Based on eel code (eel/eel-graphic-effects.c) by:
* - Andy Hertzfeld <andy eazel com>
*
* This program is free software; you can redistribute it and/or modify
@@ -60,24 +60,24 @@
static GQuark q = 0;
if (q == 0)
q = g_quark_from_static_string ("eog-thumb-error-quark");
-
+
return q;
}
static void
set_vfs_error (GError **error, GError *ioerror)
{
- g_set_error (error,
- EOG_THUMB_ERROR,
+ g_set_error (error,
+ EOG_THUMB_ERROR,
EOG_THUMB_ERROR_VFS,
"%s", ioerror ? ioerror->message : "VFS error making a thumbnail");
}
static void
-set_thumb_error (GError **error, int error_id, const char *string)
+set_thumb_error (GError **error, int error_id, const char *string)
{
- g_set_error (error,
- EOG_THUMB_ERROR,
+ g_set_error (error,
+ EOG_THUMB_ERROR,
error_id,
"%s", string);
}
@@ -92,7 +92,7 @@
/* does a thumbnail under the path exists? */
if (data->thumb_exists) {
thumb = gdk_pixbuf_new_from_file (data->thumb_path, error);
-
+
/* is this thumbnail file up to date? */
if (thumb != NULL && !gnome_thumbnail_is_valid (thumb, data->uri_str, data->mtime)) {
g_object_unref (thumb);
@@ -116,12 +116,12 @@
width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf);
-
+
perc = CLAMP (128.0/(MAX (width, height)), 0, 1);
thumb = gnome_thumbnail_scale_down_pixbuf (pixbuf,
width*perc, height*perc);
-
+
return thumb;
}
@@ -147,9 +147,9 @@
g_return_val_if_fail (file != NULL, NULL);
g_return_val_if_fail (error != NULL && *error == NULL, NULL);
-
+
data = g_slice_new0 (EogThumbData);
-
+
data->uri_str = g_file_get_uri (file);
data->thumb_path = gnome_thumbnail_path_for_uri (data->uri_str, GNOME_THUMBNAIL_SIZE_NORMAL);
@@ -171,14 +171,14 @@
data->mtime = g_file_info_get_attribute_uint64 (file_info,
G_FILE_ATTRIBUTE_TIME_MODIFIED);
data->mime_type = g_strdup (g_file_info_get_content_type (file_info));
-
- data->thumb_exists = (g_file_info_get_attribute_byte_string (file_info,
+
+ data->thumb_exists = (g_file_info_get_attribute_byte_string (file_info,
G_FILE_ATTRIBUTE_THUMBNAIL_PATH) != NULL);
data->failed_thumb_exists = g_file_info_get_attribute_boolean (file_info,
G_FILE_ATTRIBUTE_THUMBNAILING_FAILED);
data->can_read = TRUE;
if (g_file_info_has_attribute (file_info, G_FILE_ATTRIBUTE_ACCESS_CAN_READ)) {
- data->can_read = g_file_info_get_attribute_boolean (file_info,
+ data->can_read = g_file_info_get_attribute_boolean (file_info,
G_FILE_ATTRIBUTE_ACCESS_CAN_READ);
}
}
@@ -194,79 +194,79 @@
}
static void
-draw_frame_row (GdkPixbuf *frame_image,
- gint target_width,
- gint source_width,
- gint source_v_position,
- gint dest_v_position,
- GdkPixbuf *result_pixbuf,
- gint left_offset,
+draw_frame_row (GdkPixbuf *frame_image,
+ gint target_width,
+ gint source_width,
+ gint source_v_position,
+ gint dest_v_position,
+ GdkPixbuf *result_pixbuf,
+ gint left_offset,
gint height)
{
gint remaining_width, h_offset, slab_width;
-
+
remaining_width = target_width;
h_offset = 0;
- while (remaining_width > 0) {
- slab_width = remaining_width > source_width ?
+ while (remaining_width > 0) {
+ slab_width = remaining_width > source_width ?
source_width : remaining_width;
- gdk_pixbuf_copy_area (frame_image,
- left_offset,
- source_v_position,
- slab_width,
- height,
- result_pixbuf,
- left_offset + h_offset,
+ gdk_pixbuf_copy_area (frame_image,
+ left_offset,
+ source_v_position,
+ slab_width,
+ height,
+ result_pixbuf,
+ left_offset + h_offset,
dest_v_position);
remaining_width -= slab_width;
- h_offset += slab_width;
+ h_offset += slab_width;
}
}
static void
-draw_frame_column (GdkPixbuf *frame_image,
- gint target_height,
- gint source_height,
- gint source_h_position,
- gint dest_h_position,
- GdkPixbuf *result_pixbuf,
- gint top_offset,
+draw_frame_column (GdkPixbuf *frame_image,
+ gint target_height,
+ gint source_height,
+ gint source_h_position,
+ gint dest_h_position,
+ GdkPixbuf *result_pixbuf,
+ gint top_offset,
gint width)
{
gint remaining_height, v_offset, slab_height;
-
+
remaining_height = target_height;
v_offset = 0;
- while (remaining_height > 0) {
- slab_height = remaining_height > source_height ?
+ while (remaining_height > 0) {
+ slab_height = remaining_height > source_height ?
source_height : remaining_height;
- gdk_pixbuf_copy_area (frame_image,
- source_h_position,
- top_offset,
- width,
- slab_height,
- result_pixbuf,
- dest_h_position,
+ gdk_pixbuf_copy_area (frame_image,
+ source_h_position,
+ top_offset,
+ width,
+ slab_height,
+ result_pixbuf,
+ dest_h_position,
top_offset + v_offset);
remaining_height -= slab_height;
- v_offset += slab_height;
+ v_offset += slab_height;
}
}
static GdkPixbuf *
-eog_thumbnail_stretch_frame_image (GdkPixbuf *frame_image,
- gint left_offset,
- gint top_offset,
- gint right_offset,
+eog_thumbnail_stretch_frame_image (GdkPixbuf *frame_image,
+ gint left_offset,
+ gint top_offset,
+ gint right_offset,
gint bottom_offset,
- gint dest_width,
- gint dest_height,
+ gint dest_width,
+ gint dest_height,
gboolean fill_flag)
{
GdkPixbuf *result_pixbuf;
@@ -280,15 +280,15 @@
frame_height = gdk_pixbuf_get_height (frame_image );
if (fill_flag) {
- result_pixbuf = gdk_pixbuf_scale_simple (frame_image,
- dest_width,
- dest_height,
+ result_pixbuf = gdk_pixbuf_scale_simple (frame_image,
+ dest_width,
+ dest_height,
GDK_INTERP_NEAREST);
} else {
- result_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
- TRUE,
- 8,
- dest_width,
+ result_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+ TRUE,
+ 8,
+ dest_width,
dest_height);
}
@@ -297,9 +297,9 @@
if (!fill_flag) {
for (y = 0; y < dest_height; y++) {
- art_rgb_run_alpha (pixels_ptr,
- 255, 255,
- 255, 255,
+ art_rgb_run_alpha (pixels_ptr,
+ 255, 255,
+ 255, 255,
dest_width);
pixels_ptr += row_stride;
}
@@ -312,79 +312,79 @@
target_frame_height = frame_height - top_offset - bottom_offset;
/* Draw the left top corner and top row */
- gdk_pixbuf_copy_area (frame_image,
- 0, 0,
- left_offset,
- top_offset,
- result_pixbuf,
+ gdk_pixbuf_copy_area (frame_image,
+ 0, 0,
+ left_offset,
+ top_offset,
+ result_pixbuf,
0, 0);
- draw_frame_row (frame_image,
- target_width,
- target_frame_width,
- 0, 0,
- result_pixbuf,
- left_offset,
+ draw_frame_row (frame_image,
+ target_width,
+ target_frame_width,
+ 0, 0,
+ result_pixbuf,
+ left_offset,
top_offset);
/* Draw the right top corner and left column */
- gdk_pixbuf_copy_area (frame_image,
- frame_width - right_offset,
- 0,
- right_offset,
- top_offset,
- result_pixbuf,
- dest_width - right_offset,
+ gdk_pixbuf_copy_area (frame_image,
+ frame_width - right_offset,
+ 0,
+ right_offset,
+ top_offset,
+ result_pixbuf,
+ dest_width - right_offset,
0);
- draw_frame_column (frame_image,
- target_height,
- target_frame_height,
- 0, 0,
- result_pixbuf,
- top_offset,
+ draw_frame_column (frame_image,
+ target_height,
+ target_frame_height,
+ 0, 0,
+ result_pixbuf,
+ top_offset,
left_offset);
/* Draw the bottom right corner and bottom row */
- gdk_pixbuf_copy_area (frame_image,
- frame_width - right_offset,
- frame_height - bottom_offset,
- right_offset,
- bottom_offset,
- result_pixbuf,
- dest_width - right_offset,
+ gdk_pixbuf_copy_area (frame_image,
+ frame_width - right_offset,
+ frame_height - bottom_offset,
+ right_offset,
+ bottom_offset,
+ result_pixbuf,
+ dest_width - right_offset,
dest_height - bottom_offset);
- draw_frame_row (frame_image,
- target_width,
- target_frame_width,
- frame_height - bottom_offset,
- dest_height - bottom_offset,
- result_pixbuf,
+ draw_frame_row (frame_image,
+ target_width,
+ target_frame_width,
+ frame_height - bottom_offset,
+ dest_height - bottom_offset,
+ result_pixbuf,
left_offset, bottom_offset);
/* Draw the bottom left corner and the right column */
- gdk_pixbuf_copy_area (frame_image,
- 0,
- frame_height - bottom_offset,
- left_offset,
- bottom_offset,
- result_pixbuf,
+ gdk_pixbuf_copy_area (frame_image,
+ 0,
+ frame_height - bottom_offset,
+ left_offset,
+ bottom_offset,
+ result_pixbuf,
0,
dest_height - bottom_offset);
- draw_frame_column (frame_image,
- target_height,
- target_frame_height,
- frame_width - right_offset,
- dest_width - right_offset,
- result_pixbuf, top_offset,
+ draw_frame_column (frame_image,
+ target_height,
+ target_frame_height,
+ frame_width - right_offset,
+ dest_width - right_offset,
+ result_pixbuf, top_offset,
right_offset);
return result_pixbuf;
}
-void
+void
eog_thumbnail_add_frame (GdkPixbuf **thumbnail)
{
GdkPixbuf *result_pixbuf;
@@ -393,21 +393,21 @@
source_width = gdk_pixbuf_get_width (*thumbnail);
source_height = gdk_pixbuf_get_height (*thumbnail);
-
+
dest_width = source_width + 9;
dest_height = source_height + 9;
- result_pixbuf = eog_thumbnail_stretch_frame_image (frame,
+ result_pixbuf = eog_thumbnail_stretch_frame_image (frame,
3, 3, 6, 6,
- dest_width,
+ dest_width,
dest_height,
FALSE);
- gdk_pixbuf_copy_area (*thumbnail,
- 0, 0,
- source_width,
- source_height,
- result_pixbuf,
+ gdk_pixbuf_copy_area (*thumbnail,
+ 0, 0,
+ source_width,
+ source_height,
+ result_pixbuf,
3, 3);
g_object_unref (*thumbnail);
@@ -430,15 +430,15 @@
if (width > height) {
factor = (gfloat) dimension / (gfloat) width;
} else {
- factor = (gfloat) dimension / (gfloat) height;
+ factor = (gfloat) dimension / (gfloat) height;
}
-
+
width = MAX (width * factor, 1);
height = MAX (height * factor, 1);
-
- result_pixbuf = gnome_thumbnail_scale_down_pixbuf (*thumbnail,
+
+ result_pixbuf = gnome_thumbnail_scale_down_pixbuf (*thumbnail,
width, height);
-
+
g_object_unref (*thumbnail);
*thumbnail = result_pixbuf;
@@ -459,7 +459,7 @@
file = eog_image_get_file (image);
data = eog_thumb_data_new (file, error);
g_object_unref (file);
-
+
if (data == NULL)
return NULL;
Modified: trunk/src/eog-thumbnail.h
==============================================================================
--- trunk/src/eog-thumbnail.h (original)
+++ trunk/src/eog-thumbnail.h Mon Oct 27 19:33:42 2008
@@ -1,10 +1,10 @@
-/* Eye Of Gnome - Thumbnailing functions
+/* Eye Of Gnome - Thumbnailing functions
*
* Copyright (C) 2000-2007 The Free Software Foundation
*
* Author: Lucas Rocha <lucasr gnome org>
*
- * Based on nautilus code (libnautilus-private/nautilus-thumbnail.c) by:
+ * Based on nautilus code (libnautilus-private/nautilus-thumbnail.c) by:
* - Andy Hertzfeld <andy eazel com>
*
* This program is free software; you can redistribute it and/or modify
@@ -32,12 +32,12 @@
void eog_thumbnail_init (void);
-void eog_thumbnail_fit_to_size (GdkPixbuf **thumbnail,
+void eog_thumbnail_fit_to_size (GdkPixbuf **thumbnail,
gint dimension);
void eog_thumbnail_add_frame (GdkPixbuf **thumbnail);
-GdkPixbuf* eog_thumbnail_load (EogImage *image,
+GdkPixbuf* eog_thumbnail_load (EogImage *image,
GError **error);
#define EOG_THUMBNAIL_ORIGINAL_WIDTH "eog-thumbnail-orig-width"
Modified: trunk/src/eog-transform.c
==============================================================================
--- trunk/src/eog-transform.c (original)
+++ trunk/src/eog-transform.c Mon Oct 27 19:33:42 2008
@@ -29,13 +29,13 @@
trans->priv = EOG_TRANSFORM_GET_PRIVATE (trans);
}
-static void
+static void
eog_transform_class_init (EogTransformClass *klass)
{
g_type_class_add_private (klass, sizeof (EogTransformPrivate));
}
-GdkPixbuf*
+GdkPixbuf*
eog_transform_apply (EogTransform *trans, GdkPixbuf *pixbuf, EogJob *job)
{
ArtPoint dest_top_left;
@@ -45,7 +45,7 @@
int inverted [6];
ArtPoint dest;
ArtPoint src;
-
+
int src_width;
int src_height;
int src_rowstride;
@@ -94,7 +94,7 @@
dest_bottom_right.x = MAX (dest_bottom_right.x, dest.x);
dest_bottom_right.y = MAX (dest_bottom_right.y, dest.y);
}
-
+
/* create the resulting pixbuf */
dest_width = abs (dest_bottom_right.x - dest_top_left.x + 1);
dest_height = abs (dest_bottom_right.y - dest_top_left.y + 1);
@@ -124,7 +124,7 @@
progress_delta = MAX (1, dest_height / EOG_TRANSFORM_N_PROG_UPDATES);
- /*
+ /*
* for every destination pixel (dx,dy) compute the source pixel (sx, sy)
* and copy the color values
*/
@@ -137,7 +137,7 @@
if (sx >= 0 && sx < src_width && sy >= 0 && sy < src_height) {
src_pos = src_buffer + sy * src_rowstride + sx * src_n_channels;
dest_pos = dest_buffer + y * dest_rowstride + x * dest_n_channels;
-
+
for (i = 0; i < src_n_channels; i++) {
dest_pos[i] = src_pos[i];
}
@@ -162,10 +162,10 @@
return dest_pixbuf;
}
-EogTransform*
+EogTransform*
eog_transform_reverse (EogTransform *trans)
{
- EogTransform *reverse;
+ EogTransform *reverse;
g_return_val_if_fail (EOG_IS_TRANSFORM (trans), NULL);
@@ -193,7 +193,7 @@
return composition;
}
-gboolean
+gboolean
eog_transform_is_identity (EogTransform *trans)
{
double identity[6] = { 1, 0, 0, 1, 0, 0 };
@@ -206,55 +206,55 @@
EogTransform*
eog_transform_identity_new (void)
{
- EogTransform *trans;
+ EogTransform *trans;
trans = EOG_TRANSFORM (g_object_new (EOG_TYPE_TRANSFORM, NULL));
-
+
art_affine_identity (trans->priv->affine);
return trans;
}
-EogTransform*
+EogTransform*
eog_transform_rotate_new (int degree)
{
- EogTransform *trans;
+ EogTransform *trans;
trans = EOG_TRANSFORM (g_object_new (EOG_TYPE_TRANSFORM, NULL));
-
+
art_affine_rotate (trans->priv->affine, degree);
return trans;
}
-EogTransform*
+EogTransform*
eog_transform_flip_new (EogTransformType type)
{
- EogTransform *trans;
+ EogTransform *trans;
gboolean horiz, vert;
trans = EOG_TRANSFORM (g_object_new (EOG_TYPE_TRANSFORM, NULL));
-
+
art_affine_identity (trans->priv->affine);
horiz = (type == EOG_TRANSFORM_FLIP_HORIZONTAL);
vert = (type == EOG_TRANSFORM_FLIP_VERTICAL);
art_affine_flip (trans->priv->affine,
- trans->priv->affine,
+ trans->priv->affine,
horiz, vert);
return trans;
}
#if 0
-EogTransform*
+EogTransform*
eog_transform_scale_new (double sx, double sy)
{
- EogTransform *trans;
+ EogTransform *trans;
trans = EOG_TRANSFORM (g_object_new (EOG_TYPE_TRANSFORM, 0));
-
+
art_affine_scale (trans->priv->affine, sx, sy);
return trans;
Modified: trunk/src/eog-transform.h
==============================================================================
--- trunk/src/eog-transform.h (original)
+++ trunk/src/eog-transform.h Mon Oct 27 19:33:42 2008
@@ -31,7 +31,7 @@
/* =========================================
- GObjecat wrapper around an affine transformation
+ GObjecat wrapper around an affine transformation
----------------------------------------*/
Modified: trunk/src/eog-uri-converter.c
==============================================================================
--- trunk/src/eog-uri-converter.c (original)
+++ trunk/src/eog-uri-converter.c Mon Oct 27 19:33:42 2008
@@ -34,7 +34,7 @@
GdkPixbufFormat *img_format;
char *counter_str;
gboolean requires_exif;
-
+
/* options */
gboolean convert_spaces;
gchar space_character;
@@ -116,7 +116,7 @@
priv->requires_exif = FALSE;
}
-static void
+static void
eog_uri_converter_class_init (EogURIConverterClass *klass)
{
GObjectClass *object_class = (GObjectClass*) klass;
@@ -139,7 +139,7 @@
PROP_SPACE_CHARACTER,
g_param_spec_char ("space-character", NULL, NULL,
' ', '~', '_', G_PARAM_READWRITE));
-
+
g_object_class_install_property (
object_class,
PROP_COUNTER_START,
@@ -177,17 +177,17 @@
static GQuark q = 0;
if (q == 0)
q = g_quark_from_static_string ("eog-uri-converter-error-quark");
-
+
return q;
}
-static void
+static void
update_counter_format_str (EogURIConverter *conv)
{
EogURIConverterPrivate *priv;
g_return_if_fail (EOG_IS_URI_CONVERTER (conv));
-
+
priv = conv->priv;
g_free (priv->counter_str);
@@ -220,14 +220,14 @@
priv->space_character = g_value_get_char (value);
break;
- case PROP_COUNTER_START:
+ case PROP_COUNTER_START:
{
guint new_n_digits;
priv->counter_start = g_value_get_ulong (value);
-
+
new_n_digits = ceil (log10 (priv->counter_start + pow (10, priv->counter_n_digits) - 1));
-
+
if (new_n_digits != priv->counter_n_digits) {
priv->counter_n_digits = ceil (MIN (log10 (G_MAXULONG), new_n_digits));
update_counter_format_str (conv);
@@ -241,7 +241,7 @@
break;
case PROP_N_IMAGES:
- priv->counter_n_digits = ceil (MIN (log10 (G_MAXULONG),
+ priv->counter_n_digits = ceil (MIN (log10 (G_MAXULONG),
log10 (priv->counter_start + g_value_get_uint (value))));
update_counter_format_str (conv);
break;
@@ -295,7 +295,7 @@
};
static EogUCToken*
-create_token_string (const char *string, int substr_start, int substr_len)
+create_token_string (const char *string, int substr_start, int substr_len)
{
char *start_byte;
char *end_byte;
@@ -315,7 +315,7 @@
token->type = EOG_UC_STRING;
token->data.string = g_new0 (char, n_bytes);
token->data.string = g_utf8_strncpy (token->data.string, start_byte, substr_len);
-
+
return token;
}
@@ -354,12 +354,12 @@
int substr_len = 0;
gunichar c;
const char *s;
- EogUCToken *token;
+ EogUCToken *token;
g_return_val_if_fail (EOG_IS_URI_CONVERTER (conv), NULL);
priv = conv->priv;
-
+
if (string == NULL) return NULL;
if (!g_utf8_validate (string, -1, NULL))
@@ -371,7 +371,7 @@
for (i = 0; i < len; i++) {
c = g_utf8_get_char (s);
token = NULL;
-
+
switch (state) {
case PARSER_NONE:
if (c == '%') {
@@ -399,7 +399,7 @@
case PARSER_TOKEN: {
EogUCType type = EOG_UC_END;
-
+
if (c == 'f') {
type = EOG_UC_FILENAME;
}
@@ -434,9 +434,9 @@
else if (c == 's') {
type = EOG_UC_SECOND;
}
-
+
if (type != EOG_UC_END && token == NULL) {
- token = create_token_other (type);
+ token = create_token_other (type);
priv->requires_exif = TRUE;
}
state = PARSER_NONE;
@@ -450,7 +450,7 @@
if (token != NULL) {
list = g_list_append (list, token);
}
-
+
s = g_utf8_next_char (s);
}
@@ -462,7 +462,7 @@
return list;
}
-void
+void
eog_uri_converter_print_list (EogURIConverter *conv)
{
EogURIConverterPrivate *priv;
@@ -477,7 +477,7 @@
char *str;
token = (EogUCToken*) it->data;
-
+
switch (token->type) {
case EOG_UC_STRING:
str = g_strdup_printf ("string [%s]", token->data.string);
@@ -519,7 +519,7 @@
str = "unknown";
break;
}
-
+
g_print ("- %s\n", str);
if (token->type == EOG_UC_STRING || token->type == EOG_UC_COUNTER) {
@@ -537,7 +537,7 @@
g_return_val_if_fail (format_str != NULL, NULL);
conv = g_object_new (EOG_TYPE_URI_CONVERTER, NULL);
-
+
if (base_file != NULL) {
conv->priv->base_file = g_object_ref (base_file);
}
@@ -558,7 +558,7 @@
g_return_val_if_fail (EOG_IS_URI_CONVERTER (conv), NULL);
g_return_val_if_fail (EOG_IS_IMAGE (image), NULL);
-
+
priv = conv->priv;
if (priv->base_file != NULL) {
@@ -569,9 +569,9 @@
img_file = eog_image_get_file (image);
g_assert (img_file != NULL);
-
+
file = g_file_get_parent (img_file);
-
+
g_object_unref (img_file);
}
@@ -584,16 +584,16 @@
char *basename;
char *suffix_start;
guint len;
-
+
*name = NULL;
*suffix = NULL;
/* get unescaped string */
- basename = g_file_get_basename (file);
+ basename = g_file_get_basename (file);
/* FIXME: does this work for all locales? */
- suffix_start = g_utf8_strrchr (basename, -1, '.');
-
+ suffix_start = g_utf8_strrchr (basename, -1, '.');
+
if (suffix_start == NULL) { /* no suffix found */
*name = g_strdup (basename);
}
@@ -611,13 +611,13 @@
static GString*
append_filename (GString *str, EogImage *img)
{
- /* appends the name of the original file without
+ /* appends the name of the original file without
filetype suffix */
GFile *img_file;
char *name;
char *suffix;
GString *result;
-
+
img_file = eog_image_get_file (img);
split_filename (img_file, &name, &suffix);
@@ -625,7 +625,7 @@
g_free (name);
g_free (suffix);
-
+
g_object_unref (img_file);
return result;
@@ -651,10 +651,10 @@
static void
build_absolute_file (EogURIConverter *conv, EogImage *image, GString *str, /* input */
GFile **file, GdkPixbufFormat **format) /* output */
-{
+{
GFile *dir_file;
EogURIConverterPrivate *priv;
-
+
*file = NULL;
if (format != NULL)
*format = NULL;
@@ -668,7 +668,7 @@
dir_file = get_file_directory (conv, image);
g_assert (dir_file != NULL);
-
+
if (priv->img_format == NULL) {
/* use same file type/suffix */
char *name;
@@ -683,23 +683,23 @@
g_string_append_unichar (str, '.');
g_string_append (str, old_suffix);
- if (format != NULL)
+ if (format != NULL)
*format = eog_pixbuf_get_format_by_suffix (old_suffix);
g_object_unref (img_file);
} else {
- if (priv->suffix == NULL)
+ if (priv->suffix == NULL)
priv->suffix = eog_pixbuf_get_common_suffix (priv->img_format);
g_string_append_unichar (str, '.');
g_string_append (str, priv->suffix);
- if (format != NULL)
+ if (format != NULL)
*format = priv->img_format;
}
-
+
*file = g_file_get_child (dir_file, str->str);
-
+
g_object_unref (dir_file);
}
@@ -763,7 +763,7 @@
priv = conv->priv;
*file = NULL;
- if (format != NULL)
+ if (format != NULL)
*format = NULL;
str = g_string_new ("");
@@ -781,9 +781,9 @@
break;
case EOG_UC_COUNTER: {
- if (token->data.counter < priv->counter_start)
+ if (token->data.counter < priv->counter_start)
token->data.counter = priv->counter_start;
-
+
str = append_counter (str, token->data.counter++, conv);
break;
}
@@ -819,7 +819,7 @@
#endif
default:
/* skip all others */
-
+
break;
}
}
@@ -832,14 +832,14 @@
g_string_free (repl_str, TRUE);
g_string_free (str, TRUE);
-
+
return (*file != NULL);
}
char*
-eog_uri_converter_preview (const char *format_str, EogImage *img, GdkPixbufFormat *format,
+eog_uri_converter_preview (const char *format_str, EogImage *img, GdkPixbufFormat *format,
gulong counter, guint n_images,
gboolean convert_spaces, gunichar space_char)
{
@@ -851,7 +851,7 @@
const char *s;
gunichar c;
char *filename;
- gboolean token_next;
+ gboolean token_next;
g_return_val_if_fail (format_str != NULL, NULL);
g_return_val_if_fail (EOG_IS_IMAGE (img), NULL);
@@ -861,7 +861,7 @@
n_digits = ceil (MIN (log10 (G_MAXULONG), MAX (log10 (counter), log10 (n_images))));
str = g_string_new ("");
-
+
if (!g_utf8_validate (format_str, -1, NULL))
return NULL;
@@ -933,12 +933,12 @@
char *name;
char *old_suffix;
GFile *img_file;
-
+
img_file = eog_image_get_file (img);
split_filename (img_file, &name, &old_suffix);
g_assert (old_suffix != NULL);
-
+
g_string_append_unichar (repl_str, '.');
g_string_append (repl_str, old_suffix);
@@ -948,7 +948,7 @@
}
else {
char *suffix = eog_pixbuf_get_common_suffix (format);
-
+
g_string_append_unichar (repl_str, '.');
g_string_append (repl_str, suffix);
@@ -977,7 +977,7 @@
{
GList *it;
GList *file_list = NULL;
- gboolean all_different = TRUE;
+ gboolean all_different = TRUE;
g_return_val_if_fail (EOG_IS_URI_CONVERTER (converter), FALSE);
@@ -987,7 +987,7 @@
GFile *file;
GError *conv_error = NULL;
- result = eog_uri_converter_do (converter, EOG_IMAGE (it->data),
+ result = eog_uri_converter_do (converter, EOG_IMAGE (it->data),
&file, NULL, &conv_error);
if (result) {
@@ -997,11 +997,11 @@
/* check for all different uris */
for (it = file_list; it != NULL && all_different; it = it->next) {
- GList *p;
+ GList *p;
GFile *file;
file = (GFile*) it->data;
-
+
for (p = it->next; p != NULL && all_different; p = p->next) {
all_different = !g_file_equal (file, (GFile*) p->data);
}
Modified: trunk/src/eog-util.c
==============================================================================
--- trunk/src/eog-util.c (original)
+++ trunk/src/eog-util.c Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - General Utilities
+/* Eye Of Gnome - General Utilities
*
* Copyright (C) 2006 The Free Software Foundation
*
@@ -44,7 +44,7 @@
#include <glib/gi18n.h>
#include <libgnome/gnome-init.h>
-void
+void
eog_util_show_help (const gchar *section, GtkWindow *parent)
{
GError *error = NULL;
@@ -140,7 +140,7 @@
file_list = g_slist_append (file_list, g_file_new_for_uri (uri));
g_free (uri);
}
-
+
return file_list;
}
@@ -154,8 +154,8 @@
char *uri_str;
uri_str = (gchar *) it->data;
-
- file_list = g_slist_prepend (file_list,
+
+ file_list = g_slist_prepend (file_list,
g_file_new_for_uri (uri_str));
}
@@ -170,10 +170,10 @@
GSList *file_list = NULL;
for (i = 0; strings[i]; i++) {
- file_list = g_slist_prepend (file_list,
+ file_list = g_slist_prepend (file_list,
g_file_new_for_uri (strings[i]));
}
-
+
return g_slist_reverse (file_list);
}
#endif
@@ -191,10 +191,10 @@
if (create_uri) {
GFile *file;
-
+
file = g_file_new_for_commandline_arg (files[i]);
str = g_file_get_uri (file);
-
+
g_object_unref (file);
} else {
str = g_strdup (files[i]);
@@ -224,14 +224,14 @@
/* Ensure new list is NULL-terminated */
abs_files = g_new0 (gchar *, size+1);
-
+
for (i = 0; i < size; i++) {
file = g_file_new_for_commandline_arg (files[i]);
abs_files[i] = g_file_get_uri (file);
g_object_unref (file);
}
-
+
return abs_files;
}
@@ -242,13 +242,13 @@
{
if (g_file_test (dir, G_FILE_TEST_IS_DIR))
return TRUE;
-
+
if (g_mkdir (dir, 488) == 0)
return TRUE;
if (errno == EEXIST)
return g_file_test (dir, G_FILE_TEST_IS_DIR);
-
+
g_warning ("Failed to create directory %s: %s", dir, strerror (errno));
return FALSE;
}
@@ -258,11 +258,11 @@
{
if (dot_dir == NULL) {
gboolean exists;
-
+
dot_dir = g_build_filename (gnome_user_dir_get (),
"eog",
NULL);
-
+
exists = ensure_dir_exists (dot_dir);
if (G_UNLIKELY (!exists)) {
Modified: trunk/src/eog-util.h
==============================================================================
--- trunk/src/eog-util.h (original)
+++ trunk/src/eog-util.h Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - General Utilities
+/* Eye Of Gnome - General Utilities
*
* Copyright (C) 2006 The Free Software Foundation
*
@@ -29,7 +29,7 @@
G_BEGIN_DECLS
-void eog_util_show_help (const gchar *section,
+void eog_util_show_help (const gchar *section,
GtkWindow *parent);
gchar *eog_util_make_valid_utf8 (const gchar *name);
Modified: trunk/src/eog-window.c
==============================================================================
--- trunk/src/eog-window.c (original)
+++ trunk/src/eog-window.c Mon Oct 27 19:33:42 2008
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - Main Window
+/* Eye Of Gnome - Main Window
*
* Copyright (C) 2000-2008 The Free Software Foundation
*
@@ -7,7 +7,7 @@
* Based on code by:
* - Federico Mena-Quintero <federico gnu org>
* - Jens Finke <jens gnome org>
- * Based on evince code (shell/ev-window.c) by:
+ * Based on evince code (shell/ev-window.c) by:
* - Martin Kretzschmar <martink gnome org>
*
* This program is free software; you can redistribute it and/or modify
@@ -112,7 +112,7 @@
static gint signals[SIGNAL_LAST];
-/* Drag target types */
+/* Drag target types */
enum {
EOG_WINDOW_TARGET_URI_LIST
};
@@ -184,7 +184,7 @@
GtkActionGroup *actions_open_with;
guint open_with_menu_id;
-
+
gboolean save_disabled;
#ifdef HAVE_LCMS
@@ -221,7 +221,7 @@
if (q == 0)
q = g_quark_from_static_string ("eog-window-error-quark");
-
+
return q;
}
@@ -246,7 +246,7 @@
interpolate = gconf_value_get_bool (entry->value);
}
- eog_scroll_view_set_antialiasing (EOG_SCROLL_VIEW (priv->view),
+ eog_scroll_view_set_antialiasing (EOG_SCROLL_VIEW (priv->view),
interpolate);
}
@@ -271,7 +271,7 @@
scroll_wheel_zoom = gconf_value_get_bool (entry->value);
}
- eog_scroll_view_set_scroll_wheel_zoom (EOG_SCROLL_VIEW (priv->view),
+ eog_scroll_view_set_scroll_wheel_zoom (EOG_SCROLL_VIEW (priv->view),
scroll_wheel_zoom);
}
@@ -296,7 +296,7 @@
multiplier = gconf_value_get_float (entry->value);
}
- eog_scroll_view_set_zoom_multiplier (EOG_SCROLL_VIEW (priv->view),
+ eog_scroll_view_set_zoom_multiplier (EOG_SCROLL_VIEW (priv->view),
multiplier);
}
@@ -362,15 +362,15 @@
g_return_if_fail (EOG_IS_SCROLL_VIEW (priv->view));
- value = gconf_client_get_string (priv->client,
- EOG_CONF_VIEW_TRANSPARENCY,
+ value = gconf_client_get_string (priv->client,
+ EOG_CONF_VIEW_TRANSPARENCY,
NULL);
if (!value || g_ascii_strcasecmp (value, "COLOR") != 0) {
g_free (value);
return;
}
-
+
if (entry->value != NULL && entry->value->type == GCONF_VALUE_STRING) {
color_str = gconf_value_get_string (entry->value);
@@ -403,7 +403,7 @@
show_buttons = gconf_value_get_bool (entry->value);
}
- eog_thumb_nav_set_show_buttons (EOG_THUMB_NAV (priv->nav),
+ eog_thumb_nav_set_show_buttons (EOG_THUMB_NAV (priv->nav),
show_buttons);
}
@@ -426,8 +426,8 @@
priv = EOG_WINDOW (user_data)->priv;
- mode_entry = gconf_client_get_entry (priv->client,
- EOG_CONF_UI_IMAGE_COLLECTION_POSITION,
+ mode_entry = gconf_client_get_entry (priv->client,
+ EOG_CONF_UI_IMAGE_COLLECTION_POSITION,
NULL, TRUE, NULL);
if (G_LIKELY (mode_entry != NULL)) {
@@ -438,8 +438,8 @@
gconf_entry_unref (mode_entry);
}
- mode_entry = gconf_client_get_entry (priv->client,
- EOG_CONF_UI_IMAGE_COLLECTION_RESIZABLE,
+ mode_entry = gconf_client_get_entry (priv->client,
+ EOG_CONF_UI_IMAGE_COLLECTION_RESIZABLE,
NULL, TRUE, NULL);
if (G_LIKELY (mode_entry != NULL)) {
@@ -450,7 +450,7 @@
gconf_entry_unref (mode_entry);
}
- if (priv->collection_position == position &&
+ if (priv->collection_position == position &&
priv->collection_resizable == resizable)
return;
@@ -554,16 +554,16 @@
window = EOG_WINDOW (user_data);
priv = EOG_WINDOW (user_data)->priv;
-
+
if (entry->value != NULL && entry->value->type == GCONF_VALUE_BOOL) {
save_disabled = gconf_value_get_bool (entry->value);
}
priv->save_disabled = save_disabled;
- action_save =
+ action_save =
gtk_action_group_get_action (priv->actions_image, "FileSave");
- action_save_as =
+ action_save_as =
gtk_action_group_get_action (priv->actions_image, "FileSaveAs");
if (priv->save_disabled) {
@@ -573,13 +573,13 @@
EogImage *image = eog_window_get_image (window);
if (EOG_IS_IMAGE (image)) {
- gtk_action_set_sensitive (action_save,
+ gtk_action_set_sensitive (action_save,
eog_image_is_modified (image));
- gtk_action_set_sensitive (action_save_as, TRUE);
+ gtk_action_set_sensitive (action_save_as, TRUE);
}
}
-}
+}
#ifdef HAVE_LCMS
static cmsHPROFILE *
@@ -596,7 +596,7 @@
cmsHPROFILE *profile;
char *atom_name;
int lcms_error_action;
-
+
dpy = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
if (gdk_screen_get_number (screen) > 0)
@@ -608,17 +608,17 @@
g_free (atom_name);
- result = XGetWindowProperty (dpy,
+ result = XGetWindowProperty (dpy,
GDK_WINDOW_XID (gdk_screen_get_root_window (screen)),
- icc_atom,
- 0,
+ icc_atom,
+ 0,
G_MAXLONG,
- False,
- XA_CARDINAL,
- &type,
- &format,
+ False,
+ XA_CARDINAL,
+ &type,
+ &format,
&nitems,
- &bytes_after,
+ &bytes_after,
(guchar **)&str);
/* TODO: handle bytes_after != 0 */
@@ -676,16 +676,16 @@
gint pos, n_images;
priv = window->priv;
-
+
n_images = eog_list_store_length (EOG_LIST_STORE (priv->store));
if (n_images > 0) {
- pos = eog_list_store_get_pos_by_image (EOG_LIST_STORE (priv->store),
+ pos = eog_list_store_get_pos_by_image (EOG_LIST_STORE (priv->store),
priv->image);
/* Images: (image pos) / (n_total_images) */
- eog_statusbar_set_image_number (EOG_STATUSBAR (priv->statusbar),
- pos + 1,
+ eog_statusbar_set_image_number (EOG_STATUSBAR (priv->statusbar),
+ pos + 1,
n_images);
}
}
@@ -697,7 +697,7 @@
char *str = NULL;
g_return_if_fail (EOG_IS_WINDOW (window));
-
+
eog_debug (DEBUG_WINDOW);
priv = window->priv;
@@ -712,30 +712,30 @@
eog_image_get_size (priv->image, &width, &height);
bytes = eog_image_get_bytes (priv->image);
-
+
if ((width > 0) && (height > 0)) {
char *size_string;
size_string = g_format_size_for_display (bytes);
/* [image width] x [image height] pixels [bytes] [zoom in percent] */
- str = g_strdup_printf ("%i x %i %s %s %i%%",
- width,
- height,
- ngettext ("pixel", "pixels", height),
- size_string,
+ str = g_strdup_printf ("%i x %i %s %s %i%%",
+ width,
+ height,
+ ngettext ("pixel", "pixels", height),
+ size_string,
zoom);
-
+
g_free (size_string);
}
-
+
update_image_pos (window);
}
- gtk_statusbar_pop (GTK_STATUSBAR (priv->statusbar),
+ gtk_statusbar_pop (GTK_STATUSBAR (priv->statusbar),
priv->image_info_message_cid);
-
- gtk_statusbar_push (GTK_STATUSBAR (priv->statusbar),
+
+ gtk_statusbar_push (GTK_STATUSBAR (priv->statusbar),
priv->image_info_message_cid, str ? str : "");
g_free (str);
@@ -761,7 +761,7 @@
FALSE,
0);
- g_object_add_weak_pointer (G_OBJECT (window->priv->message_area),
+ g_object_add_weak_pointer (G_OBJECT (window->priv->message_area),
(void *) &window->priv->message_area);
}
@@ -786,28 +786,28 @@
priv = window->priv;
- action_collection =
- gtk_action_group_get_action (priv->actions_window,
+ action_collection =
+ gtk_action_group_get_action (priv->actions_window,
"ViewImageCollection");
- action_sidebar =
- gtk_action_group_get_action (priv->actions_window,
+ action_sidebar =
+ gtk_action_group_get_action (priv->actions_window,
"ViewSidebar");
- action_fscreen =
- gtk_action_group_get_action (priv->actions_image,
+ action_fscreen =
+ gtk_action_group_get_action (priv->actions_image,
"ViewFullscreen");
- action_sshow =
- gtk_action_group_get_action (priv->actions_collection,
+ action_sshow =
+ gtk_action_group_get_action (priv->actions_collection,
"ViewSlideshow");
- action_print =
- gtk_action_group_get_action (priv->actions_image,
+ action_print =
+ gtk_action_group_get_action (priv->actions_image,
"FilePrint");
- action_page_setup =
- gtk_action_group_get_action (priv->actions_image,
+ action_page_setup =
+ gtk_action_group_get_action (priv->actions_image,
"FilePageSetup");
g_assert (action_collection != NULL);
@@ -838,16 +838,16 @@
}
} else {
if (priv->flags & EOG_STARTUP_DISABLE_COLLECTION) {
- gconf_client_set_bool (priv->client,
- EOG_CONF_UI_IMAGE_COLLECTION,
+ gconf_client_set_bool (priv->client,
+ EOG_CONF_UI_IMAGE_COLLECTION,
FALSE,
NULL);
show_image_collection = FALSE;
} else {
- show_image_collection =
- gconf_client_get_bool (priv->client,
- EOG_CONF_UI_IMAGE_COLLECTION,
+ show_image_collection =
+ gconf_client_get_bool (priv->client,
+ EOG_CONF_UI_IMAGE_COLLECTION,
NULL);
}
@@ -857,7 +857,7 @@
gtk_widget_show (priv->layout);
- if (show_image_collection)
+ if (show_image_collection)
gtk_widget_show (priv->nav);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action_collection),
@@ -865,7 +865,7 @@
gtk_action_group_set_sensitive (priv->actions_window, TRUE);
gtk_action_group_set_sensitive (priv->actions_image, TRUE);
-
+
gtk_action_set_sensitive (action_fscreen, TRUE);
if (n_images == 1) {
@@ -883,16 +883,16 @@
gtk_widget_grab_focus (priv->view);
}
- print_disabled = gconf_client_get_bool (priv->client,
- EOG_CONF_DESKTOP_CAN_PRINT,
+ print_disabled = gconf_client_get_bool (priv->client,
+ EOG_CONF_DESKTOP_CAN_PRINT,
NULL);
if (print_disabled) {
gtk_action_set_sensitive (action_print, FALSE);
}
- page_setup_disabled = gconf_client_get_bool (priv->client,
- EOG_CONF_DESKTOP_CAN_SETUP_PAGE,
+ page_setup_disabled = gconf_client_get_bool (priv->client,
+ EOG_CONF_DESKTOP_CAN_SETUP_PAGE,
NULL);
if (page_setup_disabled) {
@@ -916,15 +916,15 @@
n_selected = eog_thumb_view_get_n_selected (EOG_THUMB_VIEW (priv->thumbview));
- wallpaper_action =
- gtk_action_group_get_action (priv->actions_image,
+ wallpaper_action =
+ gtk_action_group_get_action (priv->actions_image,
"SetAsWallpaper");
if (n_selected == 1) {
gtk_action_set_sensitive (wallpaper_action, TRUE);
} else {
gtk_action_set_sensitive (wallpaper_action, FALSE);
- }
+ }
}
static gboolean
@@ -933,7 +933,7 @@
gchar *text_uri;
GFileInfo *file_info;
GtkRecentData *recent_data;
- static gchar *groups[2] = { EOG_RECENT_FILES_GROUP , NULL };
+ static gchar *groups[2] = { EOG_RECENT_FILES_GROUP , NULL };
if (file == NULL) return FALSE;
@@ -945,7 +945,7 @@
if (text_uri == NULL)
return FALSE;
-
+
file_info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
0, NULL, NULL);
@@ -961,8 +961,8 @@
recent_data->groups = groups;
recent_data->is_private = FALSE;
- gtk_recent_manager_add_full (gtk_recent_manager_get_default (),
- text_uri,
+ gtk_recent_manager_add_full (gtk_recent_manager_get_default (),
+ text_uri,
recent_data);
g_free (recent_data->app_exec);
@@ -992,7 +992,7 @@
gtk_window_set_icon (GTK_WINDOW (window), thumb);
if (window->priv->properties_dlg != NULL) {
- eog_properties_dialog_update (EOG_PROPERTIES_DIALOG (priv->properties_dlg),
+ eog_properties_dialog_update (EOG_PROPERTIES_DIALOG (priv->properties_dlg),
image);
}
@@ -1008,7 +1008,7 @@
}
}
-static void
+static void
eog_window_display_image (EogWindow *window, EogImage *image)
{
EogWindowPrivate *priv;
@@ -1024,9 +1024,9 @@
priv = window->priv;
if (image != NULL) {
- g_signal_connect (image,
- "thumbnail_changed",
- G_CALLBACK (image_thumb_changed_cb),
+ g_signal_connect (image,
+ "thumbnail_changed",
+ G_CALLBACK (image_thumb_changed_cb),
window);
image_thumb_changed_cb (image, window);
@@ -1053,7 +1053,7 @@
GAppInfo *app;
GFile *file;
GList *files = NULL;
-
+
image = EOG_IMAGE (data);
file = eog_image_get_file (image);
@@ -1062,7 +1062,7 @@
g_app_info_launch (app,
files,
NULL, NULL);
-
+
g_object_unref (file);
g_list_free (files);
}
@@ -1092,7 +1092,7 @@
else {
mime_type = g_file_info_get_content_type (file_info);
}
-
+
if (priv->open_with_menu_id != 0) {
gtk_ui_manager_remove_ui (priv->ui_mgr, priv->open_with_menu_id);
priv->open_with_menu_id = 0;
@@ -1138,7 +1138,7 @@
action = gtk_action_new (name, label, tip, NULL);
g_free (label);
- g_free (tip);
+ g_free (tip);
g_object_set_data_full (G_OBJECT (action), "app", app,
(GDestroyNotify) g_object_unref);
@@ -1182,17 +1182,17 @@
eog_window_clear_load_job (EogWindow *window)
{
EogWindowPrivate *priv = window->priv;
-
+
if (priv->load_job != NULL) {
if (!priv->load_job->finished)
eog_job_queue_remove_job (priv->load_job);
-
- g_signal_handlers_disconnect_by_func (priv->load_job,
- eog_job_progress_cb,
+
+ g_signal_handlers_disconnect_by_func (priv->load_job,
+ eog_job_progress_cb,
window);
- g_signal_handlers_disconnect_by_func (priv->load_job,
- eog_job_load_cb,
+ g_signal_handlers_disconnect_by_func (priv->load_job,
+ eog_job_load_cb,
window);
eog_image_cancel_load (EOG_JOB_LOAD (priv->load_job)->image);
@@ -1206,20 +1206,20 @@
}
static void
-eog_job_progress_cb (EogJobLoad *job, float progress, gpointer user_data)
+eog_job_progress_cb (EogJobLoad *job, float progress, gpointer user_data)
{
EogWindow *window;
g_return_if_fail (EOG_IS_WINDOW (user_data));
-
+
window = EOG_WINDOW (user_data);
- eog_statusbar_set_progress (EOG_STATUSBAR (window->priv->statusbar),
+ eog_statusbar_set_progress (EOG_STATUSBAR (window->priv->statusbar),
progress);
}
static void
-eog_job_save_progress_cb (EogJobSave *job, float progress, gpointer user_data)
+eog_job_save_progress_cb (EogJobSave *job, float progress, gpointer user_data)
{
EogWindowPrivate *priv;
EogWindow *window;
@@ -1227,17 +1227,17 @@
static EogImage *image = NULL;
g_return_if_fail (EOG_IS_WINDOW (user_data));
-
+
window = EOG_WINDOW (user_data);
priv = window->priv;
- eog_statusbar_set_progress (EOG_STATUSBAR (priv->statusbar),
+ eog_statusbar_set_progress (EOG_STATUSBAR (priv->statusbar),
progress);
if (image != job->current_image) {
gchar *str_image, *status_message;
guint n_images;
-
+
image = job->current_image;
n_images = g_list_length (job->images);
@@ -1249,19 +1249,19 @@
* - the original filename
* - the current image's position in the queue
* - the total number of images queued for saving */
- status_message = g_strdup_printf (_("Saving image \"%s\" (%u/%u)"),
+ status_message = g_strdup_printf (_("Saving image \"%s\" (%u/%u)"),
str_image,
job->current_pos + 1,
n_images);
g_free (str_image);
-
- gtk_statusbar_pop (GTK_STATUSBAR (priv->statusbar),
+
+ gtk_statusbar_pop (GTK_STATUSBAR (priv->statusbar),
priv->image_info_message_cid);
gtk_statusbar_push (GTK_STATUSBAR (priv->statusbar),
- priv->image_info_message_cid,
+ priv->image_info_message_cid,
status_message);
-
+
g_free (status_message);
}
@@ -1270,8 +1270,8 @@
}
static void
-eog_window_obtain_desired_size (EogImage *image,
- gint width,
+eog_window_obtain_desired_size (EogImage *image,
+ gint width,
gint height,
EogWindow *window)
{
@@ -1315,8 +1315,8 @@
screen_width = monitor.width;
screen_height = monitor.height;
- deco_width = window_width - view_width;
- deco_height = window_height - view_height;
+ deco_width = window_width - view_width;
+ deco_height = window_height - view_height;
if (img_width > 0 && img_height > 0) {
if ((img_width + deco_width > screen_width) ||
@@ -1347,7 +1347,7 @@
g_signal_emit (window, signals[SIGNAL_PREPARED], 0);
}
-static void
+static void
eog_window_error_message_area_response (EogMessageArea *message_area,
gint response_id,
EogWindow *window)
@@ -1358,7 +1358,7 @@
return;
}
- /* Trigger loading for current image again */
+ /* Trigger loading for current image again */
eog_thumb_view_select_single (EOG_THUMB_VIEW (window->priv->thumbview),
EOG_THUMB_VIEW_SELECT_CURRENT);
}
@@ -1371,7 +1371,7 @@
GtkAction *action_undo, *action_save;
g_return_if_fail (EOG_IS_WINDOW (data));
-
+
eog_debug (DEBUG_WINDOW);
window = EOG_WINDOW (data);
@@ -1379,12 +1379,12 @@
eog_statusbar_set_progress (EOG_STATUSBAR (priv->statusbar), 0.0);
- gtk_statusbar_pop (GTK_STATUSBAR (window->priv->statusbar),
+ gtk_statusbar_pop (GTK_STATUSBAR (window->priv->statusbar),
priv->image_info_message_cid);
if (priv->image != NULL) {
- g_signal_handlers_disconnect_by_func (priv->image,
- image_thumb_changed_cb,
+ g_signal_handlers_disconnect_by_func (priv->image,
+ image_thumb_changed_cb,
window);
g_object_unref (priv->image);
@@ -1394,7 +1394,7 @@
if (EOG_JOB (job)->error == NULL) {
#ifdef HAVE_LCMS
- eog_image_apply_display_profile (job->image,
+ eog_image_apply_display_profile (job->image,
priv->display_profile);
#endif
@@ -1414,7 +1414,7 @@
window);
gtk_window_set_icon (GTK_WINDOW (window), NULL);
- gtk_window_set_title (GTK_WINDOW (window),
+ gtk_window_set_title (GTK_WINDOW (window),
eog_image_get_caption (job->image));
eog_window_set_message_area (window, message_area);
@@ -1443,16 +1443,16 @@
window->priv->status = EOG_WINDOW_STATUS_NORMAL;
g_signal_handlers_disconnect_by_func
- (job->image,
- G_CALLBACK (eog_window_obtain_desired_size),
+ (job->image,
+ G_CALLBACK (eog_window_obtain_desired_size),
window);
}
-
+
action_save = gtk_action_group_get_action (priv->actions_image, "FileSave");
action_undo = gtk_action_group_get_action (priv->actions_image, "EditUndo");
/* We set these to be unsensitive on image load, we activate it
- * only when the image is changed. */
+ * only when the image is changed. */
gtk_action_set_sensitive (action_save, FALSE);
gtk_action_set_sensitive (action_undo, FALSE);
@@ -1463,13 +1463,13 @@
eog_window_clear_transform_job (EogWindow *window)
{
EogWindowPrivate *priv = window->priv;
-
+
if (priv->transform_job != NULL) {
if (!priv->transform_job->finished)
eog_job_queue_remove_job (priv->transform_job);
-
- g_signal_handlers_disconnect_by_func (priv->transform_job,
- eog_job_transform_cb,
+
+ g_signal_handlers_disconnect_by_func (priv->transform_job,
+ eog_job_transform_cb,
window);
g_object_unref (priv->transform_job);
priv->transform_job = NULL;
@@ -1482,16 +1482,16 @@
EogWindow *window;
GtkAction *action_undo, *action_save;
EogImage *image;
-
+
g_return_if_fail (EOG_IS_WINDOW (data));
-
+
window = EOG_WINDOW (data);
eog_window_clear_transform_job (window);
-
- action_undo =
+
+ action_undo =
gtk_action_group_get_action (window->priv->actions_image, "EditUndo");
- action_save =
+ action_save =
gtk_action_group_get_action (window->priv->actions_image, "FileSave");
image = eog_window_get_image (window);
@@ -1504,7 +1504,7 @@
}
}
-static void
+static void
apply_transformation (EogWindow *window, EogTransform *trans)
{
EogWindowPrivate *priv;
@@ -1513,11 +1513,11 @@
g_return_if_fail (EOG_IS_WINDOW (window));
priv = window->priv;
-
+
images = eog_thumb_view_get_selected_images (EOG_THUMB_VIEW (priv->thumbview));
eog_window_clear_transform_job (window);
-
+
priv->transform_job = eog_job_transform_new (images, trans);
g_signal_connect (priv->transform_job,
@@ -1534,7 +1534,7 @@
}
static void
-handle_image_selection_changed_cb (EogThumbView *thumbview, EogWindow *window)
+handle_image_selection_changed_cb (EogThumbView *thumbview, EogWindow *window)
{
EogWindowPrivate *priv;
EogImage *image;
@@ -1547,7 +1547,7 @@
return;
update_selection_ui_visibility (window);
-
+
image = eog_thumb_view_get_first_selected_image (EOG_THUMB_VIEW (priv->thumbview));
g_assert (EOG_IS_IMAGE (image));
@@ -1592,17 +1592,17 @@
str_image = eog_image_get_uri_for_display (image);
- status_message = g_strdup_printf (_("Loading image \"%s\""),
+ status_message = g_strdup_printf (_("Loading image \"%s\""),
str_image);
g_free (str_image);
-
+
gtk_statusbar_push (GTK_STATUSBAR (priv->statusbar),
priv->image_info_message_cid, status_message);
g_free (status_message);
}
-
+
static void
view_zoom_changed_cb (GtkWidget *widget, double zoom, gpointer user_data)
{
@@ -1611,17 +1611,17 @@
GtkAction *action_zoom_out;
g_return_if_fail (EOG_IS_WINDOW (user_data));
-
+
window = EOG_WINDOW (user_data);
update_status_bar (window);
- action_zoom_in =
- gtk_action_group_get_action (window->priv->actions_image,
+ action_zoom_in =
+ gtk_action_group_get_action (window->priv->actions_image,
"ViewZoomIn");
- action_zoom_out =
- gtk_action_group_get_action (window->priv->actions_image,
+ action_zoom_out =
+ gtk_action_group_get_action (window->priv->actions_image,
"ViewZoomOut");
gtk_action_set_sensitive (action_zoom_in,
@@ -1636,16 +1636,16 @@
GtkRecentInfo *info;
const gchar *uri;
GSList *list = NULL;
-
+
info = g_object_get_data (G_OBJECT (action), "gtk-recent-info");
g_return_if_fail (info != NULL);
uri = gtk_recent_info_get_uri (info);
list = g_slist_prepend (list, g_strdup (uri));
- eog_application_open_uri_list (EOG_APP,
- list,
- GDK_CURRENT_TIME,
+ eog_application_open_uri_list (EOG_APP,
+ list,
+ GDK_CURRENT_TIME,
0,
NULL);
@@ -1663,13 +1663,13 @@
uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser));
- eog_application_open_uri_list (EOG_APP,
- uris,
- GDK_CURRENT_TIME,
+ eog_application_open_uri_list (EOG_APP,
+ uris,
+ GDK_CURRENT_TIME,
0,
NULL);
-
- g_slist_foreach (uris, (GFunc) g_free, NULL);
+
+ g_slist_foreach (uris, (GFunc) g_free, NULL);
g_slist_free (uris);
}
@@ -1681,12 +1681,12 @@
{
GtkAction *action;
- action = gtk_action_group_get_action (window->priv->actions_image,
+ action = gtk_action_group_get_action (window->priv->actions_image,
"ViewFullscreen");
g_signal_handlers_block_by_func
(action, G_CALLBACK (eog_window_cmd_fullscreen), window);
-
+
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
window->priv->mode == EOG_WINDOW_MODE_FULLSCREEN);
@@ -1699,12 +1699,12 @@
{
GtkAction *action;
- action = gtk_action_group_get_action (window->priv->actions_collection,
+ action = gtk_action_group_get_action (window->priv->actions_collection,
"ViewSlideshow");
g_signal_handlers_block_by_func
(action, G_CALLBACK (eog_window_cmd_slideshow), window);
-
+
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
window->priv->mode == EOG_WINDOW_MODE_SLIDESHOW);
@@ -1745,8 +1745,8 @@
}
static void
-fullscreen_popup_size_request_cb (GtkWidget *popup,
- GtkRequisition *req,
+fullscreen_popup_size_request_cb (GtkWidget *popup,
+ GtkRequisition *req,
EogWindow *window)
{
eog_window_update_fullscreen_popup (window);
@@ -1772,7 +1772,7 @@
EogWindowPrivate *priv = window->priv;
EogImage *image = NULL;
gint pos;
-
+
image = eog_thumb_view_get_first_selected_image (EOG_THUMB_VIEW (priv->thumbview));
pos = eog_list_store_get_pos_by_image (priv->store, image);
@@ -1787,13 +1787,13 @@
EogWindowPrivate *priv = window->priv;
eog_debug (DEBUG_WINDOW);
-
+
if (!priv->slideshow_loop && slideshow_is_loop_end (window)) {
eog_window_stop_fullscreen (window, TRUE);
return FALSE;
}
- eog_thumb_view_select_single (EOG_THUMB_VIEW (priv->thumbview),
+ eog_thumb_view_select_single (EOG_THUMB_VIEW (priv->thumbview),
EOG_THUMB_VIEW_SELECT_RIGHT);
return TRUE;
@@ -1803,7 +1803,7 @@
fullscreen_clear_timeout (EogWindow *window)
{
eog_debug (DEBUG_WINDOW);
-
+
if (window->priv->fullscreen_timeout_source != NULL) {
g_source_unref (window->priv->fullscreen_timeout_source);
g_source_destroy (window->priv->fullscreen_timeout_source);
@@ -1818,12 +1818,12 @@
GSource *source;
eog_debug (DEBUG_WINDOW);
-
+
fullscreen_clear_timeout (window);
source = g_timeout_source_new (EOG_WINDOW_FULLSCREEN_TIMEOUT);
g_source_set_callback (source, fullscreen_timeout_cb, window, NULL);
-
+
g_source_attach (source, NULL);
window->priv->fullscreen_timeout_source = source;
@@ -1835,7 +1835,7 @@
slideshow_clear_timeout (EogWindow *window)
{
eog_debug (DEBUG_WINDOW);
-
+
if (window->priv->slideshow_switch_source != NULL) {
g_source_unref (window->priv->slideshow_switch_source);
g_source_destroy (window->priv->slideshow_switch_source);
@@ -1850,7 +1850,7 @@
GSource *source;
eog_debug (DEBUG_WINDOW);
-
+
slideshow_clear_timeout (window);
source = g_timeout_source_new (window->priv->slideshow_switch_timeout * 1000);
@@ -1881,7 +1881,7 @@
EogWindow *window = EOG_WINDOW (user_data);
eog_debug (DEBUG_WINDOW);
-
+
if (event->y < EOG_WINDOW_FULLSCREEN_POPUP_THRESHOLD) {
show_fullscreen_popup (window);
} else {
@@ -1899,7 +1899,7 @@
EogWindow *window = EOG_WINDOW (user_data);
eog_debug (DEBUG_WINDOW);
-
+
fullscreen_clear_timeout (window);
return FALSE;
@@ -1911,12 +1911,12 @@
GtkAction *action;
eog_debug (DEBUG_WINDOW);
-
+
if (window->priv->mode == EOG_WINDOW_MODE_SLIDESHOW) {
- action = gtk_action_group_get_action (window->priv->actions_collection,
+ action = gtk_action_group_get_action (window->priv->actions_collection,
"ViewSlideshow");
} else {
- action = gtk_action_group_get_action (window->priv->actions_image,
+ action = gtk_action_group_get_action (window->priv->actions_image,
"ViewFullscreen");
}
g_return_if_fail (action != NULL);
@@ -1948,13 +1948,13 @@
GdkScreen *screen;
eog_debug (DEBUG_WINDOW);
-
+
popup = gtk_window_new (GTK_WINDOW_POPUP);
hbox = gtk_hbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (popup), hbox);
- toolbar = gtk_ui_manager_get_widget (window->priv->ui_mgr,
+ toolbar = gtk_ui_manager_get_widget (window->priv->ui_mgr,
"/FullscreenToolbar");
g_assert (GTK_IS_WIDGET (toolbar));
gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
@@ -1989,17 +1989,17 @@
update_ui_visibility (EogWindow *window)
{
EogWindowPrivate *priv;
-
+
GtkAction *action;
GtkWidget *menubar;
GError *error = NULL;
-
+
gboolean fullscreen_mode, visible;
g_return_if_fail (EOG_IS_WINDOW (window));
eog_debug (DEBUG_WINDOW);
-
+
priv = window->priv;
fullscreen_mode = priv->mode == EOG_WINDOW_MODE_FULLSCREEN ||
@@ -2069,7 +2069,7 @@
gboolean upscale;
eog_debug (DEBUG_WINDOW);
-
+
priv = window->priv;
if (slideshow) {
@@ -2119,24 +2119,24 @@
fullscreen_set_timeout (window);
if (slideshow) {
- priv->slideshow_loop =
- gconf_client_get_bool (priv->client,
- EOG_CONF_FULLSCREEN_LOOP,
+ priv->slideshow_loop =
+ gconf_client_get_bool (priv->client,
+ EOG_CONF_FULLSCREEN_LOOP,
NULL);
- priv->slideshow_switch_timeout =
- gconf_client_get_int (priv->client,
- EOG_CONF_FULLSCREEN_SECONDS,
+ priv->slideshow_switch_timeout =
+ gconf_client_get_int (priv->client,
+ EOG_CONF_FULLSCREEN_SECONDS,
NULL);
slideshow_set_timeout (window);
}
- upscale = gconf_client_get_bool (priv->client,
- EOG_CONF_FULLSCREEN_UPSCALE,
+ upscale = gconf_client_get_bool (priv->client,
+ EOG_CONF_FULLSCREEN_UPSCALE,
NULL);
- eog_scroll_view_set_zoom_upscale (EOG_SCROLL_VIEW (priv->view),
+ eog_scroll_view_set_zoom_upscale (EOG_SCROLL_VIEW (priv->view),
upscale);
gtk_widget_grab_focus (priv->view);
@@ -2174,7 +2174,7 @@
{
EogWindowPrivate *priv;
GtkWidget *menubar;
-
+
eog_debug (DEBUG_WINDOW);
priv = window->priv;
@@ -2189,7 +2189,7 @@
if (slideshow) {
slideshow_clear_timeout (window);
}
-
+
g_object_set (G_OBJECT (gtk_widget_get_parent (priv->view)),
"shadow-type", GTK_SHADOW_IN,
NULL);
@@ -2201,7 +2201,7 @@
g_signal_handlers_disconnect_by_func (priv->view,
(gpointer) fullscreen_leave_notify_cb,
window);
-
+
g_signal_handlers_disconnect_by_func (priv->thumbview,
(gpointer) fullscreen_motion_notify_cb,
window);
@@ -2209,13 +2209,13 @@
g_signal_handlers_disconnect_by_func (priv->thumbview,
(gpointer) fullscreen_leave_notify_cb,
window);
-
+
update_ui_visibility (window);
menubar = gtk_ui_manager_get_widget (priv->ui_mgr, "/MainMenu");
g_assert (GTK_IS_WIDGET (menubar));
gtk_widget_show (menubar);
-
+
eog_scroll_view_set_zoom_upscale (EOG_SCROLL_VIEW (priv->view), FALSE);
eog_scroll_view_set_bg_color (EOG_SCROLL_VIEW (window->priv->view), NULL);
@@ -2243,7 +2243,7 @@
GtkPrintSettings *print_settings;
eog_debug (DEBUG_PRINTING);
-
+
print_settings = eog_print_get_print_settings ();
page_setup = eog_print_get_page_setup ();
@@ -2268,7 +2268,7 @@
GtkPrintSettings *print_settings;
eog_debug (DEBUG_PRINTING);
-
+
print_settings = eog_print_get_print_settings ();
page_setup = eog_print_get_page_setup ();
@@ -2290,7 +2290,7 @@
GTK_BUTTONS_CLOSE,
_("Error printing file:\n%s"),
error->message);
- g_signal_connect (dialog, "response",
+ g_signal_connect (dialog, "response",
G_CALLBACK (gtk_widget_destroy), NULL);
gtk_widget_show (dialog);
g_error_free (error);
@@ -2337,7 +2337,7 @@
g_signal_connect (dlg, "response",
G_CALLBACK (file_open_dialog_response_cb),
window);
-
+
gtk_widget_show_all (dlg);
}
@@ -2359,7 +2359,7 @@
window = EOG_WINDOW (user_data);
- pref_dlg = eog_preferences_dialog_get_instance (GTK_WINDOW (window),
+ pref_dlg = eog_preferences_dialog_get_instance (GTK_WINDOW (window),
window->priv->client);
eog_dialog_show (EOG_DIALOG (pref_dlg));
@@ -2386,7 +2386,7 @@
eog_application_reset_toolbars_model (EOG_APP);
model = eog_application_get_toolbars_model (EOG_APP);
- egg_editable_toolbar_set_model
+ egg_editable_toolbar_set_model
(EGG_EDITABLE_TOOLBAR (window->priv->toolbar), model);
egg_toolbar_editor_set_model (editor, model);
@@ -2417,7 +2417,7 @@
window = EOG_WINDOW (user_data);
dialog = gtk_dialog_new_with_buttons (_("Toolbar Editor"),
- GTK_WINDOW (window),
+ GTK_WINDOW (window),
GTK_DIALOG_DESTROY_WITH_PARENT,
_("_Reset to Default"),
EOG_TB_EDITOR_DLG_RESET_RESPONSE,
@@ -2427,7 +2427,7 @@
GTK_RESPONSE_HELP,
NULL);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog),
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog),
GTK_RESPONSE_CLOSE);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -2444,7 +2444,7 @@
gtk_container_set_border_width (GTK_CONTAINER (editor), 5);
gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5);
-
+
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), editor);
egg_editable_toolbar_set_edit_mode
@@ -2452,7 +2452,7 @@
g_object_set_data (G_OBJECT (dialog), "EggToolbarEditor", editor);
- g_signal_connect (dialog,
+ g_signal_connect (dialog,
"response",
G_CALLBACK (eog_window_cmd_edit_toolbar_cb),
window);
@@ -2476,7 +2476,7 @@
eog_window_cmd_about (GtkAction *action, gpointer user_data)
{
EogWindow *window;
-
+
g_return_if_fail (EOG_IS_WINDOW (user_data));
static const char *authors[] = {
@@ -2548,7 +2548,7 @@
static void
eog_window_cmd_show_hide_bar (GtkAction *action, gpointer user_data)
{
- EogWindow *window;
+ EogWindow *window;
EogWindowPrivate *priv;
gboolean visible;
@@ -2559,7 +2559,7 @@
if (priv->mode != EOG_WINDOW_MODE_NORMAL &&
priv->mode != EOG_WINDOW_MODE_FULLSCREEN) return;
-
+
visible = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
if (g_ascii_strcasecmp (gtk_action_get_name (action), "ViewToolbar") == 0) {
@@ -2634,12 +2634,12 @@
EogWindow *window = EOG_WINDOW (user_data);
GtkAction *action_save;
- g_signal_handlers_disconnect_by_func (job,
- eog_job_save_cb,
+ g_signal_handlers_disconnect_by_func (job,
+ eog_job_save_cb,
window);
- g_signal_handlers_disconnect_by_func (job,
- eog_job_save_progress_cb,
+ g_signal_handlers_disconnect_by_func (job,
+ eog_job_save_progress_cb,
window);
g_object_unref (window->priv->save_job);
@@ -2712,14 +2712,14 @@
priv->save_job = eog_job_save_new (images);
- g_signal_connect (priv->save_job,
+ g_signal_connect (priv->save_job,
"finished",
- G_CALLBACK (eog_job_save_cb),
+ G_CALLBACK (eog_job_save_cb),
window);
- g_signal_connect (priv->save_job,
+ g_signal_connect (priv->save_job,
"progress",
- G_CALLBACK (eog_job_save_progress_cb),
+ G_CALLBACK (eog_job_save_progress_cb),
window);
eog_job_queue_add_job (priv->save_job);
@@ -2761,7 +2761,7 @@
}
gtk_widget_destroy (dialog);
g_free (folder_uri);
-
+
return save_file;
}
@@ -2784,7 +2784,7 @@
if (n_images == 1) {
GFile *file;
-
+
file = eog_window_retrieve_save_as_file (window, images->data);
if (!file) {
@@ -2792,7 +2792,7 @@
return;
}
- priv->save_job = eog_job_save_as_new (images, NULL, file);
+ priv->save_job = eog_job_save_as_new (images, NULL, file);
g_object_unref (file);
} else if (n_images > 1) {
@@ -2800,13 +2800,13 @@
GtkWidget *dialog;
gchar *basedir;
EogURIConverter *converter;
-
+
basedir = g_get_current_dir ();
base_file = g_file_new_for_path (basedir);
g_free (basedir);
dialog = eog_save_as_dialog_new (GTK_WINDOW (window),
- images,
+ images,
base_file);
gtk_widget_show_all (dialog);
@@ -2833,15 +2833,15 @@
/* n_images = 0 -- No Image selected */
return;
}
-
- g_signal_connect (priv->save_job,
+
+ g_signal_connect (priv->save_job,
"finished",
- G_CALLBACK (eog_job_save_cb),
+ G_CALLBACK (eog_job_save_cb),
window);
- g_signal_connect (priv->save_job,
+ g_signal_connect (priv->save_job,
"progress",
- G_CALLBACK (eog_job_save_progress_cb),
+ G_CALLBACK (eog_job_save_progress_cb),
window);
eog_job_queue_add_job (priv->save_job);
@@ -2872,16 +2872,16 @@
priv = window->priv;
- next_image_action =
- gtk_action_group_get_action (priv->actions_collection,
+ next_image_action =
+ gtk_action_group_get_action (priv->actions_collection,
"GoNext");
- previous_image_action =
- gtk_action_group_get_action (priv->actions_collection,
+ previous_image_action =
+ gtk_action_group_get_action (priv->actions_collection,
"GoPrevious");
if (window->priv->properties_dlg == NULL) {
- window->priv->properties_dlg =
+ window->priv->properties_dlg =
eog_properties_dialog_new (GTK_WINDOW (window),
EOG_THUMB_VIEW (priv->thumbview),
next_image_action,
@@ -2907,7 +2907,7 @@
{
g_return_if_fail (EOG_IS_WINDOW (user_data));
- apply_transformation (EOG_WINDOW (user_data),
+ apply_transformation (EOG_WINDOW (user_data),
eog_transform_flip_new (EOG_TRANSFORM_FLIP_HORIZONTAL));
}
@@ -2916,7 +2916,7 @@
{
g_return_if_fail (EOG_IS_WINDOW (user_data));
- apply_transformation (EOG_WINDOW (user_data),
+ apply_transformation (EOG_WINDOW (user_data),
eog_transform_flip_new (EOG_TRANSFORM_FLIP_VERTICAL));
}
@@ -2925,7 +2925,7 @@
{
g_return_if_fail (EOG_IS_WINDOW (user_data));
- apply_transformation (EOG_WINDOW (user_data),
+ apply_transformation (EOG_WINDOW (user_data),
eog_transform_rotate_new (90));
}
@@ -2934,7 +2934,7 @@
{
g_return_if_fail (EOG_IS_WINDOW (user_data));
- apply_transformation (EOG_WINDOW (user_data),
+ apply_transformation (EOG_WINDOW (user_data),
eog_transform_rotate_new (270));
}
@@ -2946,7 +2946,7 @@
EogImage *image;
GFile *file;
char *filename = NULL;
-
+
g_return_if_fail (EOG_IS_WINDOW (user_data));
window = EOG_WINDOW (user_data);
@@ -3013,13 +3013,13 @@
EogImage *image;
n_images = g_list_length (images);
-
+
if (n_images == 1) {
image = EOG_IMAGE (images->data);
- prompt = g_strdup_printf (_("Are you sure you want to move\n\"%s\" to the trash?"),
- eog_image_get_caption (image));
+ prompt = g_strdup_printf (_("Are you sure you want to move\n\"%s\" to the trash?"),
+ eog_image_get_caption (image));
} else {
- prompt = g_strdup_printf (ngettext("Are you sure you want to move\n"
+ prompt = g_strdup_printf (ngettext("Are you sure you want to move\n"
"the selected image to the trash?",
"Are you sure you want to move\n"
"the %d selected images to the trash?", n_images), n_images);
@@ -3029,7 +3029,7 @@
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE,
- "<span weight=\"bold\" size=\"larger\">%s</span>",
+ "<span weight=\"bold\" size=\"larger\">%s</span>",
prompt);
g_free (prompt);
@@ -3053,14 +3053,14 @@
gboolean can_trash, result;
g_return_val_if_fail (EOG_IS_IMAGE (image), FALSE);
-
+
file = eog_image_get_file (image);
file_info = g_file_query_info (file,
G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH,
0, NULL, NULL);
if (file_info == NULL) {
- g_set_error (error,
- EOG_WINDOW_ERROR,
+ g_set_error (error,
+ EOG_WINDOW_ERROR,
EOG_WINDOW_ERROR_TRASH_NOT_FOUND,
_("Couldn't access trash."));
return FALSE;
@@ -3073,18 +3073,18 @@
{
result = g_file_trash (file, NULL, NULL);
if (result == FALSE) {
- g_set_error (error,
- EOG_WINDOW_ERROR,
+ g_set_error (error,
+ EOG_WINDOW_ERROR,
EOG_WINDOW_ERROR_TRASH_NOT_FOUND,
_("Couldn't access trash."));
}
} else {
- g_set_error (error,
- EOG_WINDOW_ERROR,
+ g_set_error (error,
+ EOG_WINDOW_ERROR,
EOG_WINDOW_ERROR_TRASH_NOT_FOUND,
_("Couldn't access trash."));
}
-
+
g_object_unref (file);
return (can_trash ? result : FALSE);
@@ -3109,7 +3109,7 @@
window = EOG_WINDOW (user_data);
priv = window->priv;
list = priv->store;
-
+
n_images = eog_thumb_view_get_n_selected (EOG_THUMB_VIEW (priv->thumbview));
if (n_images < 1) return;
@@ -3127,7 +3127,7 @@
if (response != GTK_RESPONSE_OK) return;
}
-
+
pos = eog_list_store_get_pos_by_image (list, EOG_IMAGE (images->data));
/* FIXME: make a nice progress dialog */
@@ -3147,8 +3147,8 @@
} else {
char *header;
GtkWidget *dlg;
-
- header = g_strdup_printf (_("Error on deleting image %s"),
+
+ header = g_strdup_printf (_("Error on deleting image %s"),
eog_image_get_caption (image));
dlg = gtk_message_dialog_new (GTK_WINDOW (window),
@@ -3178,8 +3178,8 @@
if (pos >= 0) {
img = eog_list_store_get_image_by_pos (list, pos);
- eog_thumb_view_set_current_image (EOG_THUMB_VIEW (priv->thumbview),
- img,
+ eog_thumb_view_set_current_image (EOG_THUMB_VIEW (priv->thumbview),
+ img,
TRUE);
if (img != NULL) {
@@ -3193,7 +3193,7 @@
{
EogWindow *window;
gboolean fullscreen;
-
+
g_return_if_fail (EOG_IS_WINDOW (user_data));
eog_debug (DEBUG_WINDOW);
@@ -3214,7 +3214,7 @@
{
EogWindow *window;
gboolean slideshow;
-
+
g_return_if_fail (EOG_IS_WINDOW (user_data));
eog_debug (DEBUG_WINDOW);
@@ -3304,8 +3304,8 @@
eog_debug (DEBUG_WINDOW);
priv = EOG_WINDOW (user_data)->priv;
-
- eog_thumb_view_select_single (EOG_THUMB_VIEW (priv->thumbview),
+
+ eog_thumb_view_select_single (EOG_THUMB_VIEW (priv->thumbview),
EOG_THUMB_VIEW_SELECT_LEFT);
}
@@ -3320,7 +3320,7 @@
priv = EOG_WINDOW (user_data)->priv;
- eog_thumb_view_select_single (EOG_THUMB_VIEW (priv->thumbview),
+ eog_thumb_view_select_single (EOG_THUMB_VIEW (priv->thumbview),
EOG_THUMB_VIEW_SELECT_RIGHT);
}
@@ -3335,7 +3335,7 @@
priv = EOG_WINDOW (user_data)->priv;
- eog_thumb_view_select_single (EOG_THUMB_VIEW (priv->thumbview),
+ eog_thumb_view_select_single (EOG_THUMB_VIEW (priv->thumbview),
EOG_THUMB_VIEW_SELECT_FIRST);
}
@@ -3350,7 +3350,7 @@
priv = EOG_WINDOW (user_data)->priv;
- eog_thumb_view_select_single (EOG_THUMB_VIEW (priv->thumbview),
+ eog_thumb_view_select_single (EOG_THUMB_VIEW (priv->thumbview),
EOG_THUMB_VIEW_SELECT_LAST);
}
@@ -3363,139 +3363,139 @@
{ "Tools", NULL, N_("_Tools") },
{ "Help", NULL, N_("_Help") },
- { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
+ { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
N_("Open a file"),
G_CALLBACK (eog_window_cmd_file_open) },
- { "FileClose", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
+ { "FileClose", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
N_("Close window"),
G_CALLBACK (eog_window_cmd_close_window) },
{ "EditToolbar", NULL, N_("T_oolbar"), NULL,
N_("Edit the application toolbar"),
G_CALLBACK (eog_window_cmd_edit_toolbar) },
- { "EditPreferences", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), NULL,
- N_("Preferences for Eye of GNOME"),
+ { "EditPreferences", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), NULL,
+ N_("Preferences for Eye of GNOME"),
G_CALLBACK (eog_window_cmd_preferences) },
- { "HelpManual", GTK_STOCK_HELP, N_("_Contents"), "F1",
+ { "HelpManual", GTK_STOCK_HELP, N_("_Contents"), "F1",
N_("Help on this application"),
G_CALLBACK (eog_window_cmd_help) },
- { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL,
+ { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL,
N_("About this application"),
G_CALLBACK (eog_window_cmd_about) }
};
static const GtkToggleActionEntry toggle_entries_window[] = {
- { "ViewToolbar", NULL, N_("_Toolbar"), NULL,
+ { "ViewToolbar", NULL, N_("_Toolbar"), NULL,
N_("Changes the visibility of the toolbar in the current window"),
G_CALLBACK (eog_window_cmd_show_hide_bar), TRUE },
- { "ViewStatusbar", NULL, N_("_Statusbar"), NULL,
- N_("Changes the visibility of the statusbar in the current window"),
+ { "ViewStatusbar", NULL, N_("_Statusbar"), NULL,
+ N_("Changes the visibility of the statusbar in the current window"),
G_CALLBACK (eog_window_cmd_show_hide_bar), TRUE },
{ "ViewImageCollection", "eog-image-collection", N_("_Image Collection"), "F9",
- N_("Changes the visibility of the image collection pane in the current window"),
+ N_("Changes the visibility of the image collection pane in the current window"),
G_CALLBACK (eog_window_cmd_show_hide_bar), TRUE },
{ "ViewSidebar", NULL, N_("Side _Pane"), "<control>F9",
- N_("Changes the visibility of the side pane in the current window"),
+ N_("Changes the visibility of the side pane in the current window"),
G_CALLBACK (eog_window_cmd_show_hide_bar), TRUE },
};
static const GtkActionEntry action_entries_image[] = {
- { "FileSave", GTK_STOCK_SAVE, N_("_Save"), "<control>s",
- N_("Save changes in currently selected images"),
+ { "FileSave", GTK_STOCK_SAVE, N_("_Save"), "<control>s",
+ N_("Save changes in currently selected images"),
G_CALLBACK (eog_window_cmd_save) },
{ "FileOpenWith", NULL, N_("Open _with"), NULL,
N_("Open the selected image with a different application"),
NULL},
- { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("Save _As..."), "<control><shift>s",
+ { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("Save _As..."), "<control><shift>s",
N_("Save the selected images with a different name"),
G_CALLBACK (eog_window_cmd_save_as) },
- { "FilePageSetup", "document-page-setup", N_("Page Set_up..."), NULL,
- N_("Setup the page properties for printing"),
+ { "FilePageSetup", "document-page-setup", N_("Page Set_up..."), NULL,
+ N_("Setup the page properties for printing"),
G_CALLBACK (eog_window_cmd_page_setup) },
- { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "<control>p",
- N_("Print the selected image"),
+ { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "<control>p",
+ N_("Print the selected image"),
G_CALLBACK (eog_window_cmd_print) },
- { "FileProperties", GTK_STOCK_PROPERTIES, N_("Prope_rties"), "<alt>Return",
- N_("Show the properties and metadata of the selected image"),
+ { "FileProperties", GTK_STOCK_PROPERTIES, N_("Prope_rties"), "<alt>Return",
+ N_("Show the properties and metadata of the selected image"),
G_CALLBACK (eog_window_cmd_properties) },
- { "EditUndo", GTK_STOCK_UNDO, N_("_Undo"), "<control>z",
- N_("Undo the last change in the image"),
+ { "EditUndo", GTK_STOCK_UNDO, N_("_Undo"), "<control>z",
+ N_("Undo the last change in the image"),
G_CALLBACK (eog_window_cmd_undo) },
- { "EditFlipHorizontal", "object-flip-horizontal", N_("Flip _Horizontal"), NULL,
- N_("Mirror the image horizontally"),
+ { "EditFlipHorizontal", "object-flip-horizontal", N_("Flip _Horizontal"), NULL,
+ N_("Mirror the image horizontally"),
G_CALLBACK (eog_window_cmd_flip_horizontal) },
- { "EditFlipVertical", "object-flip-vertical", N_("Flip _Vertical"), NULL,
- N_("Mirror the image vertically"),
+ { "EditFlipVertical", "object-flip-vertical", N_("Flip _Vertical"), NULL,
+ N_("Mirror the image vertically"),
G_CALLBACK (eog_window_cmd_flip_vertical) },
- { "EditRotate90", "object-rotate-right", N_("_Rotate Clockwise"), "<control>r",
- N_("Rotate the image 90 degrees to the right"),
+ { "EditRotate90", "object-rotate-right", N_("_Rotate Clockwise"), "<control>r",
+ N_("Rotate the image 90 degrees to the right"),
G_CALLBACK (eog_window_cmd_rotate_90) },
- { "EditRotate270", "object-rotate-left", N_("Rotate Counterc_lockwise"), NULL,
- N_("Rotate the image 90 degrees to the left"),
+ { "EditRotate270", "object-rotate-left", N_("Rotate Counterc_lockwise"), NULL,
+ N_("Rotate the image 90 degrees to the left"),
G_CALLBACK (eog_window_cmd_rotate_270) },
- { "SetAsWallpaper", NULL, N_("Set As _Wallpaper"), NULL,
- N_("Set the selected image as the desktop wallpaper"),
+ { "SetAsWallpaper", NULL, N_("Set As _Wallpaper"), NULL,
+ N_("Set the selected image as the desktop wallpaper"),
G_CALLBACK (eog_window_cmd_wallpaper) },
- { "EditMoveToTrash", "user-trash", N_("Move to _Trash"), NULL,
- N_("Move the selected image to the trash folder"),
+ { "EditMoveToTrash", "user-trash", N_("Move to _Trash"), NULL,
+ N_("Move the selected image to the trash folder"),
G_CALLBACK (eog_window_cmd_move_to_trash) },
- { "ViewZoomIn", GTK_STOCK_ZOOM_IN, N_("_Zoom In"), "<control>plus",
- N_("Enlarge the image"),
+ { "ViewZoomIn", GTK_STOCK_ZOOM_IN, N_("_Zoom In"), "<control>plus",
+ N_("Enlarge the image"),
G_CALLBACK (eog_window_cmd_zoom_in) },
- { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "<control>minus",
- N_("Shrink the image"),
+ { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "<control>minus",
+ N_("Shrink the image"),
G_CALLBACK (eog_window_cmd_zoom_out) },
- { "ViewZoomNormal", GTK_STOCK_ZOOM_100, N_("_Normal Size"), "<control>0",
- N_("Show the image at its normal size"),
+ { "ViewZoomNormal", GTK_STOCK_ZOOM_100, N_("_Normal Size"), "<control>0",
+ N_("Show the image at its normal size"),
G_CALLBACK (eog_window_cmd_zoom_normal) },
- { "ViewZoomFit", GTK_STOCK_ZOOM_FIT, N_("Best _Fit"), NULL,
- N_("Fit the image to the window"),
+ { "ViewZoomFit", GTK_STOCK_ZOOM_FIT, N_("Best _Fit"), NULL,
+ N_("Fit the image to the window"),
G_CALLBACK (eog_window_cmd_zoom_fit) },
- { "ControlEqual", GTK_STOCK_ZOOM_IN, N_("_Zoom In"), "<control>equal",
- N_("Enlarge the image"),
+ { "ControlEqual", GTK_STOCK_ZOOM_IN, N_("_Zoom In"), "<control>equal",
+ N_("Enlarge the image"),
G_CALLBACK (eog_window_cmd_zoom_in) },
{ "ControlKpAdd", GTK_STOCK_ZOOM_IN, N_("_Zoom In"), "<control>KP_Add",
- N_("Shrink the image"),
+ N_("Shrink the image"),
G_CALLBACK (eog_window_cmd_zoom_in) },
- { "ControlKpSub", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "<control>KP_Subtract",
- N_("Shrink the image"),
+ { "ControlKpSub", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "<control>KP_Subtract",
+ N_("Shrink the image"),
G_CALLBACK (eog_window_cmd_zoom_out) },
- { "Delete", NULL, N_("Move to _Trash"), "Delete",
+ { "Delete", NULL, N_("Move to _Trash"), "Delete",
NULL,
G_CALLBACK (eog_window_cmd_move_to_trash) },
};
static const GtkToggleActionEntry toggle_entries_image[] = {
- { "ViewFullscreen", GTK_STOCK_FULLSCREEN, N_("_Full Screen"), "F11",
+ { "ViewFullscreen", GTK_STOCK_FULLSCREEN, N_("_Full Screen"), "F11",
N_("Show the current image in fullscreen mode"),
G_CALLBACK (eog_window_cmd_fullscreen), FALSE },
};
-
+
static const GtkActionEntry action_entries_collection[] = {
- { "GoPrevious", GTK_STOCK_GO_BACK, N_("_Previous Image"), "<Alt>Left",
+ { "GoPrevious", GTK_STOCK_GO_BACK, N_("_Previous Image"), "<Alt>Left",
N_("Go to the previous image of the collection"),
G_CALLBACK (eog_window_cmd_go_prev) },
- { "GoNext", GTK_STOCK_GO_FORWARD, N_("_Next Image"), "<Alt>Right",
+ { "GoNext", GTK_STOCK_GO_FORWARD, N_("_Next Image"), "<Alt>Right",
N_("Go to the next image of the collection"),
G_CALLBACK (eog_window_cmd_go_next) },
- { "GoFirst", GTK_STOCK_GOTO_FIRST, N_("_First Image"), "<Alt>Home",
+ { "GoFirst", GTK_STOCK_GOTO_FIRST, N_("_First Image"), "<Alt>Home",
N_("Go to the first image of the collection"),
G_CALLBACK (eog_window_cmd_go_first) },
- { "GoLast", GTK_STOCK_GOTO_LAST, N_("_Last Image"), "<Alt>End",
+ { "GoLast", GTK_STOCK_GOTO_LAST, N_("_Last Image"), "<Alt>End",
N_("Go to the last image of the collection"),
G_CALLBACK (eog_window_cmd_go_last) },
- { "BackSpace", NULL, N_("_Previous Image"), "BackSpace",
+ { "BackSpace", NULL, N_("_Previous Image"), "BackSpace",
NULL,
G_CALLBACK (eog_window_cmd_go_prev) },
- { "Home", NULL, N_("_First Image"), "Home",
- NULL,
+ { "Home", NULL, N_("_First Image"), "Home",
+ NULL,
G_CALLBACK (eog_window_cmd_go_first) },
- { "End", NULL, N_("_Last Image"), "End",
- NULL,
+ { "End", NULL, N_("_Last Image"), "End",
+ NULL,
G_CALLBACK (eog_window_cmd_go_last) },
};
static const GtkToggleActionEntry toggle_entries_collection[] = {
- { "ViewSlideshow", "slideshow-play", N_("_Slideshow"), "F5",
+ { "ViewSlideshow", "slideshow-play", N_("_Slideshow"), "F5",
N_("Start a slideshow view of the images"),
G_CALLBACK (eog_window_cmd_slideshow), FALSE },
};
@@ -3556,7 +3556,7 @@
static void
set_action_properties (GtkActionGroup *window_group,
- GtkActionGroup *image_group,
+ GtkActionGroup *image_group,
GtkActionGroup *collection_group)
{
GtkAction *action;
@@ -3595,7 +3595,7 @@
sort_recents_mru (GtkRecentInfo *a, GtkRecentInfo *b)
{
gboolean has_eog_a, has_eog_b;
-
+
/* We need to check this first as gtk_recent_info_get_application_info
* will treat it as a non-fatal error when the GtkRecentInfo doesn't
* have the application registered. */
@@ -3606,7 +3606,7 @@
if (has_eog_a && has_eog_b) {
time_t time_a, time_b;
- /* These should not fail as we already checked that
+ /* These should not fail as we already checked that
* the application is registered with the info objects */
gtk_recent_info_get_application_info (a,
EOG_RECENT_FILES_APP_NAME,
@@ -3640,14 +3640,14 @@
if (priv->recent_menu_id != 0)
gtk_ui_manager_remove_ui (priv->ui_mgr, priv->recent_menu_id);
-
+
actions = gtk_action_group_list_actions (priv->actions_recent);
for (li = actions; li != NULL; li = li->next) {
g_signal_handlers_disconnect_by_func (GTK_ACTION (li->data),
G_CALLBACK(eog_window_open_recent_cb),
window);
-
+
gtk_action_group_remove_action (priv->actions_recent,
GTK_ACTION (li->data));
}
@@ -3678,35 +3678,35 @@
action_name = g_strdup_printf ("recent-info-%d", count_recent);
display_name = g_strsplit (gtk_recent_info_get_display_name (info), "_", -1);
label_filename = g_strjoinv ("__", display_name);
- label = g_strdup_printf ("%s_%d. %s",
+ label = g_strdup_printf ("%s_%d. %s",
(is_rtl ? "\xE2\x80\x8F" : ""), count_recent, label_filename);
g_free (label_filename);
g_strfreev (display_name);
tip = gtk_recent_info_get_uri_display (info);
- /* This is a workaround for a bug (#351945) regarding
- * gtk_recent_info_get_uri_display() and remote URIs.
+ /* This is a workaround for a bug (#351945) regarding
+ * gtk_recent_info_get_uri_display() and remote URIs.
* gnome_vfs_format_uri_for_display is sufficient here
- * since the password gets stripped when adding the
+ * since the password gets stripped when adding the
* file to the recently used list. */
if (tip == NULL)
tip = g_uri_unescape_string (gtk_recent_info_get_uri (info), NULL);
-
+
action = gtk_action_new (action_name, label, tip, NULL);
-
- g_object_set_data_full (G_OBJECT (action), "gtk-recent-info",
+
+ g_object_set_data_full (G_OBJECT (action), "gtk-recent-info",
gtk_recent_info_ref (info),
(GDestroyNotify) gtk_recent_info_unref);
-
+
g_object_set (G_OBJECT (action), "icon-name", "image-x-generic", NULL);
-
+
g_signal_connect (action, "activate",
G_CALLBACK (eog_window_open_recent_cb),
window);
-
+
gtk_action_group_add_action (priv->actions_recent, action);
-
+
g_object_unref (action);
gtk_ui_manager_add_ui (priv->ui_mgr, priv->recent_menu_id,
@@ -3773,8 +3773,8 @@
visible = GTK_WIDGET_VISIBLE (window->priv->sidebar);
- gconf_client_set_bool (window->priv->client,
- EOG_CONF_UI_SIDEBAR,
+ gconf_client_set_bool (window->priv->client,
+ EOG_CONF_UI_SIDEBAR,
visible,
NULL);
@@ -3830,7 +3830,7 @@
eog_window_finish_saving (EogWindow *window)
{
EogWindowPrivate *priv = window->priv;
-
+
gtk_widget_set_sensitive (GTK_WIDGET (window), FALSE);
do {
@@ -3838,13 +3838,13 @@
} while (priv->save_job != NULL);
}
-static void
+static void
eog_window_construct_ui (EogWindow *window)
{
EogWindowPrivate *priv;
GError *error = NULL;
-
+
GtkWidget *menubar;
GtkWidget *thumb_popup;
GtkWidget *view_popup;
@@ -3864,60 +3864,60 @@
priv->ui_mgr = gtk_ui_manager_new ();
priv->actions_window = gtk_action_group_new ("MenuActionsWindow");
-
- gtk_action_group_set_translation_domain (priv->actions_window,
+
+ gtk_action_group_set_translation_domain (priv->actions_window,
GETTEXT_PACKAGE);
-
- gtk_action_group_add_actions (priv->actions_window,
- action_entries_window,
- G_N_ELEMENTS (action_entries_window),
+
+ gtk_action_group_add_actions (priv->actions_window,
+ action_entries_window,
+ G_N_ELEMENTS (action_entries_window),
window);
- gtk_action_group_add_toggle_actions (priv->actions_window,
- toggle_entries_window,
- G_N_ELEMENTS (toggle_entries_window),
+ gtk_action_group_add_toggle_actions (priv->actions_window,
+ toggle_entries_window,
+ G_N_ELEMENTS (toggle_entries_window),
window);
gtk_ui_manager_insert_action_group (priv->ui_mgr, priv->actions_window, 0);
priv->actions_image = gtk_action_group_new ("MenuActionsImage");
- gtk_action_group_set_translation_domain (priv->actions_image,
+ gtk_action_group_set_translation_domain (priv->actions_image,
GETTEXT_PACKAGE);
- gtk_action_group_add_actions (priv->actions_image,
- action_entries_image,
- G_N_ELEMENTS (action_entries_image),
+ gtk_action_group_add_actions (priv->actions_image,
+ action_entries_image,
+ G_N_ELEMENTS (action_entries_image),
window);
-
- gtk_action_group_add_toggle_actions (priv->actions_image,
- toggle_entries_image,
- G_N_ELEMENTS (toggle_entries_image),
+
+ gtk_action_group_add_toggle_actions (priv->actions_image,
+ toggle_entries_image,
+ G_N_ELEMENTS (toggle_entries_image),
window);
gtk_ui_manager_insert_action_group (priv->ui_mgr, priv->actions_image, 0);
priv->actions_collection = gtk_action_group_new ("MenuActionsCollection");
- gtk_action_group_set_translation_domain (priv->actions_collection,
+ gtk_action_group_set_translation_domain (priv->actions_collection,
GETTEXT_PACKAGE);
-
- gtk_action_group_add_actions (priv->actions_collection,
- action_entries_collection,
- G_N_ELEMENTS (action_entries_collection),
+
+ gtk_action_group_add_actions (priv->actions_collection,
+ action_entries_collection,
+ G_N_ELEMENTS (action_entries_collection),
window);
- gtk_action_group_add_toggle_actions (priv->actions_collection,
- toggle_entries_collection,
- G_N_ELEMENTS (toggle_entries_collection),
+ gtk_action_group_add_toggle_actions (priv->actions_collection,
+ toggle_entries_collection,
+ G_N_ELEMENTS (toggle_entries_collection),
window);
- set_action_properties (priv->actions_window,
- priv->actions_image,
+ set_action_properties (priv->actions_window,
+ priv->actions_image,
priv->actions_collection);
gtk_ui_manager_insert_action_group (priv->ui_mgr, priv->actions_collection, 0);
- if (!gtk_ui_manager_add_ui_from_file (priv->ui_mgr,
- EOG_DATA_DIR"/eog-ui.xml",
+ if (!gtk_ui_manager_add_ui_from_file (priv->ui_mgr,
+ EOG_DATA_DIR"/eog-ui.xml",
&error)) {
g_warning ("building menus failed: %s", error->message);
g_error_free (error);
@@ -3933,7 +3933,7 @@
gtk_box_pack_start (GTK_BOX (priv->box), menubar, FALSE, FALSE, 0);
gtk_widget_show (menubar);
- priv->toolbar = GTK_WIDGET
+ priv->toolbar = GTK_WIDGET
(g_object_new (EGG_TYPE_EDITABLE_TOOLBAR,
"ui-manager", priv->ui_mgr,
"model", eog_application_get_toolbars_model (EOG_APP),
@@ -3942,19 +3942,19 @@
egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (priv->toolbar),
"Toolbar");
- gtk_box_pack_start (GTK_BOX (priv->box),
- priv->toolbar,
- FALSE,
- FALSE,
+ gtk_box_pack_start (GTK_BOX (priv->box),
+ priv->toolbar,
+ FALSE,
+ FALSE,
0);
gtk_widget_show (priv->toolbar);
- gtk_window_add_accel_group (GTK_WINDOW (window),
+ gtk_window_add_accel_group (GTK_WINDOW (window),
gtk_ui_manager_get_accel_group (priv->ui_mgr));
priv->actions_recent = gtk_action_group_new ("RecentFilesActions");
- gtk_action_group_set_translation_domain (priv->actions_recent,
+ gtk_action_group_set_translation_domain (priv->actions_recent,
GETTEXT_PACKAGE);
g_signal_connect (gtk_recent_manager_get_default (), "changed",
@@ -3970,16 +3970,16 @@
gtk_widget_show (priv->cbox);
priv->statusbar = eog_statusbar_new ();
- gtk_box_pack_end (GTK_BOX (priv->box),
+ gtk_box_pack_end (GTK_BOX (priv->box),
GTK_WIDGET (priv->statusbar),
FALSE, FALSE, 0);
gtk_widget_show (priv->statusbar);
- priv->image_info_message_cid =
- gtk_statusbar_get_context_id (GTK_STATUSBAR (priv->statusbar),
+ priv->image_info_message_cid =
+ gtk_statusbar_get_context_id (GTK_STATUSBAR (priv->statusbar),
"image_info_message");
- priv->tip_message_cid =
- gtk_statusbar_get_context_id (GTK_STATUSBAR (priv->statusbar),
+ priv->tip_message_cid =
+ gtk_statusbar_get_context_id (GTK_STATUSBAR (priv->statusbar),
"tip_message");
priv->layout = gtk_vbox_new (FALSE, 2);
@@ -4013,15 +4013,15 @@
gtk_widget_set_size_request (GTK_WIDGET (priv->view), 100, 100);
g_signal_connect (G_OBJECT (priv->view),
"zoom_changed",
- G_CALLBACK (view_zoom_changed_cb),
+ G_CALLBACK (view_zoom_changed_cb),
window);
view_popup = gtk_ui_manager_get_widget (priv->ui_mgr, "/ViewPopup");
eog_scroll_view_set_popup (EOG_SCROLL_VIEW (priv->view),
GTK_MENU (view_popup));
- frame = gtk_widget_new (GTK_TYPE_FRAME,
- "shadow-type", GTK_SHADOW_IN,
+ frame = gtk_widget_new (GTK_TYPE_FRAME,
+ "shadow-type", GTK_SHADOW_IN,
NULL);
gtk_container_add (GTK_CONTAINER (frame), priv->view);
@@ -4056,15 +4056,15 @@
NULL));
thumb_popup = gtk_ui_manager_get_widget (priv->ui_mgr, "/ThumbnailPopup");
- eog_thumb_view_set_thumbnail_popup (EOG_THUMB_VIEW (priv->thumbview),
+ eog_thumb_view_set_thumbnail_popup (EOG_THUMB_VIEW (priv->thumbview),
GTK_MENU (thumb_popup));
gtk_box_pack_start (GTK_BOX (priv->layout), priv->nav, FALSE, FALSE, 0);
gtk_box_pack_end (GTK_BOX (priv->cbox), priv->layout, TRUE, TRUE, 0);
- entry = gconf_client_get_entry (priv->client,
- EOG_CONF_VIEW_INTERPOLATE,
+ entry = gconf_client_get_entry (priv->client,
+ EOG_CONF_VIEW_INTERPOLATE,
NULL, TRUE, NULL);
if (entry != NULL) {
eog_window_interp_type_changed_cb (priv->client, 0, entry, window);
@@ -4072,8 +4072,8 @@
entry = NULL;
}
- entry = gconf_client_get_entry (priv->client,
- EOG_CONF_VIEW_SCROLL_WHEEL_ZOOM,
+ entry = gconf_client_get_entry (priv->client,
+ EOG_CONF_VIEW_SCROLL_WHEEL_ZOOM,
NULL, TRUE, NULL);
if (entry != NULL) {
eog_window_scroll_wheel_zoom_changed_cb (priv->client, 0, entry, window);
@@ -4081,8 +4081,8 @@
entry = NULL;
}
- entry = gconf_client_get_entry (priv->client,
- EOG_CONF_VIEW_ZOOM_MULTIPLIER,
+ entry = gconf_client_get_entry (priv->client,
+ EOG_CONF_VIEW_ZOOM_MULTIPLIER,
NULL, TRUE, NULL);
if (entry != NULL) {
eog_window_zoom_multiplier_changed_cb (priv->client, 0, entry, window);
@@ -4090,8 +4090,8 @@
entry = NULL;
}
- entry = gconf_client_get_entry (priv->client,
- EOG_CONF_VIEW_TRANSPARENCY,
+ entry = gconf_client_get_entry (priv->client,
+ EOG_CONF_VIEW_TRANSPARENCY,
NULL, TRUE, NULL);
if (entry != NULL) {
eog_window_transparency_changed_cb (priv->client, 0, entry, window);
@@ -4099,8 +4099,8 @@
entry = NULL;
}
- entry = gconf_client_get_entry (priv->client,
- EOG_CONF_VIEW_TRANS_COLOR,
+ entry = gconf_client_get_entry (priv->client,
+ EOG_CONF_VIEW_TRANS_COLOR,
NULL, TRUE, NULL);
if (entry != NULL) {
eog_window_trans_color_changed_cb (priv->client, 0, entry, window);
@@ -4108,17 +4108,17 @@
entry = NULL;
}
- entry = gconf_client_get_entry (priv->client,
- EOG_CONF_UI_IMAGE_COLLECTION_POSITION,
+ entry = gconf_client_get_entry (priv->client,
+ EOG_CONF_UI_IMAGE_COLLECTION_POSITION,
NULL, TRUE, NULL);
if (entry != NULL) {
eog_window_collection_mode_changed_cb (priv->client, 0, entry, window);
gconf_entry_unref (entry);
entry = NULL;
}
-
- entry = gconf_client_get_entry (priv->client,
- EOG_CONF_DESKTOP_CAN_SAVE,
+
+ entry = gconf_client_get_entry (priv->client,
+ EOG_CONF_DESKTOP_CAN_SAVE,
NULL, TRUE, NULL);
if (entry != NULL) {
eog_window_can_save_changed_cb (priv->client, 0, entry, window);
@@ -4126,7 +4126,7 @@
entry = NULL;
}
- if ((priv->flags & EOG_STARTUP_FULLSCREEN) ||
+ if ((priv->flags & EOG_STARTUP_FULLSCREEN) ||
(priv->flags & EOG_STARTUP_SLIDE_SHOW)) {
eog_window_run_fullscreen (window, (priv->flags & EOG_STARTUP_SLIDE_SHOW));
} else {
@@ -4158,12 +4158,12 @@
gconf_client_add_dir (window->priv->client, EOG_CONF_DIR,
GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
- priv->client_notifications[EOG_WINDOW_NOTIFY_INTERPOLATE] =
+ priv->client_notifications[EOG_WINDOW_NOTIFY_INTERPOLATE] =
gconf_client_notify_add (window->priv->client,
EOG_CONF_VIEW_INTERPOLATE,
eog_window_interp_type_changed_cb,
window, NULL, NULL);
-
+
priv->client_notifications[EOG_WINDOW_NOTIFY_SCROLLWHEEL_ZOOM] =
gconf_client_notify_add (window->priv->client,
EOG_CONF_VIEW_SCROLL_WHEEL_ZOOM,
@@ -4226,7 +4226,7 @@
&hints,
GDK_HINT_MIN_SIZE);
- gtk_window_set_default_size (GTK_WINDOW (window),
+ gtk_window_set_default_size (GTK_WINDOW (window),
EOG_WINDOW_DEFAULT_WIDTH,
EOG_WINDOW_DEFAULT_HEIGHT);
@@ -4236,7 +4236,7 @@
window->priv->status = EOG_WINDOW_STATUS_UNKNOWN;
#ifdef HAVE_LCMS
- window->priv->display_profile =
+ window->priv->display_profile =
eog_window_get_display_profile (screen);
#endif
@@ -4253,7 +4253,7 @@
{
EogWindow *window;
EogWindowPrivate *priv;
-
+
g_return_if_fail (object != NULL);
g_return_if_fail (EOG_IS_WINDOW (object));
@@ -4276,8 +4276,8 @@
}
if (priv->image != NULL) {
- g_signal_handlers_disconnect_by_func (priv->image,
- image_thumb_changed_cb,
+ g_signal_handlers_disconnect_by_func (priv->image,
+ image_thumb_changed_cb,
window);
g_object_unref (priv->image);
priv->image = NULL;
@@ -4318,11 +4318,11 @@
slideshow_clear_timeout (window);
g_signal_handlers_disconnect_by_func (gtk_recent_manager_get_default (),
- G_CALLBACK (eog_window_recent_manager_changed_cb),
+ G_CALLBACK (eog_window_recent_manager_changed_cb),
window);
priv->recent_menu_id = 0;
-
+
eog_window_clear_load_job (window);
eog_window_clear_transform_job (window);
@@ -4338,9 +4338,9 @@
g_object_unref (priv->client);
priv->client = NULL;
}
-
+
if (priv->file_list != NULL) {
- g_slist_foreach (priv->file_list, (GFunc) g_object_unref, NULL);
+ g_slist_foreach (priv->file_list, (GFunc) g_object_unref, NULL);
g_slist_free (priv->file_list);
priv->file_list = NULL;
}
@@ -4363,7 +4363,7 @@
GList *windows = eog_application_get_windows (EOG_APP);
g_return_if_fail (EOG_IS_WINDOW (object));
-
+
eog_debug (DEBUG_WINDOW);
if (windows == NULL) {
@@ -4388,7 +4388,7 @@
if (priv->save_job != NULL) {
eog_window_finish_saving (window);
- }
+ }
gtk_widget_destroy (widget);
@@ -4459,7 +4459,7 @@
if (event->state & GDK_MOD1_MASK) {
/* Alt+Right moves to next image */
eog_window_cmd_go_next (NULL, EOG_WINDOW (widget));
- result = TRUE;
+ result = TRUE;
break;
} /* else fall-trough is intended */
case GDK_Down:
@@ -4477,7 +4477,7 @@
case GDK_Page_Up:
if (!eog_scroll_view_scrollbars_visible (EOG_SCROLL_VIEW (EOG_WINDOW (widget)->priv->view))) {
if (!GTK_WIDGET_VISIBLE (EOG_WINDOW (widget)->priv->nav)) {
- /* If the iconview is not visible skip to the
+ /* If the iconview is not visible skip to the
* previous image manually as it won't handle
* the keypress then. */
eog_window_cmd_go_prev (NULL,
@@ -4490,7 +4490,7 @@
case GDK_Page_Down:
if (!eog_scroll_view_scrollbars_visible (EOG_SCROLL_VIEW (EOG_WINDOW (widget)->priv->view))) {
if (!GTK_WIDGET_VISIBLE (EOG_WINDOW (widget)->priv->nav)) {
- /* If the iconview is not visible skip to the
+ /* If the iconview is not visible skip to the
* next image manually as it won't handle
* the keypress then. */
eog_window_cmd_go_next (NULL,
@@ -4506,11 +4506,11 @@
if (result && (EOG_WINDOW (widget)->priv->mode == EOG_WINDOW_MODE_SLIDESHOW)) {
slideshow_set_timeout (EOG_WINDOW (widget));
}
-
+
if (handle_selection == TRUE && result == FALSE) {
gtk_widget_grab_focus (GTK_WIDGET (EOG_WINDOW (widget)->priv->thumbview));
- result = gtk_widget_event (GTK_WIDGET (EOG_WINDOW (widget)->priv->thumbview),
+ result = gtk_widget_event (GTK_WIDGET (EOG_WINDOW (widget)->priv->thumbview),
(GdkEvent *) event);
}
@@ -4524,7 +4524,7 @@
if (result == FALSE && GTK_WIDGET_CLASS (eog_window_parent_class)->key_press_event) {
result = (* GTK_WIDGET_CLASS (eog_window_parent_class)->key_press_event) (widget, event);
}
-
+
return result;
}
@@ -4555,14 +4555,14 @@
return result;
}
-
+
static gboolean
eog_window_configure_event (GtkWidget *widget, GdkEventConfigure *event)
{
EogWindow *window;
g_return_val_if_fail (EOG_IS_WINDOW (widget), TRUE);
-
+
window = EOG_WINDOW (widget);
GTK_WIDGET_CLASS (eog_window_parent_class)->configure_event (widget, event);
@@ -4598,7 +4598,7 @@
eog_window_unrealize (GtkWidget *widget)
{
EogWindow *window;
-
+
g_return_if_fail (EOG_IS_WINDOW (widget));
window = EOG_WINDOW (widget);
@@ -4617,11 +4617,11 @@
fullscreen = priv->mode == EOG_WINDOW_MODE_FULLSCREEN ||
priv->mode == EOG_WINDOW_MODE_SLIDESHOW;
-
+
if (fullscreen) {
show_fullscreen_popup (window);
}
-
+
return GTK_WIDGET_CLASS (eog_window_parent_class)->focus_in_event (widget, event);
}
@@ -4738,8 +4738,8 @@
*/
g_object_class_install_property (g_object_class,
PROP_STARTUP_FLAGS,
- g_param_spec_uchar ("startup-flags",
- NULL,
+ g_param_spec_uchar ("startup-flags",
+ NULL,
NULL,
0,
G_MAXUINT8,
@@ -4754,7 +4754,7 @@
* The #EogWindow::prepared signal is emitted when the @window is ready
* to be shown.
*/
- signals [SIGNAL_PREPARED] =
+ signals [SIGNAL_PREPARED] =
g_signal_new ("prepared",
EOG_TYPE_WINDOW,
G_SIGNAL_RUN_LAST,
@@ -4769,7 +4769,7 @@
/**
* eog_window_new:
* @flags: the initialization parameters for the new window.
- *
+ *
*
* Creates a new and empty #EogWindow. Use @flags to indicate
* if the window should be initialized fullscreen, in slideshow mode,
@@ -4784,7 +4784,7 @@
eog_debug (DEBUG_WINDOW);
- window = EOG_WINDOW (g_object_new (EOG_TYPE_WINDOW,
+ window = EOG_WINDOW (g_object_new (EOG_TYPE_WINDOW,
"type", GTK_WINDOW_TOPLEVEL,
"startup-flags", flags,
NULL));
@@ -4828,9 +4828,9 @@
int i;
EogImage *image;
#endif
-
+
g_return_if_fail (EOG_IS_WINDOW (data));
-
+
window = EOG_WINDOW (data);
priv = window->priv;
@@ -4843,7 +4843,7 @@
n_images = eog_list_store_length (EOG_LIST_STORE (priv->store));
-#ifdef HAVE_EXIF
+#ifdef HAVE_EXIF
if (gconf_client_get_bool (priv->client, EOG_CONF_VIEW_AUTOROTATE, NULL)) {
for (i = 0; i < n_images; i++) {
image = eog_list_store_get_image_by_pos (priv->store, i);
@@ -4855,12 +4855,12 @@
eog_thumb_view_set_model (EOG_THUMB_VIEW (priv->thumbview), priv->store);
- g_signal_connect (G_OBJECT (priv->store),
+ g_signal_connect (G_OBJECT (priv->store),
"row-inserted",
G_CALLBACK (eog_window_list_store_image_added),
window);
- g_signal_connect (G_OBJECT (priv->store),
+ g_signal_connect (G_OBJECT (priv->store),
"row-deleted",
G_CALLBACK (eog_window_list_store_image_removed),
window);
@@ -4914,7 +4914,7 @@
window->priv->file_list = file_list;
job = eog_job_model_new (file_list);
-
+
g_signal_connect (job,
"finished",
G_CALLBACK (eog_job_model_cb),
@@ -4974,7 +4974,7 @@
switch (mode) {
case EOG_WINDOW_MODE_NORMAL:
- eog_window_stop_fullscreen (window,
+ eog_window_stop_fullscreen (window,
window->priv->mode == EOG_WINDOW_MODE_SLIDESHOW);
break;
case EOG_WINDOW_MODE_FULLSCREEN:
Modified: trunk/src/eog-window.h
==============================================================================
--- trunk/src/eog-window.h (original)
+++ trunk/src/eog-window.h Mon Oct 27 19:33:42 2008
@@ -7,7 +7,7 @@
* Based on code by:
* - Federico Mena-Quintero <federico gnu org>
* - Jens Finke <jens gnome org>
- * Based on evince code (shell/ev-window.c) by:
+ * Based on evince code (shell/ev-window.c) by:
* - Martin Kretzschmar <martink gnome org>
*
* This program is free software; you can redistribute it and/or modify
@@ -35,7 +35,7 @@
#include <glib-object.h>
#include <gtk/gtk.h>
-G_BEGIN_DECLS
+G_BEGIN_DECLS
typedef struct _EogWindow EogWindow;
typedef struct _EogWindowClass EogWindowClass;
@@ -111,7 +111,7 @@
EogImage *eog_window_get_image (EogWindow *window);
-void eog_window_open_file_list (EogWindow *window,
+void eog_window_open_file_list (EogWindow *window,
GSList *file_list);
gboolean eog_window_is_empty (EogWindow *window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
