0.9.0claws61

        * src/addr_compl.[ch]
        * src/addrindex.[ch]
        * src/folderview.c
        * src/inc.c
        * src/news.c
        * src/summaryview.c
        * src/toolbar.c
                fix warnings

diff --git a/ChangeLog.claws b/ChangeLog.claws
index b177df775fc1e8884916676c51039f13d0ce6efa..96f3a112de7e6ceb5c48d419862338be9c1b3e88 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,14 @@
+2003-06-25 [christoph] 0.9.0claws61
+
+       * src/addr_compl.[ch]
+       * src/addrindex.[ch]
+       * src/folderview.c
+       * src/inc.c
+       * src/news.c
+       * src/summaryview.c
+       * src/toolbar.c
+               fix warnings
+

 2003-06-25 [leandro]   0.9.0claws60
 
        * src/compose.c
 2003-06-25 [leandro]   0.9.0claws60
 
        * src/compose.c

diff --git a/configure.ac b/configure.ac
index a6316fc2dee55c43c1ce9af796d224a7c57529dc..3be913640a6b5dac7e08c580bb737271f1143c40 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws60
+EXTRA_VERSION=claws61

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/addr_compl.c b/src/addr_compl.c
index 15e97812b13b1fde45945fbedf00167bcf44986f..efb14338478cf6d9ede0833f0da61ff69a6ac813 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -465,27 +465,6 @@ static gchar *get_next_complete_address(void)
                return NULL;
 }
 
                return NULL;
 }
 

-/**
- * Return the previous complete address match from the completion index.
- * \return Completed address string; this should be freed when done.
- */
-static gchar *get_prev_complete_address(void)
-{
-       if (is_completion_pending()) {
-               int n = g_completion_next - 2;
-
-               /* real previous */
-               n = (n + (g_completion_count * 5)) % g_completion_count;
-
-               /* real next */
-               g_completion_next = n + 1;
-               if (g_completion_next >=  g_completion_count)
-                       g_completion_next = 0;
-               return get_complete_address(n);
-       } else
-               return NULL;
-}
-

 /**
  * Return a count of the completed matches in the completion index.
  * \return Number of matched entries.
 /**
  * Return a count of the completed matches in the completion index.
  * \return Number of matched entries.


@@ -670,17 +649,6 @@ static void addrcompl_free_window( CompletionWindow *cw ) {
        }
 }
 
        }
 }
 

-/**
- * Select specified row in list.
- * \param clist List to process.
- * \param row   Row to select.
- */
-static void completion_window_advance_to_row(GtkCList *clist, gint row)
-{
-       g_return_if_fail(row < g_completion_count);
-       gtk_clist_select_row(clist, row, 0);
-}
-

 /**
  * Advance selection to previous/next item in list.
  * \param clist   List to process.
 /**
  * Advance selection to previous/next item in list.
  * \param clist   List to process.


@@ -847,6 +815,8 @@ static gint addrcompl_callback(
        }
        pthread_mutex_unlock( & _completionMutex_ );
        /* printf( "addrcompl_callback...done\n" ); */
        }
        pthread_mutex_unlock( & _completionMutex_ );
        /* printf( "addrcompl_callback...done\n" ); */

+
+       return 0;

 }
 
 /**
 }
 
 /**

diff --git a/src/addr_compl.h b/src/addr_compl.h
index 19a141df4374fbe26fc3330785daf50b4a7902f1..c81cf12e8a3f1b40ae5cf5c18e0cbd424f60ac6d 100644 (file)
--- a/src/addr_compl.h
+++ b/src/addr_compl.h
@@ -21,11 +21,14 @@
 #ifndef __ADDR_COMPL_H__
 #define __ADDR_COMPL_H__
 
 #ifndef __ADDR_COMPL_H__
 #define __ADDR_COMPL_H__
 

+#include <gtk/gtk.h>
+

 #include "addrindex.h"
 
 gint start_address_completion          (void);
 guint complete_address                 (const gchar *str);
 gchar *get_complete_address            (gint        index);
 #include "addrindex.h"
 
 gint start_address_completion          (void);
 guint complete_address                 (const gchar *str);
 gchar *get_complete_address            (gint        index);

+gint invalidate_address_completion     (void);

 gint end_address_completion            (void);
 
 /* ui functions */
 gint end_address_completion            (void);
 
 /* ui functions */

