2007-01-21 [colin] 2.7.1cvs45
authorColin Leroy <colin@colino.net>
Sun, 21 Jan 2007 12:16:52 +0000 (12:16 +0000)
committerColin Leroy <colin@colino.net>
Sun, 21 Jan 2007 12:16:52 +0000 (12:16 +0000)
* src/crash.c
* src/exporthtml.c
* src/exporthtml.h
* src/exportldif.c
* src/exportldif.h
* src/folder.c
* src/folder.h
* src/folder_item_prefs.c
* src/folder_item_prefs.h
* src/folderview.c
* src/folderview.h
* src/gedit-print.c
* src/gedit-print.h
* src/main.c
* src/main.h
* src/common/socket.c
* src/common/socket.h
* src/gtk/gtkaspell.c
* src/gtk/gtkaspell.h
* src/gtk/quicksearch.c
* src/gtk/quicksearch.h
Same

24 files changed:
ChangeLog
PATCHSETS
configure.ac
src/common/socket.c
src/common/socket.h
src/crash.c
src/exporthtml.c
src/exporthtml.h
src/exportldif.c
src/exportldif.h
src/folder.c
src/folder.h
src/folder_item_prefs.c
src/folder_item_prefs.h
src/folderview.c
src/folderview.h
src/gedit-print.c
src/gedit-print.h
src/gtk/gtkaspell.c
src/gtk/gtkaspell.h
src/gtk/quicksearch.c
src/gtk/quicksearch.h
src/main.c
src/main.h

index 67bec74..26cfe9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2007-01-21 [colin]     2.7.1cvs45
+
+       * src/crash.c
+       * src/exporthtml.c
+       * src/exporthtml.h
+       * src/exportldif.c
+       * src/exportldif.h
+       * src/folder.c
+       * src/folder.h
+       * src/folder_item_prefs.c
+       * src/folder_item_prefs.h
+       * src/folderview.c
+       * src/folderview.h
+       * src/gedit-print.c
+       * src/gedit-print.h
+       * src/main.c
+       * src/main.h
+       * src/common/socket.c
+       * src/common/socket.h
+       * src/gtk/gtkaspell.c
+       * src/gtk/gtkaspell.h
+       * src/gtk/quicksearch.c
+       * src/gtk/quicksearch.h
+               Same
+
 2007-01-21 [colin]     2.7.1cvs44
 
        * src/common/utils.c
index b9605bf..469cd1f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/addritem.c;  cvs diff -u -r 1.12.2.6 -r 1.12.2.7 src/addritem.h;  ) > 2.7.1cvs42.patchset
 ( cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/addrselect.c;  cvs diff -u -r 1.1.14.5 -r 1.1.14.6 src/addrselect.h;  cvs diff -u -r 1.65.2.53 -r 1.65.2.54 src/codeconv.c;  cvs diff -u -r 1.15.2.17 -r 1.15.2.18 src/codeconv.h;  cvs diff -u -r 1.382.2.354 -r 1.382.2.355 src/compose.c;  cvs diff -u -r 1.50.2.30 -r 1.50.2.31 src/compose.h;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/etpan/Makefile.am;  cvs diff -u -r -1.1.4.5 -r -1.1.4.6 src/etpan/etpan-log.c;  cvs diff -u -r -1.1.4.3 -r -1.1.4.4 src/etpan/etpan-log.h;  cvs diff -u -r 1.2.2.15 -r 1.2.2.16 src/gtk/colorlabel.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/colorlabel.h;  cvs diff -u -r 1.9.2.14 -r 1.9.2.15 src/gtk/sslcertwindow.c;  cvs diff -u -r 1.6.2.5 -r 1.6.2.6 src/gtk/sslcertwindow.h;  ) > 2.7.1cvs43.patchset
 ( cvs diff -u -r 1.36.2.96 -r 1.36.2.97 src/common/utils.c;  cvs diff -u -r 1.20.2.43 -r 1.20.2.44 src/common/utils.h;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/etpan/etpan-thread-manager.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/etpan/etpan-thread-manager.h;  ) > 2.7.1cvs44.patchset
