[Commits] PATCHSETS 1.1.2.179 1.1.2.180 ChangeLog 1.1.2.219 1.1.2.220 configure.ac 1.1.2.224 1.1.2.225

[miras at claws-mail.org]

Update of /home/claws-mail/plugins/notification
In directory claws-mail:/tmp/cvs-serv9711

Modified Files:
      Tag: gtk2
	PATCHSETS ChangeLog configure.ac 
Log Message:
2012-01-03 [mir]	0.29cvs2

	* src/notification_plugin.c
	* src/notification_popup.c
	* src/notification_trayicon.c
	    Necessary changes to be able to load when
	    claws-mail is compiled to use the new
	    address book.

Index: configure.ac
===================================================================
RCS file: /home/claws-mail/plugins/notification/Attic/configure.ac,v
retrieving revision 1.1.2.224
retrieving revision 1.1.2.225
diff -u -d -r1.1.2.224 -r1.1.2.225
--- configure.ac	2 Jan 2012 18:25:08 -0000	1.1.2.224
+++ configure.ac	3 Jan 2012 00:26:59 -0000	1.1.2.225
@@ -9,7 +9,7 @@
 MAJOR_VERSION=0
 MINOR_VERSION=29
 MICRO_VERSION=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
 
 if test \( $EXTRA_VERSION -eq 0 \); then
     if test \( $MICRO_VERSION -eq 0 \); then

Index: PATCHSETS
===================================================================
RCS file: /home/claws-mail/plugins/notification/Attic/PATCHSETS,v
retrieving revision 1.1.2.179
retrieving revision 1.1.2.180
diff -u -d -r1.1.2.179 -r1.1.2.180
--- PATCHSETS	2 Jan 2012 18:25:08 -0000	1.1.2.179
+++ PATCHSETS	3 Jan 2012 00:26:59 -0000	1.1.2.180
@@ -172,8 +172,13 @@
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/Makefile.am;  ) > 0.28cvs1.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/claws.def;  cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/notification_core.c;  cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/notification_plugin.c;  cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/notification_trayicon.c;  ) > 0.28cvs2.patchset
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/notification_foldercheck.c;  ) > 0.28cvs3.patchset
+<<<<<<< PATCHSETS
+( cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/notification_plugin.c;  cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/notification_popup.c;  cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/notification_trayicon.c;  ) > 0.28cvs4.patchset
+=======
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 gtkhotkey/gtk-hotkey-error.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 gtkhotkey/x11/tomboykeybinder.h;  ) > 0.28cvs4.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 gtkhotkey/Makefile.am;  ) > 0.28cvs5.patchset
 ( cvs diff -u -r 1.1.2.220 -r 1.1.2.221 configure.ac;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 po/es.po;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 po/fr.po;  cvs diff -u -r -1.1.2.3 -r -1.1.2.4 po/id.po;  diff -u /dev/null po/id_ID.po;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 po/pt_BR.po;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/sk.po;  ) > 0.28cvs6.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/ru.po;  ) > 0.28cvs7.patchset
 ( cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/notification_prefs.c;  ) > 0.29cvs1.patchset
+>>>>>>> 1.1.2.179
+( cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/notification_plugin.c;  cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/notification_popup.c;  cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/notification_trayicon.c;  ) > 0.29cvs2.patchset

Index: ChangeLog
===================================================================
RCS file: /home/claws-mail/plugins/notification/Attic/ChangeLog,v
retrieving revision 1.1.2.219
retrieving revision 1.1.2.220
diff -u -d -r1.1.2.219 -r1.1.2.220
--- ChangeLog	2 Jan 2012 18:25:08 -0000	1.1.2.219
+++ ChangeLog	3 Jan 2012 00:26:59 -0000	1.1.2.220
@@ -1,3 +1,12 @@
+2012-01-03 [mir]	0.29cvs2
+
+	* src/notification_plugin.c
+	* src/notification_popup.c
+	* src/notification_trayicon.c
+	    Necessary changes to be able to load when
+	    claws-mail is compiled to use the new
+	    address book.
+
 2012-01-02 [ticho]	0.29cvs1
 
 	* src/notification_prefs.c