2007-10-10 [colin] 3.0.2cvs53

	* src/addressadd.c
	* src/editaddress.c
	* src/headerview.c
	* src/textview.c
		More error handling on saving pictures

diff --git a/ChangeLog b/ChangeLog
index 67c44461f47e1da45897465c548987dbb032623d..92dfe20c8fc32fd264d4e63087bf5ebb8085621b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-10 [colin]     3.0.2cvs53
+
+       * src/addressadd.c
+       * src/editaddress.c
+       * src/headerview.c
+       * src/textview.c
+               More error handling on saving pictures
+

 2007-10-10 [colin]     3.0.2cvs52
 
        * src/printing.c
 2007-10-10 [colin]     3.0.2cvs52
 
        * src/printing.c

diff --git a/PATCHSETS b/PATCHSETS
index e95eed24dd7087ddffd8720034ed8793e6dfb241..86537326b047b1de7894267e05a065f492adf0e0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2965,3 +2965,4 @@
 ( cvs diff -u -r 1.9.2.18 -r 1.9.2.19 src/addressadd.c;  cvs diff -u -r 1.28.2.36 -r 1.28.2.37 src/addrindex.c;  cvs diff -u -r 1.14.2.34 -r 1.14.2.35 src/editaddress.c;  ) > 3.0.2cvs50.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/addrduplicates.c;  ) > 3.0.2cvs51.patchset
 ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/printing.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/printing.h;  ) > 3.0.2cvs52.patchset
 ( cvs diff -u -r 1.9.2.18 -r 1.9.2.19 src/addressadd.c;  cvs diff -u -r 1.28.2.36 -r 1.28.2.37 src/addrindex.c;  cvs diff -u -r 1.14.2.34 -r 1.14.2.35 src/editaddress.c;  ) > 3.0.2cvs50.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/addrduplicates.c;  ) > 3.0.2cvs51.patchset
 ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/printing.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/printing.h;  ) > 3.0.2cvs52.patchset

+( cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/addressadd.c;  cvs diff -u -r 1.14.2.35 -r 1.14.2.36 src/editaddress.c;  cvs diff -u -r 1.8.2.25 -r 1.8.2.26 src/headerview.c;  cvs diff -u -r 1.96.2.186 -r 1.96.2.187 src/textview.c;  ) > 3.0.2cvs53.patchset

diff --git a/configure.ac b/configure.ac
index af72d80754f269dad3ff309f601f3278fb227d88..7f517e950305e1cf067e52e663b0343498243a45 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=52
+EXTRA_VERSION=53

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addressadd.c b/src/addressadd.c
index 73665ad3eb311976c8ef1ee7b9afe5cbd1bb1963..065b40f94039890130aec82c57d003e5c12fc5a9 100644 (file)
--- a/src/addressadd.c
+++ b/src/addressadd.c
@@ -441,6 +441,11 @@ gboolean addressadd_selection( AddressIndex *addrIndex, const gchar *name,
                                gchar *name = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, G_DIR_SEPARATOR_S, 
                                                        ADDRITEM_ID(person), ".png", NULL );
                                gdk_pixbuf_save(picture, name, "png", &error, NULL);
                                gchar *name = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, G_DIR_SEPARATOR_S, 
                                                        ADDRITEM_ID(person), ".png", NULL );
                                gdk_pixbuf_save(picture, name, "png", &error, NULL);

+                               if (error) {
+                                       g_warning(_("Failed to save image: \n%s"),
+                                                       error->message);
+                                       g_error_free(error);
+                               }

                                addritem_person_set_picture( person, ADDRITEM_ID(person) ) ;
                                g_free( name );
                        }
                                addritem_person_set_picture( person, ADDRITEM_ID(person) ) ;
                                g_free( name );
                        }

diff --git a/src/editaddress.c b/src/editaddress.c
index 60d030fa273e5c29ae83b2495ec18afe76371366..ed015211e0d5494e6bdd508ce18db64252b2a6da 100644 (file)
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -1446,6 +1446,11 @@ static gboolean addressbook_edit_person_close( gboolean cancelled )
                        name = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, G_DIR_SEPARATOR_S, 
                                                        ADDRITEM_ID(current_person), ".png", NULL );
                        gdk_pixbuf_save(pixbuf, name, "png", &error, NULL);
                        name = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, G_DIR_SEPARATOR_S, 
                                                        ADDRITEM_ID(current_person), ".png", NULL );
                        gdk_pixbuf_save(pixbuf, name, "png", &error, NULL);

+                       if (error) {
+                               alertpanel_error(_("Failed to save image: \n%s"),
+                                               error->message);
+                               g_error_free(error);
+                       }

                        addritem_person_set_picture( current_person, ADDRITEM_ID(current_person) ) ;
                        g_free( name );
                } else {
                        addritem_person_set_picture( current_person, ADDRITEM_ID(current_person) ) ;
                        g_free( name );
                } else {

diff --git a/src/headerview.c b/src/headerview.c
index a9621ac314edb31974d910c21943173c712bdd43..dcf9a3b7483610dde78493233bb8f506a328182e 100644 (file)
--- a/src/headerview.c
+++ b/src/headerview.c
@@ -343,8 +343,14 @@ static void headerview_save_contact_pic (HeaderView *headerview, MsgInfo *msginf
        filename = addrindex_get_picture_file(msginfo->from);
        if (!filename)
                return;
        filename = addrindex_get_picture_file(msginfo->from);
        if (!filename)
                return;

-       if (!is_file_exist(filename))
+       if (!is_file_exist(filename)) {

                gdk_pixbuf_save(picture, filename, "png", &error, NULL);
                gdk_pixbuf_save(picture, filename, "png", &error, NULL);

+               if (error) {
+                       g_warning(_("Failed to save image: \n%s"),
+                                       error->message);
+                       g_error_free(error);
+               }
+       }

        g_free(filename);
 }      
 
        g_free(filename);
 }      
 

diff --git a/src/textview.c b/src/textview.c
index 60169413f81fca250a84a9c4208d85832aa62c90..3cad0d6fc606ea0af6d869248d192dd4b02137ea 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1921,8 +1921,14 @@ static void textview_save_contact_pic(TextView *textview)
        filename = addrindex_get_picture_file(msginfo->from);
        if (!filename)
                return;
        filename = addrindex_get_picture_file(msginfo->from);
        if (!filename)
                return;

-       if (!is_file_exist(filename))
+       if (!is_file_exist(filename)) {

                gdk_pixbuf_save(picture, filename, "png", &error, NULL);
                gdk_pixbuf_save(picture, filename, "png", &error, NULL);

+               if (error) {
+                       g_warning(_("Failed to save image: \n%s"),
+                                       error->message);
+                       g_error_free(error);
+               }
+       }

        g_free(filename);
 }
 
        g_free(filename);
 }