+( cvs diff -u -r 1.23.2.20 -r 1.23.2.21 src/crash.c;  cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/exporthtml.c;  cvs diff -u -r 1.1.14.4 -r 1.1.14.5 src/exporthtml.h;  cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/exportldif.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/exportldif.h;  cvs diff -u -r 1.213.2.132 -r 1.213.2.133 src/folder.c;  cvs diff -u -r 1.87.2.36 -r 1.87.2.37 src/folder.h;  cvs diff -u -r 1.2.2.18 -r 1.2.2.19 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.7 -r 1.2.2.8 src/folder_item_prefs.h;  cvs diff -u -r 1.207.2.145 -r 1.207.2.146 src/folderview.c;  cvs diff -u -r 1.20.2.17 -r 1.20.2.18 src/folderview.h;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gedit-print.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gedit-print.h;  cvs diff -u -r 1.115.2.129 -r 1.115.2.130 src/main.c;  cvs diff -u -r 1.7.2.8 -r 1.7.2.9 src/main.h;  cvs diff -u -r 1.13.2.25 -r 1.13.2.26 src/common/socket.c;  cvs diff -u -r 1.13.2.10 -r 1.13.2.11 src/common/socket.h;  cvs diff -u -r 1.9.2.49 -r 1.9.2.50 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/gtk/gtkaspell.h;  cvs diff -u -r 1.1.2.59 -r 1.1.2.60 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/quicksearch.h;  ) > 2.7.1cvs45.patchset
index 8f3a109..3ff0cc3 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=44
+EXTRA_VERSION=45
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index cb4c7f8..2114b37 100644 (file)
@@ -1280,7 +1280,7 @@ gint sock_printf(SockInfo *sock, const gchar *format, ...)
        return sock_write_all(sock, buf, strlen(buf));
 }
 
-gint fd_read(gint fd, gchar *buf, gint len)
+static gint fd_read(gint fd, gchar *buf, gint len)
 {
        if (fd_check_io(fd, G_IO_IN) < 0)
                return -1;
@@ -1546,7 +1546,7 @@ gint sock_gets(SockInfo *sock, gchar *buf, gint len)
        return ret;
 }
 