diff --git a/src/addrindex.c b/src/addrindex.c
index febbf690fdfb1c261318b063bd82bfd02b86e9ba..eb92219c2446dd109af0909ff12674c20bd8f805 100644 (file)
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -37,6 +37,7 @@
 #include "addrindex.h"
 #include "xml.h"
 #include "addrquery.h"
 #include "addrindex.h"
 #include "xml.h"
 #include "addrquery.h"

+#include "addr_compl.h"

 
 #ifndef DEV_STANDALONE
 #include "prefs_gtk.h"
 
 #ifndef DEV_STANDALONE
 #include "prefs_gtk.h"


@@ -311,7 +312,7 @@ static void addrindex_build_if_list( AddressIndex *addrIndex ) {
  * Free DOM fragment.
  * \param fragment Fragment to free.
  */
  * Free DOM fragment.
  * \param fragment Fragment to free.
  */

-static addrindex_free_fragment( AddressIfFragment *fragment ) {
+static void addrindex_free_fragment( AddressIfFragment *fragment ) {

        GList *node;
 
        /* Free children */
        GList *node;
 
        /* Free children */


@@ -1550,7 +1551,6 @@ static gint addrindex_search_order_compare( gconstpointer ptrA, gconstpointer pt
  * \param addrIndex Address index object.
  */
 static void addrindex_build_search_order( AddressIndex *addrIndex ) {
  * \param addrIndex Address index object.
  */
 static void addrindex_build_search_order( AddressIndex *addrIndex ) {

-       AddressInterface *iface;

        GList *nodeIf;
 
        /* Clear existing list */
        GList *nodeIf;
 
        /* Clear existing list */


@@ -2318,8 +2318,10 @@ gint addrindex_ds_read_data( AddressDataSource *ds ) {
        iface = ds->interface;
        if( iface == NULL ) return retVal;
        if( iface->getReadData ) {
        iface = ds->interface;
        if( iface == NULL ) return retVal;
        if( iface->getReadData ) {

+               /*

                gchar *name = ( iface->getName ) ( ds->rawDataSource );
                gchar *name = ( iface->getName ) ( ds->rawDataSource );

-               /* printf( "addrindex_ds_read_data...reading:::%s:::\n", name ); */
+               printf( "addrindex_ds_read_data...reading:::%s:::\n", name );
+               */

                retVal = ( iface->getReadData ) ( ds->rawDataSource );
        }
        return retVal;
                retVal = ( iface->getReadData ) ( ds->rawDataSource );
        }
        return retVal;


@@ -2767,7 +2769,6 @@ gboolean addrindex_load_completion(
                gint (*callBackFunc) ( const gchar *, const gchar *, const gchar * ) )
 {
        AddressDataSource *ds;
                gint (*callBackFunc) ( const gchar *, const gchar *, const gchar * ) )
 {
        AddressDataSource *ds;

-       AddressInterface *iface;

        GList *nodeIf, *nodeDS;
        GList *listP, *nodeP;
        GList *nodeM;
        GList *nodeIf, *nodeDS;
        GList *listP, *nodeP;
        GList *nodeM;

diff --git a/src/addrindex.h b/src/addrindex.h
index ab08261ef31418e1a156bd6120d6a596fffd557f..ae227e90642e2a52544f401f024aa6a1959cb020 100644 (file)
--- a/src/addrindex.h
+++ b/src/addrindex.h
@@ -99,6 +99,9 @@ struct _AddressDataSource {
        gpointer rawDataSource;
 };
 
        gpointer rawDataSource;
 };
 

+void addrindex_initialize              ( AddressIndex *addrIndex );
+void addrindex_teardown                        ( AddressIndex *addrIndex );
+

 AddressIndex *addrindex_create_index   ( void );
 void addrindex_set_file_path           ( AddressIndex *addrIndex,
                                          const gchar *value );
 AddressIndex *addrindex_create_index   ( void );
 void addrindex_set_file_path           ( AddressIndex *addrIndex,
                                          const gchar *value );

diff --git a/src/folderview.c b/src/folderview.c
index a039fff73047ac7582a82f47150d28c0485053a2..d15392208ebe8bd41316d33caa2005b3dc7e8542 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2571,7 +2571,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          FolderView     *folderview)
 {
        gint row, column;
                                          FolderView     *folderview)
 {
        gint row, column;

-       FolderItem *item, *src_item = 0;
+       FolderItem *item, *src_item = NULL;

        GtkCTreeNode *node = NULL;
        gboolean acceptable = FALSE;
        gint height = folderview->ctree->allocation.height;
        GtkCTreeNode *node = NULL;
        gboolean acceptable = FALSE;
        gint height = folderview->ctree->allocation.height;

diff --git a/src/inc.c b/src/inc.c
index c5799bbfeb117b2127a2695e21916b41772cb2d1..652fe9ed2127157eb8cafca0281ca8b98e46af59 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -912,8 +912,6 @@ gint inc_drop_message(const gchar *file, Pop3Session *session)
        FolderItem *inbox;
        FolderItem *dropfolder;
        gint msgnum;
        FolderItem *inbox;
        FolderItem *dropfolder;
        gint msgnum;

-       IncSession *inc_session = (IncSession *)(SESSION(session)->data);
-       gint val;

 
        if (session->ac_prefs->inbox) {
                inbox = folder_find_item_from_identifier
 
        if (session->ac_prefs->inbox) {
                inbox = folder_find_item_from_identifier

diff --git a/src/news.c b/src/news.c
index 28d040e308bf1eb84b4eb75667ae17168db14bfa..ddb966d875e192d6c391a98575de156d18ab6666 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -62,8 +62,6 @@ static void news_folder_destroy(Folder * folder);
 
 static gchar *news_fetch_msg(Folder * folder, FolderItem * item, gint num);
 
 
 static gchar *news_fetch_msg(Folder * folder, FolderItem * item, gint num);
 

-static gint news_scan_group(Folder * folder, FolderItem * item);
-

 static void news_folder_init            (Folder        *folder,
                                          const gchar   *name,
                                          const gchar   *path);
 static void news_folder_init            (Folder        *folder,
                                          const gchar   *name,
                                          const gchar   *path);


@@ -97,9 +95,6 @@ static gint news_select_group          (NNTPSession   *session,
 static MsgInfo *news_parse_xover        (const gchar   *xover_str);
 static gchar *news_parse_xhdr           (const gchar   *xhdr_str,
                                          MsgInfo       *msginfo);
 static MsgInfo *news_parse_xover        (const gchar   *xover_str);
 static gchar *news_parse_xhdr           (const gchar   *xhdr_str,
                                          MsgInfo       *msginfo);

-static gint news_remove_msg             (Folder        *folder, 
-                                         FolderItem    *item, 
-                                         gint           num);

 gint news_get_num_list                  (Folder        *folder, 
                                          FolderItem    *item,
                                          GSList       **list);
 gint news_get_num_list                  (Folder        *folder, 
                                          FolderItem    *item,
                                          GSList       **list);


@@ -328,62 +323,6 @@ gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
        return filename;
 }
 
        return filename;
 }
 

-gint news_scan_group(Folder *folder, FolderItem *item)
-{
-       NNTPSession *session;
-       gint num = 0, first = 0, last = 0;
-       gint ok;
-
-       g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(item != NULL, -1);
-
-       session = news_session_get(folder);
-       if (!session) return -1;
-
-       ok = news_select_group(session, item->path, &num, &first, &last);
-       if (ok != NN_SUCCESS) {
-               log_warning("can't set group: %s\n", item->path);
-               return -1;
-       }
-
-       if (num == 0) {
-               item->new_msgs = item->unread_msgs = item->total_msgs = item->last_num = 0;
-               return 0;
-       }
-
-/*
-       path = folder_item_get_path(item);
-       if (path && is_dir_exist(path)) {
-               procmsg_get_mark_sum(path, &new, &unread, &total, &min, &max,
-                                    first);
-       }
-       g_free(path);
-
-       if (max < first || last < min)
-               new = unread = total = num;
-       else {
-               if (min < first)
-                       min = first;
-
-               if (last < max)
-                       max = last;
-               else if (max < last) {
-                       new += last - max;
-                       unread += last - max;
-               }
-
-               if (new > num) new = num;
-               if (unread > num) unread = num;
-       }
-
-       item->new = new;
-       item->unread = unread;
-       item->total = num;
-       item->last_num = last;
-*/
-       return 0;
-}
-

 static NewsGroupInfo *news_group_info_new(const gchar *name,
                                          gint first, gint last, gchar type)
 {
 static NewsGroupInfo *news_group_info_new(const gchar *name,
                                          gint first, gint last, gchar type)
 {


@@ -581,19 +520,6 @@ static gint news_get_article_cmd(NNTPSession *session, const gchar *cmd,
        return 0;
 }
 
        return 0;
 }
 

-static gint news_remove_msg(Folder *folder, FolderItem *item, gint num)
-{
-       gchar * dir;
-       gint r;
-
-       dir = folder_item_get_path(item);
-       debug_print("news_remove_msg: removing msg %d in %s\n",num,dir);
-       r = remove_numbered_files(dir, num, num);
-       g_free(dir);
-
-       return r;
-}
-

 static gint news_get_article(NNTPSession *session, gint num, gchar *filename)
 {
        return news_get_article_cmd(session, "ARTICLE", num, filename);
 static gint news_get_article(NNTPSession *session, gint num, gchar *filename)
 {
        return news_get_article_cmd(session, "ARTICLE", num, filename);

diff --git a/src/summaryview.c b/src/summaryview.c
index 4b70d754cf0e7dc4af0b329c19bc10d4aa483e9c..d3ac078f717d492047253006ed9d6893146f85e0 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2827,7 +2827,6 @@ static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
 
 static void summary_unlock_row(SummaryView *summaryview, GtkCTreeNode *row)
 {
 
 static void summary_unlock_row(SummaryView *summaryview, GtkCTreeNode *row)
 {

-       gboolean changed = FALSE;

        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
 

diff --git a/src/toolbar.c b/src/toolbar.c
index c2d9e8e7b9056a01a0ecae7d38fb1ad51b3e4103..4ff1c754e93c41217549560a35915b9fc032f92e 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1255,7 +1255,6 @@ static void toolbar_ignore_thread_cb(GtkWidget *widget, gpointer data)
 {
        ToolbarItem *toolbar_item = (ToolbarItem*)data;
        MainWindow *mainwin;
 {
        ToolbarItem *toolbar_item = (ToolbarItem*)data;
        MainWindow *mainwin;

-       MessageView *msgview;

 
        g_return_if_fail(toolbar_item != NULL);
 
 
        g_return_if_fail(toolbar_item != NULL);
 


@@ -1278,7 +1277,6 @@ static void toolbar_print_cb(GtkWidget *widget, gpointer data)
 {
        ToolbarItem *toolbar_item = (ToolbarItem*)data;
        MainWindow *mainwin;
 {
        ToolbarItem *toolbar_item = (ToolbarItem*)data;
        MainWindow *mainwin;

-       MessageView *msgview;

 
        g_return_if_fail(toolbar_item != NULL);
 
 
        g_return_if_fail(toolbar_item != NULL);