2007-01-12 [paul] 2.7.0cvs15

	* configure.ac
	* src/addressbook.c
	* src/foldersel.c
	* src/folderview.c
	* src/main.c
		no need to define CLAWS anymore, remove
		all that stuff

diff --git a/ChangeLog b/ChangeLog
index 080223af0d7b18dd0529be77b71f5974b15e2afd..4ef9daea4a81c29bd6ab353a154c8c3c361f7a49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-12 [paul]      2.7.0cvs15
+
+       * configure.ac
+       * src/addressbook.c
+       * src/foldersel.c
+       * src/folderview.c
+       * src/main.c
+               no need to define CLAWS anymore, remove
+               all that stuff
+
 2007-01-12 [paul]      2.7.0cvs14
 
        * src/mimeview.c

diff --git a/PATCHSETS b/PATCHSETS
index 04b38f1a7b16fd4b455c5a06f6e2cf14dbb9a499..c810b7b72e5ac787fa1b91dc2295e3724a3ec8cb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2241,3 +2241,4 @@
 ( cvs diff -u -r 1.654.2.2292 -r 1.654.2.2293 configure.ac;  ) > 2.7.0cvs12.patchset
 ( cvs diff -u -r 1.49.2.85 -r 1.49.2.86 src/procmime.c;  ) > 2.7.0cvs13.patchset
 ( cvs diff -u -r 1.83.2.97 -r 1.83.2.98 src/mimeview.c;  ) > 2.7.0cvs14.patchset
+( cvs diff -u -r 1.654.2.2295 -r 1.654.2.2296 configure.ac;  cvs diff -u -r 1.60.2.74 -r 1.60.2.75 src/addressbook.c;  cvs diff -u -r 1.26.2.30 -r 1.26.2.31 src/foldersel.c;  cvs diff -u -r 1.207.2.141 -r 1.207.2.142 src/folderview.c;  cvs diff -u -r 1.115.2.122 -r 1.115.2.123 src/main.c;  ) > 2.7.0cvs15.patchset

diff --git a/configure.ac b/configure.ac
index 3332b1b395bda70747425f414575ebdf8631537a..c4984524e47002c4b6f44a9efd70f338fd6c56fd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -53,9 +53,6 @@ dnl GNOME 2.x installed?
 PKG_CHECK_MODULES(GNOME2, libgnome-2.0 >= 2.0, ac_enable_gnome2=yes, ac_enable_gnome2=no)
 AM_CONDITIONAL(CLAWS_GNOME2, test x"$ac_enable_gnome2" = x"yes")
 
-dnl Claws version
-AC_DEFINE(CLAWS, 1, Compiling Claws branch of sylpheed)
-
 dnl libtool versioning
 LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION
 LT_CURRENT=`expr $MICRO_VERSION - $INTERFACE_AGE`

diff --git a/src/addressbook.c b/src/addressbook.c
index 48e8692cf55f8813cd31c2f4c8305c0731a84275..6c98b333b7249ca9fbd7a5cf6c2244c9e0581911 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -1310,10 +1310,7 @@ static void addressbook_button_set_sensitive(void)
        if (addrbook.target_compose) {
                to_sens = TRUE;
                cc_sens = TRUE;
-#ifndef CLAWS          
-               if (addrbook.target_compose->use_bcc)
-#endif                 
-                       bcc_sens = TRUE;
+               bcc_sens = TRUE;
        }
 
        gtk_widget_set_sensitive(addrbook.to_btn, to_sens);

diff --git a/src/foldersel.c b/src/foldersel.c
index 467e96e9503f4cabe6ee1803c242098bb3564bdd..707631cd0122e7bb60e5d9dbef96eb29f429e756 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -391,22 +391,6 @@ static void foldersel_append_item(GtkTreeStore *store, FolderItem *item,
                }
        }
 
-        /* CLAWS: already adds the UI string to the folder name */
-#ifndef CLAWS         
-       if (!item->parent) {
-               switch (FOLDER_TYPE(item->folder)) {
-               case F_MH:
-                       Xstrcat_a(name, name, " (MH)", ); break;
-               case F_IMAP:
-                       Xstrcat_a(name, name, " (IMAP4)", ); break;
-               case F_NEWS:
-                       Xstrcat_a(name, name, " (News)", ); break;
-               default:
-                       break;
-               }
-       }
-#endif        
-
        if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0) {
                name = g_strdup_printf("%s (%d)", name, item->total_msgs);
        } else if (item->unread_msgs > 0) {

diff --git a/src/folderview.c b/src/folderview.c
index 0775aef299b9d2fcbd42adea7b8008c6cfee037b..55607d541a7ef773291eea6e91de91b8ea9b77cc 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1633,31 +1633,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                folderview_update_node(folderview, node);
 }
 
-#if !CLAWS /* keep it here for syncs */
-void folderview_update_item(FolderItem *item, gboolean update_summary)
-{
-       GList *list;
-       FolderView *folderview;
-       GtkCTree *ctree;
-       GtkCTreeNode *node;
-
-       g_return_if_fail(item != NULL);
-
-       for (list = folderview_list; list != NULL; list = list->next) {
-               folderview = (FolderView *)list->data;
-               ctree = GTK_CTREE(folderview->ctree);
-
-               node = gtk_ctree_find_by_row_data(ctree, NULL, item);
-               if (node) {
-                       folderview_update_node(folderview, node);
-                       if (update_summary && folderview->opened == node)
-                               summary_show(folderview->summaryview,
-                                            item, FALSE);
-               }
-       }
-}
-#endif
-
 void folderview_update_search_icon(FolderItem *item, gboolean matches)
 {
        GList *list;

diff --git a/src/main.c b/src/main.c
index e7e8464945cd1b132c5cdc5acc983bf80d314a2d..dc88997ff135241b46e58ca3457838f715bff624 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -157,9 +157,7 @@ static gint lock_socket_remove              (void);
 static void lock_socket_input_cb       (gpointer          data,
                                         gint              source,
                                         GdkInputCondition condition);
-#ifndef CLAWS                                   
-static 
-#endif
+
 gchar *get_socket_name         (void);
 
 
@@ -1271,9 +1269,6 @@ gboolean claws_is_starting(void)
  * CLAWS: want this public so crash dialog can delete the
  * lock file too
  */
-#ifndef CLAWS
-static
-#endif
 gchar *get_socket_name(void)
 {
        static gchar *filename = NULL;