-gint fd_getline(gint fd, gchar **str)
+static gint fd_getline(gint fd, gchar **str)
 {
        gchar buf[BUFFSIZE];
        gint len;
index 441deb8..3861a01 100644 (file)
@@ -107,11 +107,9 @@ gint fd_connect_unix       (const gchar *path);
 gint fd_open_unix      (const gchar *path);
 gint fd_accept         (gint sock);
 
-gint fd_read           (gint sock, gchar *buf, gint len);
 gint fd_write          (gint sock, const gchar *buf, gint len);
 gint fd_write_all      (gint sock, const gchar *buf, gint len);
 gint fd_gets           (gint sock, gchar *buf, gint len);
-gint fd_getline                (gint sock, gchar **str);
 gint fd_close          (gint sock);
 
 /* Functions for SSL */
index 98b14e9..41d7925 100644 (file)
@@ -46,9 +46,7 @@
 #      include <gnu/libc-version.h>
 #endif
 
-#ifdef SIGTERM
 #include "main.h"
-#endif
 #include "claws.h"
 #include "crash.h"
 #include "utils.h"
@@ -556,8 +554,7 @@ static void crash_handler(int sig)
  */
 static void crash_cleanup_exit(void)
 {
-       extern gchar *get_socket_name(void);
-       const char *filename = get_socket_name();
+       const char *filename = claws_get_socket_name();
        g_unlink(filename);
 }
 
index f08a10b..c00b5a9 100644 (file)
@@ -217,21 +217,6 @@ static StylesheetEntry *exporthtml_find_stylesheet( ExportHtmlCtl *ctl ) {
        return retVal;
 }
 
-void exporthtml_set_path( ExportHtmlCtl *ctl, const gchar *value ) {
-       g_return_if_fail( ctl != NULL );
-       ctl->path = mgu_replace_string( ctl->path, value );
-       g_strstrip( ctl->path );
-}
-void exporthtml_set_file_html( ExportHtmlCtl *ctl, const gchar *value ) {
-       g_return_if_fail( ctl != NULL );
-       ctl->fileHtml = mgu_replace_string( ctl->fileHtml, value );
-       g_strstrip( ctl->fileHtml );
-}
-void exporthtml_set_encoding( ExportHtmlCtl *ctl, const gchar *value ) {
-       g_return_if_fail( ctl != NULL );
-       ctl->encoding = mgu_replace_string( ctl->encoding, value );
-       g_strstrip( ctl->encoding );
-}
 void exporthtml_set_stylesheet( ExportHtmlCtl *ctl, const gint value ) {
        g_return_if_fail( ctl != NULL );
        ctl->stylesheet = value;
index e6a907e..86a51d5 100644 (file)
@@ -61,12 +61,6 @@ struct _ExportHtmlCtl {
 /* Function prototypes */
 ExportHtmlCtl *exporthtml_create( void );
 void exporthtml_free           ( ExportHtmlCtl *ctl );
-void exporthtml_set_path       ( ExportHtmlCtl *ctl,
-                                 const gchar *value );
-void exporthtml_set_file_html  ( ExportHtmlCtl *ctl,
-                                 const gchar *value );
-void exporthtml_set_encoding   ( ExportHtmlCtl *ctl,
-                                 const gchar *value );
 void exporthtml_set_stylesheet ( ExportHtmlCtl *ctl,
                                  const gint value );
 void exporthtml_set_name_format        ( ExportHtmlCtl *ctl,
index 8f7789c..f2d701a 100644 (file)
@@ -113,17 +113,6 @@ void exportldif_free( ExportLdifCtl *ctl ) {
        g_free( ctl );
 }
 
-/**
- * Specify full file specification of LDIF file.
- * \param ctl   Export control data.
- * \param value Full file specification.
- */
-void exportldif_set_path( ExportLdifCtl *ctl, const gchar *value ) {
-       g_return_if_fail( ctl != NULL );
-       ctl->path = mgu_replace_string( ctl->path, value );
-       g_strstrip( ctl->path );
-}
-
 /**
  * Specify suffix to be used for creating DN entries.
  * \param ctl   Export control data.
index 5f206b0..2cfb243 100644 (file)
@@ -54,8 +54,6 @@ struct _ExportLdifCtl {
 /* Function prototypes */
 ExportLdifCtl *exportldif_create       ( void );
 void exportldif_free                   ( ExportLdifCtl *ctl );
-void exportldif_set_path               ( ExportLdifCtl *ctl,
-                                         const gchar *value );
 void exportldif_set_file_html          ( ExportLdifCtl *ctl,
                                          const gchar *value );
 void exportldif_set_suffix             ( ExportLdifCtl *ctl,
index f141e06..3eb9180 100644 (file)
@@ -81,6 +81,8 @@ static GSList *folder_unloaded_list = NULL;
 void folder_init               (Folder         *folder,
                                 const gchar    *name);
 
+static gchar *folder_item_get_cache_file       (FolderItem     *item);
+static gchar *folder_item_get_mark_file        (FolderItem     *item);
 static gchar *folder_get_list_path     (void);
 static GNode *folder_get_xml_node      (Folder         *folder);
 static Folder *folder_get_from_xml     (GNode          *node);
@@ -94,6 +96,10 @@ static void folder_item_read_cache           (FolderItem *item);
 gint folder_item_scan_full             (FolderItem *item, gboolean filtering);
 static void folder_item_update_with_msg (FolderItem *item, FolderItemUpdateFlags update_flags,
                                          MsgInfo *msg);
+static GHashTable *folder_persist_prefs_new    (Folder *folder);
+static void folder_persist_prefs_free          (GHashTable *pptable);
+static void folder_item_restore_persist_prefs  (FolderItem *item, GHashTable *pptable);
+
 
 void folder_system_init(void)
 {
@@ -1229,7 +1235,7 @@ FolderClass *folder_get_class_from_string(const gchar *str)
        return NULL;
 }
 
-gchar *folder_get_identifier(Folder *folder)
+static gchar *folder_get_identifier(Folder *folder)
 {
        gchar *type_str;
 
@@ -1364,11 +1370,6 @@ gchar *folder_item_get_name(FolderItem *item)
        return name;
 }
 
-Folder *folder_get_default_folder(void)
-{
-       return folder_list ? FOLDER(folder_list->data) : NULL;
-}
-
 gboolean folder_have_mailbox (void)
 {
        GList *cur;
@@ -3383,7 +3384,7 @@ gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
        return folder->klass->is_msg_changed(folder, item, msginfo);
 }
 
-gchar *folder_item_get_cache_file(FolderItem *item)
+static gchar *folder_item_get_cache_file(FolderItem *item)
 {
        gchar *path;
        gchar *file;
@@ -3401,7 +3402,7 @@ gchar *folder_item_get_cache_file(FolderItem *item)
        return file;
 }
 
-gchar *folder_item_get_mark_file(FolderItem *item)
+static gchar *folder_item_get_mark_file(FolderItem *item)
 {
        gchar *path;
        gchar *file;
@@ -3707,7 +3708,7 @@ FolderItem *folder_get_default_processing(void)
  * (note that in claws other options are in the folder_item_prefs_RC
  * file, so those don't need to be included in PersistPref yet) 
  */
-GHashTable *folder_persist_prefs_new(Folder *folder)
+static GHashTable *folder_persist_prefs_new(Folder *folder)
 {
        GHashTable *pptable;
 
@@ -3717,20 +3718,20 @@ GHashTable *folder_persist_prefs_new(Folder *folder)
        return pptable;
 }
 
-void folder_persist_prefs_free(GHashTable *pptable)
+static void folder_persist_prefs_free(GHashTable *pptable)
 {
        g_return_if_fail(pptable);
        g_hash_table_foreach_remove(pptable, persist_prefs_free, NULL);
        g_hash_table_destroy(pptable);
 }
 
-const PersistPrefs *folder_get_persist_prefs(GHashTable *pptable, const char *name)
+static const PersistPrefs *folder_get_persist_prefs(GHashTable *pptable, const char *name)
 {
        if (pptable == NULL || name == NULL) return NULL;
        return g_hash_table_lookup(pptable, name);
 }
 
-void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *pptable)
+static void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *pptable)
 {
        const PersistPrefs *pp;
        gchar *id = folder_item_get_identifier(item);
index 57acfee..1ab437e 100644 (file)
@@ -752,12 +752,10 @@ FolderItem *folder_find_item_from_path            (const gchar    *path);
 FolderClass *folder_get_class_from_string      (const gchar    *str);
 FolderItem *folder_find_child_item_by_name     (FolderItem     *item,
                                                 const gchar    *name);
-gchar      *folder_get_identifier              (Folder         *folder);
 gchar      *folder_item_get_identifier         (FolderItem     *item);
 FolderItem *folder_find_item_from_identifier   (const gchar    *identifier);
 gchar     *folder_item_get_name                (FolderItem     *item);
 
-Folder     *folder_get_default_folder  (void);
 FolderItem *folder_get_default_inbox   (void);
 FolderItem *folder_get_default_outbox  (void);
 FolderItem *folder_get_default_draft   (void);
@@ -820,16 +818,8 @@ void       folder_item_change_msg_flags    (FolderItem     *item,
 gboolean folder_item_is_msg_changed    (FolderItem     *item,
                                         MsgInfo        *msginfo);
 /* return value is locale chaset */
-gchar *folder_item_get_cache_file      (FolderItem     *item);
-gchar *folder_item_get_mark_file       (FolderItem     *item);
 gchar * folder_item_get_identifier     (FolderItem * item);
 
-GHashTable *folder_persist_prefs_new   (Folder *folder);
-void folder_persist_prefs_free         (GHashTable *pptable);
-const PersistPrefs *folder_get_persist_prefs
-                                       (GHashTable *pptable, const char *name);
-
-void folder_item_restore_persist_prefs (FolderItem *item, GHashTable *pptable);
 void folder_clean_cache_memory         (FolderItem *protected_item);
 void folder_clean_cache_memory_force   (void);
 void folder_item_write_cache           (FolderItem *item);
index 6a9282e..f9cdd8f 100644 (file)
@@ -152,15 +152,6 @@ void folder_item_prefs_save_config(FolderItem * item)
         */
 }
 
-void folder_item_prefs_set_config(FolderItem * item,
-                                 int sort_type, gint sort_mode)
-{
-       g_assert(item);
-       g_warning("folder_item_prefs_set_config() should never be called\n");
-       item->sort_key  = sort_type;
-       item->sort_type = sort_mode;
-}
-
 static FolderItemPrefs *folder_item_prefs_clear(FolderItemPrefs *prefs)
 {
        prefs->sort_by_number = FALSE;
@@ -216,20 +207,6 @@ void folder_item_prefs_free(FolderItemPrefs * prefs)
        g_free(prefs);
 }
 
-gint folder_item_prefs_get_sort_mode(FolderItem * item)
-{
-       g_assert(item != NULL);
-       g_warning("folder_item_prefs_get_sort_mode() should never be called\n");
-       return item->sort_key;
-}
-
-gint folder_item_prefs_get_sort_type(FolderItem * item)
-{
-       g_assert(item != NULL);
-       g_warning("folder_item_prefs_get_sort_type() should never be called\n");
-       return item->sort_type;
-}
-
 #define SAFE_STRING(str) \
        (str) ? (str) : ""
 
index 0610c5f..db0eef1 100644 (file)
@@ -70,12 +70,8 @@ struct _FolderItemPrefs {
 
 void folder_item_prefs_read_config(FolderItem * item);
 void folder_item_prefs_save_config(FolderItem * item);
-void folder_item_prefs_set_config(FolderItem * item,
-                                 int sort_type, gint sort_mode);
 FolderItemPrefs *folder_item_prefs_new(void);
 void folder_item_prefs_free(FolderItemPrefs * prefs);
-gint folder_item_prefs_get_sort_type(FolderItem * item);
-gint folder_item_prefs_get_sort_mode(FolderItem * item);
 void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest);
 
 #endif /* FOLDER_ITEM_PREFS_H */
index f3f96d3..e11e673 100644 (file)
@@ -180,7 +180,6 @@ static GdkBitmap *unreadxpmmask;
 static GdkPixmap *readxpm;
 static GdkBitmap *readxpmmask;
 
-
 static void folderview_select_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
 static void folderview_set_folders      (FolderView    *folderview);
@@ -975,75 +974,6 @@ FolderItem *folderview_get_selected_item(FolderView *folderview)
        return gtk_ctree_node_get_row_data(ctree, folderview->selected);
 }
 
-void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       static GtkCTreeNode *prev_row = NULL;
-       FolderItem *item;
-       gint new, unread, total;
-       gchar *new_str, *unread_str, *total_str;
-       gint *col_pos = folderview->col_pos;
-
-       if (!row) return;
-
-       item = gtk_ctree_node_get_row_data(ctree, row);
-       if (!item) return;
-
-       gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_NEW], &new_str);
-       gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_UNREAD], &unread_str);
-       gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_TOTAL], &total_str);
-       new = atoi(new_str);
-       unread = atoi(unread_str);
-       total = atoi(total_str);
-
-       prev_row = row;
-
-       folderview_update_node(folderview, row);
-}
-
-void folderview_append_item(FolderItem *item)
-{
-       GList *list;
-       
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-       if (folder_item_parent(item)) return;
-
-       for (list = folderview_list; list != NULL; list = list->next) {
-               FolderView *folderview = (FolderView *)list->data;
-               GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-               GtkCTreeNode *node, *child;
-               gint *col_pos = folderview->col_pos;
-
-               node = gtk_ctree_find_by_row_data(ctree, NULL, 
-                                                 folder_item_parent(item));
-               if (node) {
-                       child = gtk_ctree_find_by_row_data(ctree, node, item);
-                       if (!child) {
-                               gchar *text[N_FOLDER_COLS] =
-                                       {NULL, "0", "0", "0"};
-
-                               gtk_clist_freeze(GTK_CLIST(ctree));
-
-                               text[col_pos[F_COL_FOLDER]] = item->name;
-                               child = gtk_sctree_insert_node
-                                       (ctree, node, NULL, text,
-                                        FOLDER_SPACING,
-                                        folderxpm, folderxpmmask,
-                                        folderopenxpm, folderopenxpmmask,
-                                        FALSE, FALSE);
-                               gtk_ctree_node_set_row_data(ctree, child, item);
-                               gtk_ctree_expand(ctree, node);
-                               folderview_update_node(folderview, child);
-                               folderview_sort_folders(folderview, node,
-                                                       item->folder);
-
-                               gtk_clist_thaw(GTK_CLIST(ctree));
-                       }
-               }
-       }
-}
-
 static void folderview_set_folders(FolderView *folderview)
 {
        GList *list;
@@ -1737,26 +1667,6 @@ static gboolean folderview_update_item_claws(gpointer source, gpointer data)
        return FALSE;
 }
 
