2010-04-22 [pawel] 3.7.5cvs50
authorPaweł Pękala <c0rn@gazeta.pl>
Thu, 22 Apr 2010 19:29:01 +0000 (19:29 +0000)
committerPaweł Pękala <c0rn@gazeta.pl>
Thu, 22 Apr 2010 19:29:01 +0000 (19:29 +0000)
* src/addressbook.c
fix compile warning
* src/vcard.c
first NULL check pointer, then use it

ChangeLog
PATCHSETS
configure.ac
src/addressbook.c
src/vcard.c

index 0ece85a..aacdf2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-22 [pawel]     3.7.5cvs50
+
+       * src/addressbook.c
+               fix compile warning
+       * src/vcard.c
+               first NULL check pointer, then use it
+
 2010-04-22 [colin]     3.7.5cvs49
 
        * src/imap.c
index 7c191de..1e7ab0c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.12.2.58 -r 1.12.2.59 src/action.c;  ) > 3.7.5cvs47.patchset
 ( cvs diff -u -r 1.105.2.159 -r 1.105.2.160 src/prefs_account.c;  ) > 3.7.5cvs48.patchset
 ( cvs diff -u -r 1.179.2.250 -r 1.179.2.251 src/imap.c;  cvs diff -u -r 1.42.2.49 -r 1.42.2.50 po/fr.po;  ) > 3.7.5cvs49.patchset
+( cvs diff -u -r 1.60.2.136 -r 1.60.2.137 src/addressbook.c;  cvs diff -u -r 1.14.2.18 -r 1.14.2.19 src/vcard.c;  ) > 3.7.5cvs50.patchset
index e3dced6..7fa0994 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=50
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index f9161ec..d4b07d0 100644 (file)
@@ -168,7 +168,6 @@ static void addressbook_edit_address_post_cb( ItemPerson *person );
 
 static void addressbook_create                 (void);
 static gint addressbook_close                  (void);
-static void addressbook_button_set_sensitive   (void);
 
 static gboolean address_index_has_focus = FALSE;
 static gboolean address_list_has_focus = FALSE;
index 4ae3dc5..fec0018 100644 (file)
@@ -345,8 +345,8 @@ static void vcard_build_items(
                        if( *str != '\0' ) {
                                ItemEMail *email = addritem_create_item_email();
                                addritem_email_set_address( email, str );
-                               str = nodeRemarks->data;
                                if( nodeRemarks ) {
+                                       str = nodeRemarks->data;
                                        if( str ) {
                                                if( g_utf8_collate( str, "internet" ) != 0 ) {
                                                        if( *str != '\0' )