gimp r24959 - in trunk: . plug-ins/print
- From: neo svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r24959 - in trunk: . plug-ins/print
- Date: Mon, 25 Feb 2008 18:59:04 +0000 (GMT)
Author: neo
Date: Mon Feb 25 18:59:04 2008
New Revision: 24959
URL: http://svn.gnome.org/viewvc/gimp?rev=24959&view=rev
Log:
2008-02-25 Sven Neumann <sven gimp org>
* plug-ins/print/print-settings.[ch]
* plug-ins/print/print.c: code cleanup.
Modified:
trunk/ChangeLog
trunk/plug-ins/print/print-settings.c
trunk/plug-ins/print/print-settings.h
trunk/plug-ins/print/print.c
Modified: trunk/plug-ins/print/print-settings.c
==============================================================================
--- trunk/plug-ins/print/print-settings.c (original)
+++ trunk/plug-ins/print/print-settings.c Mon Feb 25 18:59:04 2008
@@ -31,12 +31,12 @@
static GKeyFile * print_settings_key_file_from_settings (PrintData *data);
-static void save_print_settings_resource_file (GKeyFile *settings_key_file);
+static void print_settings_save_resource_file (GKeyFile *settings_key_file);
-static void save_print_settings_as_parasite (GKeyFile *settings_key_file,
+static void print_settings_save_as_parasite (GKeyFile *settings_key_file,
gint32 image_ID);
-static void add_print_setting_to_key_file (const gchar *key,
+static void print_settings_add_to_key_file (const gchar *key,
const gchar *value,
gpointer data);
@@ -44,10 +44,10 @@
static GKeyFile * print_settings_key_file_from_parasite (gint32 image_ID);
-static gboolean load_print_settings_from_key_file (PrintData *data,
+static gboolean print_settings_load_from_key_file (PrintData *data,
GKeyFile *key_file);
-static GKeyFile * check_version (GKeyFile *key_file);
+static gboolean print_settings_check_version (GKeyFile *key_file);
/*
* set GtkPrintSettings from the contents of a "print-settings"
@@ -55,7 +55,7 @@
* file of the same name
*/
gboolean
-load_print_settings (PrintData *data)
+print_settings_load (PrintData *data)
{
GKeyFile *key_file = print_settings_key_file_from_parasite (data->image_id);
@@ -64,7 +64,7 @@
if (key_file)
{
- load_print_settings_from_key_file (data, key_file);
+ print_settings_load_from_key_file (data, key_file);
g_key_file_free (key_file);
return TRUE;
}
@@ -77,13 +77,11 @@
* and as an image parasite
*/
void
-save_print_settings (PrintData *data)
+print_settings_save (PrintData *data)
{
- GKeyFile *key_file;
+ GKeyFile *key_file = print_settings_key_file_from_settings (data);
- key_file = print_settings_key_file_from_settings (data);
-
- save_print_settings_resource_file (key_file);
+ print_settings_save_resource_file (key_file);
/* image setup */
if (gimp_image_is_valid (data->image_id))
@@ -103,7 +101,7 @@
g_key_file_set_boolean (key_file, "image-setup",
"use-full-page", data->use_full_page);
- save_print_settings_as_parasite (key_file, data->image_id);
+ print_settings_save_as_parasite (key_file, data->image_id);
}
g_key_file_free (key_file);
@@ -129,9 +127,10 @@
/* save the contents of the GtkPrintSettings for the operation */
settings = gtk_print_operation_get_print_settings (operation);
+
if (settings)
- gtk_print_settings_foreach (settings, add_print_setting_to_key_file,
- key_file);
+ gtk_print_settings_foreach (settings,
+ print_settings_add_to_key_file, key_file);
return key_file;
}
@@ -140,7 +139,7 @@
* create a resource file from a GKeyFile holding the settings
*/
static void
-save_print_settings_resource_file (GKeyFile *settings_key_file)
+print_settings_save_resource_file (GKeyFile *settings_key_file)
{
gchar *filename;
gchar *contents;
@@ -148,7 +147,8 @@
GError *error = NULL;
contents = g_key_file_to_data (settings_key_file, &length, &error);
- if (error)
+
+ if (! contents)
{
g_warning ("Unable to get contents of settings key file: %s",
error->message);
@@ -174,14 +174,15 @@
* holding the print settings
*/
static void
-save_print_settings_as_parasite (GKeyFile *settings_key_file,
+print_settings_save_as_parasite (GKeyFile *settings_key_file,
gint32 image_ID)
{
- gchar *contents;
- gsize length;
- GError *error = NULL;
+ gchar *contents;
+ gsize length;
+ GError *error = NULL;
contents = g_key_file_to_data (settings_key_file, &length, &error);
+
if (! contents)
{
g_warning ("Unable to get contents of settings key file: %s",
@@ -199,9 +200,9 @@
* callback used in gtk_print_settings_foreach loop
*/
static void
-add_print_setting_to_key_file (const gchar *key,
- const gchar *value,
- gpointer data)
+print_settings_add_to_key_file (const gchar *key,
+ const gchar *value,
+ gpointer data)
{
GKeyFile *key_file = data;
@@ -214,8 +215,8 @@
static GKeyFile *
print_settings_key_file_from_resource_file (void)
{
- GKeyFile *key_file = g_key_file_new ();
- gchar *filename;
+ GKeyFile *key_file = g_key_file_new ();
+ gchar *filename;
g_key_file_set_list_separator (key_file, '=');
@@ -229,7 +230,13 @@
g_free (filename);
- return check_version (key_file);
+ if (! print_settings_check_version (key_file))
+ {
+ g_key_file_free (key_file);
+ return NULL;
+ }
+
+ return key_file;
}
/* load information from an image parasite called "print-settings"
@@ -262,11 +269,17 @@
gimp_parasite_free (parasite);
- return check_version (key_file);
+ if (! print_settings_check_version (key_file))
+ {
+ g_key_file_free (key_file);
+ return FALSE;
+ }
+
+ return key_file;
}
static gboolean
-load_print_settings_from_key_file (PrintData *data,
+print_settings_load_from_key_file (PrintData *data,
GKeyFile *key_file)
{
GtkPrintOperation *operation = data->operation;
@@ -340,26 +353,26 @@
return TRUE;
}
-static GKeyFile *
-check_version (GKeyFile *key_file)
+static gboolean
+print_settings_check_version (GKeyFile *key_file)
{
gint major_version;
gint minor_version;
- if (! key_file || ! g_key_file_has_group (key_file, "meta"))
- return NULL;
+ if (! g_key_file_has_group (key_file, "meta"))
+ return FALSE;
major_version = g_key_file_get_integer (key_file,
"meta", "major-version", NULL);
if (major_version != PRINT_SETTINGS_MAJOR_VERSION)
- return NULL;
+ return FALSE;
minor_version = g_key_file_get_integer (key_file,
"meta", "minor-version", NULL);
if (minor_version != PRINT_SETTINGS_MINOR_VERSION)
- return NULL;
+ return FALSE;
- return key_file;
+ return TRUE;
}
Modified: trunk/plug-ins/print/print-settings.h
==============================================================================
--- trunk/plug-ins/print/print-settings.h (original)
+++ trunk/plug-ins/print/print-settings.h Mon Feb 25 18:59:04 2008
@@ -16,5 +16,5 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-gboolean load_print_settings (PrintData *data);
-void save_print_settings (PrintData *data);
+gboolean print_settings_load (PrintData *data);
+void print_settings_save (PrintData *data);
Modified: trunk/plug-ins/print/print.c
==============================================================================
--- trunk/plug-ins/print/print.c (original)
+++ trunk/plug-ins/print/print.c Mon Feb 25 18:59:04 2008
@@ -225,7 +225,7 @@
gimp_image_get_resolution (image_ID, &data.xres, &data.yres);
- load_print_settings (&data);
+ print_settings_load (&data);
if (export != GIMP_EXPORT_EXPORT)
image_ID = -1;
@@ -251,7 +251,7 @@
gimp_ui_init (PLUG_IN_BINARY, FALSE);
g_signal_connect_swapped (operation, "end-print",
- G_CALLBACK (save_print_settings),
+ G_CALLBACK (print_settings_save),
&data);
g_signal_connect (operation, "create-custom-widget",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
