2007-10-10 [paul] 3.0.2cvs50
authorColin Leroy <colin@colino.net>
Wed, 10 Oct 2007 09:58:51 +0000 (09:58 +0000)
committerColin Leroy <colin@colino.net>
Wed, 10 Oct 2007 09:58:51 +0000 (09:58 +0000)
* src/addressadd.c
* src/addrindex.c
* src/editaddress.c
Fix previous patch
Thanks to Colin

ChangeLog
PATCHSETS
configure.ac
src/addressadd.c
src/addrindex.c
src/editaddress.c

index 795c7e4..c980733 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-10 [paul]      3.0.2cvs50
+
+       * src/addressadd.c
+       * src/addrindex.c
+       * src/editaddress.c
+               Fix previous patch
+               Thanks to Colin
+
 2007-10-10 [paul]      3.0.2cvs49
 
        * src/summaryview.c
index 9009350..51cbd4f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.28.2.34 -r 1.28.2.35 src/addrindex.c;  ) > 3.0.2cvs47.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/addrduplicates.c;  cvs diff -u -r 1.14.2.32 -r 1.14.2.33 src/editaddress.c;  ) > 3.0.2cvs48.patchset
 ( cvs diff -u -r 1.9.2.17 -r 1.9.2.18 src/addressadd.c;  cvs diff -u -r 1.28.2.35 -r 1.28.2.36 src/addrindex.c;  cvs diff -u -r 1.14.2.33 -r 1.14.2.34 src/editaddress.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/editaddress_other_attributes_ldap.h;  cvs diff -u -r 1.8.2.24 -r 1.8.2.25 src/headerview.c;  cvs diff -u -r 1.94.2.157 -r 1.94.2.158 src/messageview.c;  cvs diff -u -r 1.395.2.329 -r 1.395.2.330 src/summaryview.c;  cvs diff -u -r 1.96.2.185 -r 1.96.2.186 src/textview.c;  ) > 3.0.2cvs49.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
index 688bc1d..d3917b7 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=50
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 82924d1..73665ad 100644 (file)
@@ -439,7 +439,7 @@ gboolean addressadd_selection( AddressIndex *addrIndex, const gchar *name,
                        if (picture) {
                                GError *error = NULL;
                                gchar *name = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, G_DIR_SEPARATOR_S, 
-                                                       ADDRITEM_ID(person), NULL, ".png" );
+                                                       ADDRITEM_ID(person), ".png", NULL );
                                gdk_pixbuf_save(picture, name, "png", &error, NULL);
                                addritem_person_set_picture( person, ADDRITEM_ID(person) ) ;
                                g_free( name );
index 454fd9a..9f9060a 100644 (file)
@@ -3220,7 +3220,7 @@ gchar *addrindex_get_picture_file(const gchar *emailaddr)
                                                found = TRUE;
                                                filename = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S, 
                                                        ADDRBOOK_DIR, G_DIR_SEPARATOR_S, 
-                                                       person->picture, NULL, ".png" );
+                                                       person->picture, ".png", NULL );
                                                break;
                                        }
                                        nodeM = nodeM->next;
index 1b27317..60d030f 100644 (file)
@@ -1444,13 +1444,13 @@ static gboolean addressbook_edit_person_close( gboolean cancelled )
                if (personeditdlg.picture_set) {
                        GdkPixbuf * pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(personeditdlg.image));
                        name = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, G_DIR_SEPARATOR_S, 
-                                                       ADDRITEM_ID(current_person), NULL, ".png" );
+                                                       ADDRITEM_ID(current_person), ".png", NULL );
                        gdk_pixbuf_save(pixbuf, name, "png", &error, NULL);
                        addritem_person_set_picture( current_person, ADDRITEM_ID(current_person) ) ;
                        g_free( name );
                } else {
                        name = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, G_DIR_SEPARATOR_S, 
-                                                       ADDRITEM_ID(current_person), NULL, ".png" );
+                                                       ADDRITEM_ID(current_person), ".png", NULL );
                        g_unlink(name);
                        g_free(name);
                }
@@ -1539,7 +1539,7 @@ ItemPerson *addressbook_edit_person( AddressBookFile *abf, ItemFolder *parent_fo
 
                if( current_person->picture ) { 
                        gchar *filename = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, G_DIR_SEPARATOR_S, 
-                                                       current_person->picture, NULL, ".png" );
+                                                       current_person->picture, ".png", NULL );
                        if (is_file_exist(filename)) {
                                pixbuf = gdk_pixbuf_new_from_file(filename, &error);
                                if (error) {