-static void folderview_update_item_foreach_func(gpointer key, gpointer val,
-                                               gpointer data)
-{
-       /* CLAWS: share this joy with other hook functions ... */
-       folder_item_update((FolderItem *)key, 
-                          (FolderItemUpdateFlags)GPOINTER_TO_INT(data));
-}
-
-void folderview_update_item_foreach(GHashTable *table, gboolean update_summary)
-{
-       GList *list;
-       FolderItemUpdateFlags flags;
-       
-       flags = update_summary ?  F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_MSGCNT
-               : 0;
-       for (list = folderview_list; list != NULL; list = list->next)
-               g_hash_table_foreach(table, folderview_update_item_foreach_func, 
-                                    GINT_TO_POINTER(flags));
-}
-
 static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
                                      GNode *gnode, GtkCTreeNode *cnode,
                                      gpointer data)
index 698fb85..b014e5b 100644 (file)
@@ -105,19 +105,12 @@ void folderview_select_next_marked        (FolderView     *folderview);
 
 FolderItem *folderview_get_selected_item(FolderView    *folderview);
 
-void folderview_update_msg_num         (FolderView     *folderview,
-                                        GtkCTreeNode   *row);
-
-void folderview_append_item            (FolderItem     *item);
-
 void folderview_rescan_tree            (Folder         *folder,
                                         gboolean        rebuild);
 void folderview_fast_rescan_tree       (Folder         *folder);
 gint folderview_check_new              (Folder         *folder);
 void folderview_check_new_all          (void);
 
