talons

commit 60ba849b1ebf370dc17caf153fb5d5e05ec3abff
parent c9bd60822596ff92d50834ff750f951827bdf2e8
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Thu, 22 Apr 2010 19:29:01 +0000

2010-04-22 [pawel]	3.7.5cvs50

	* src/addressbook.c
		fix compile warning
	* src/vcard.c
		first NULL check pointer, then use it

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/addressbook.c
 | 
1
-
M
src/vcard.c
 | 
2
+-

5 files changed, 10 insertions(+), 3 deletions(-)
diff --git 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
diff --git a/PATCHSETS b/PATCHSETS
@@ -3990,3 +3990,4 @@
 ( 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
diff --git a/configure.ac b/configure.ac
@@ -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=
 
diff --git a/src/addressbook.c b/src/addressbook.c
@@ -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;
diff --git a/src/vcard.c b/src/vcard.c
@@ -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' )