-void folderview_update_item_foreach    (GHashTable     *table,
-                                        gboolean        update_summary);
 void folderview_update_all_updated     (gboolean        update_summary);
 
 void folderview_move_folder            (FolderView     *folderview,
index 6ca1ede..3e36f97 100644 (file)
@@ -402,25 +402,6 @@ gedit_print_real (GeditPrintJobInfo *pji,
        }
 }
 
-void 
-gedit_print_preview (GtkTextView *view)
-{
-       GeditPrintJobInfo *pji;
-       GtkTextIter start, end;
-
-       gedit_debug (DEBUG_PRINT, "");
-               
-       g_return_if_fail (view != NULL);
-
-       pji = gedit_print_job_info_new (view);
-
-       gtk_text_buffer_get_bounds (pji->doc, &start, &end);
-
-       pji->preview = PREVIEW;
-       gedit_print_preview_real (pji, &start, &end, 
-                                 GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))));
-}
-
 static GeditPrintJobInfo *
 gedit_print_job_info_new (GtkTextView* view)
 {      
index 9d770fa..f8c46a9 100644 (file)
@@ -38,7 +38,6 @@
 #include <gtk/gtktextview.h>
 
 void gedit_print               (GtkTextView* view);
-void gedit_print_preview       (GtkTextView* view);
 
 #endif
 #endif /* __GEDIT_PRINT_H__ */
index 9b9a7ce..8f564a3 100644 (file)
@@ -263,6 +263,12 @@ static void destroy_menu(GtkWidget *widget, gpointer user_data);
 /******************************************************************************/
 static gint get_textview_buffer_charcount(GtkTextView *view);
 
+static void            gtkaspell_free_dictionary_list  (GSList *list);
+static GSList*         gtkaspell_get_dictionary_list   (const char *aspell_path,
+                                                gint refresh);
+
+static void            gtkaspell_uncheck_all           (GtkAspell *gtkaspell);
+
 static gint get_textview_buffer_charcount(GtkTextView *view)
 {
        GtkTextBuffer *buffer;
@@ -807,29 +813,6 @@ static gboolean set_dictionary(AspellConfig *config, Dictionary *dict)
        return TRUE;
 }
 
-guchar *gtkaspell_get_dict(GtkAspell *gtkaspell)
-{
-
-       g_return_val_if_fail(gtkaspell->gtkaspeller->config,     NULL);
-       g_return_val_if_fail(gtkaspell->gtkaspeller->dictionary, NULL);
-       
-       return (guchar *)g_strdup(gtkaspell->gtkaspeller->dictionary->dictname);
-}
-  
-guchar *gtkaspell_get_path(GtkAspell *gtkaspell)
-{
-       guchar *path;
-       Dictionary *dict;
-
-       g_return_val_if_fail(gtkaspell->gtkaspeller->config, NULL);
-       g_return_val_if_fail(gtkaspell->gtkaspeller->dictionary, NULL);
-
-       dict = gtkaspell->gtkaspeller->dictionary;
-       path = (guchar *)g_strndup(dict->fullname, dict->dictname - dict->fullname);
-
-       return path;
-}
-
 /* set_sug_mode_cb() - Menu callback: Set the suggestion mode */
 static void set_sug_mode_cb(GtkMenuItem *w, GtkAspell *gtkaspell)
 {
@@ -1641,7 +1624,7 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
        gtk_widget_show_all(dialog);
 }
 
-void gtkaspell_uncheck_all(GtkAspell * gtkaspell) 
+static void gtkaspell_uncheck_all(GtkAspell * gtkaspell) 
 {
        GtkTextView *gtktext;
        GtkTextBuffer *buffer;
@@ -1683,7 +1666,7 @@ static GSList *create_empty_dictionary_list(void)
 }
 
 /* gtkaspell_get_dictionary_list() - returns list of dictionary names */
-GSList *gtkaspell_get_dictionary_list(const gchar *aspell_path, gint refresh)
+static GSList *gtkaspell_get_dictionary_list(const gchar *aspell_path, gint refresh)
 {
        GSList *list;
        Dictionary *dict;
@@ -1753,7 +1736,7 @@ GSList *gtkaspell_get_dictionary_list(const gchar *aspell_path, gint refresh)
        return list;
 }
 
-void gtkaspell_free_dictionary_list(GSList *list)
+static void gtkaspell_free_dictionary_list(GSList *list)
 {
        Dictionary *dict;
        GSList *walk;
index 4f7ce7f..f986955 100644 (file)
@@ -66,7 +66,6 @@ GtkAspell*    gtkaspell_new                   (const gchar *dictionary_path,
 
 void           gtkaspell_delete                (GtkAspell *gtkaspell); 
 
-guchar*                gtkaspell_get_dict              (GtkAspell *gtkaspell);
 
 gboolean       gtkaspell_change_dict           (GtkAspell *gtkaspell,
                                                 const gchar* dictionary,
@@ -75,21 +74,14 @@ gboolean    gtkaspell_change_dict           (GtkAspell *gtkaspell,
 gboolean       gtkaspell_change_alt_dict       (GtkAspell *gtkaspell,
                                                 const gchar* alt_dictionary);
 
-guchar*                gtkaspell_get_path              (GtkAspell *gtkaspell);
 
 gboolean       gtkaspell_set_sug_mode          (GtkAspell *gtkaspell, 
                                                 gint  themode);
 
-GSList*                gtkaspell_get_dictionary_list   (const char *aspell_path,
-                                                gint refresh);
-
-void           gtkaspell_free_dictionary_list  (GSList *list);
-
 void           gtkaspell_check_forwards_go     (GtkAspell *gtkaspell);
 void           gtkaspell_check_backwards       (GtkAspell *gtkaspell);
 
 void           gtkaspell_check_all             (GtkAspell *gtkaspell);
-void           gtkaspell_uncheck_all           (GtkAspell *gtkaspell);
 void           gtkaspell_highlight_all         (GtkAspell *gtkaspell);
 
 GtkWidget*     gtkaspell_dictionary_option_menu_new    (const gchar *aspell_path);
index 25714a5..a01be41 100644 (file)
@@ -70,6 +70,7 @@ struct _QuickSearch
 static void quicksearch_set_running(QuickSearch *quicksearch, gboolean run);
 static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active);
 static void quicksearch_reset_folder_items(QuickSearch *quicksearch, FolderItem *folder_item);
+static gchar *expand_search_string(const gchar *str);
 
 gboolean quicksearch_is_fast(QuickSearch *quicksearch)
 {
@@ -820,7 +821,7 @@ gboolean quicksearch_match(QuickSearch *quicksearch, MsgInfo *msginfo)
 }
 
 /* allow Mutt-like patterns in quick search */
-gchar *expand_search_string(const gchar *search_string)
+static gchar *expand_search_string(const gchar *search_string)
 {
        int i = 0;
        gchar term_char, save_char;
index 54c5b99..88ee3ad 100644 (file)
@@ -43,7 +43,6 @@ void quicksearch_set_execute_callback(QuickSearch *quicksearch,
                                      QuickSearchExecuteCallback callback,
                                      gpointer data);
 gboolean quicksearch_match(QuickSearch *quicksearch, MsgInfo *msginfo);
-gchar *expand_search_string(const gchar *str);
 gboolean quicksearch_is_running(QuickSearch *quicksearch);
 gboolean quicksearch_has_focus(QuickSearch *quicksearch);
 void quicksearch_pass_key(QuickSearch *quicksearch, guint val, GdkModifierType mod);
index 22a9298..4c0b745 100644 (file)
@@ -158,9 +158,6 @@ static void lock_socket_input_cb    (gpointer          data,
                                         gint              source,
                                         GdkInputCondition condition);
 
-gchar *get_socket_name         (void);
-
-
 static void open_compose_new           (const gchar    *address,
                                         GPtrArray      *attach_files);
 
@@ -1359,7 +1356,7 @@ gboolean claws_is_starting(void)
  * CLAWS: want this public so crash dialog can delete the
  * lock file too
  */
-gchar *get_socket_name(void)
+gchar *claws_get_socket_name(void)
 {
        static gchar *filename = NULL;
 
@@ -1393,7 +1390,7 @@ static gint prohibit_duplicate_launch(void)
        gint uxsock;
        gchar *path;
 
-       path = get_socket_name();
+       path = claws_get_socket_name();
        uxsock = fd_connect_unix(path);
        if (uxsock < 0) {
                g_unlink(path);
@@ -1500,7 +1497,7 @@ static gint lock_socket_remove(void)
                gdk_input_remove(lock_socket_tag);
        }
        fd_close(lock_socket);
-       filename = get_socket_name();
+       filename = claws_get_socket_name();
        g_unlink(filename);
 #endif
 
index cfeed52..60805d2 100644 (file)
@@ -30,4 +30,5 @@ void app_will_exit    (GtkWidget *widget, gpointer data);
 gboolean clean_quit    (gpointer data);
 gboolean claws_is_exiting(void);
 gboolean claws_is_starting(void);
+gchar *claws_get_socket_name(void);
 #endif /* __MAIN_H__ */