0.8.6claws51

* src/logwindow.[ch]
* src/common/log.[ch]
        implement logging using a hook function

* src/folderview.c
* src/folder.[ch]
        define hooklist name in header file to avoid
        errors caused by wrong spelling of hooklist names

* src/toolbar.c
        fix warnings

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0dbcd4a2a3863c1c2e089d8b3c6aa8d9f7c57545..56aba1a03d53c06c519a331a03d9c586fac81b6f 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,17 @@
+2002-11-30 [christoph] 0.8.6claws51
+
+       * src/logwindow.[ch]
+       * src/common/log.[ch]
+               implement logging using a hook function
+
+       * src/folderview.c
+       * src/folder.[ch]
+               define hooklist name in header file to avoid
+               errors caused by wrong spelling of hooklist names
+
+       * src/toolbar.c
+               fix warnings
+
 2002-11-30 [christoph] 0.8.6claws50
 
        * src/common/Makefile.am

diff --git a/configure.in b/configure.in
index 5898774ccaf7aed79f9a42ce57298a090e82a755..f05661d2dd0a7f0551e1aa9f19deaa65e0b47957 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws50
+EXTRA_VERSION=claws51
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/common/log.c b/src/common/log.c
index 34dc0e469ae091b7b2150ff651a6e412b8e45380..e9cdc268894ef0f61049c29000c7c37fb09bc348 100644 (file)
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -26,6 +26,8 @@
 
 #include "defs.h"
 #include "utils.h"
+#include "log.h"
+#include "hooks.h"
 
 static FILE *log_fp = NULL;
 
@@ -62,6 +64,7 @@ void log_print(const gchar *format, ...)
        va_list args;
        gchar buf[BUFFSIZE + TIME_LEN];
        time_t t;
+       LogText logtext;
 
        time(&t);
        strftime(buf, TIME_LEN + 1, "[%H:%M:%S] ", localtime(&t));
@@ -71,10 +74,9 @@ void log_print(const gchar *format, ...)
        va_end(args);
 
        if (debug_get_mode()) fputs(buf, stdout);
-/*     FIXME:
-       callback for gui logging
-
-       log_window_append(buf, LOG_NORMAL); */
+       logtext.text = buf;
+       logtext.type = LOG_NORMAL;
+       hooks_invoke(LOG_APPEND_TEXT_HOOKLIST, &logtext);
        if (log_fp) {
                fputs(buf, log_fp);
                fflush(log_fp);
@@ -91,6 +93,7 @@ void log_message(const gchar *format, ...)
        va_list args;
        gchar buf[BUFFSIZE + TIME_LEN];
        time_t t;
+       LogText logtext;
 
        time(&t);
        strftime(buf, TIME_LEN + 1, "[%H:%M:%S] ", localtime(&t));
@@ -100,10 +103,9 @@ void log_message(const gchar *format, ...)
        va_end(args);
 
        if (debug_get_mode()) g_message("%s", buf + TIME_LEN);
-/*     FIXME:
-       callback for gui logging
-
-       log_window_append(buf + TIME_LEN, LOG_MSG); */
+       logtext.text = buf + TIME_LEN;
+       logtext.type = LOG_MSG;
+       hooks_invoke(LOG_APPEND_TEXT_HOOKLIST, &logtext);
        if (log_fp) {
                fwrite(buf, TIME_LEN, 1, log_fp);
                fputs("* message: ", log_fp);
@@ -121,6 +123,7 @@ void log_warning(const gchar *format, ...)
        va_list args;
        gchar buf[BUFFSIZE + TIME_LEN];
        time_t t;
+       LogText logtext;
 
        time(&t);
        strftime(buf, TIME_LEN + 1, "[%H:%M:%S] ", localtime(&t));
@@ -130,10 +133,9 @@ void log_warning(const gchar *format, ...)
        va_end(args);
 
        g_warning("%s", buf);
-/*     FIXME:
-       callback for gui logging
-
-       log_window_append(buf + TIME_LEN, LOG_WARN); */
+       logtext.text = buf + TIME_LEN;
+       logtext.type = LOG_WARN;
+       hooks_invoke(LOG_APPEND_TEXT_HOOKLIST, &logtext);
        if (log_fp) {
                fwrite(buf, TIME_LEN, 1, log_fp);
                fputs("** warning: ", log_fp);
@@ -147,6 +149,7 @@ void log_error(const gchar *format, ...)
        va_list args;
        gchar buf[BUFFSIZE + TIME_LEN];
        time_t t;
+       LogText logtext;
 
        time(&t);
        strftime(buf, TIME_LEN + 1, "[%H:%M:%S] ", localtime(&t));
@@ -156,10 +159,9 @@ void log_error(const gchar *format, ...)
        va_end(args);
 
        g_warning("%s", buf);
-/*     FIXME:
-       callback for gui logging
-
-       log_window_append(buf + TIME_LEN, LOG_ERROR); */
+       logtext.text = buf + TIME_LEN;
+       logtext.type = LOG_ERROR;
+       hooks_invoke(LOG_APPEND_TEXT_HOOKLIST, &logtext);
        if (log_fp) {
                fwrite(buf, TIME_LEN, 1, log_fp);
                fputs("*** error: ", log_fp);

diff --git a/src/common/log.h b/src/common/log.h
index 2523d65e5cf3e341dac43dbf4057346867a7c953..6ce345eab7b9a8c0ce7057b025fc4c6c516eca8d 100644 (file)
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -26,6 +26,24 @@
 
 #include <glib.h>
 
+#define LOG_APPEND_TEXT_HOOKLIST "log_append_text"
+
+typedef enum
+{
+       LOG_NORMAL,
+       LOG_MSG,
+       LOG_WARN,
+       LOG_ERROR
+} LogType;
+
+typedef struct _LogText LogText;
+
+struct _LogText
+{
+       const gchar     *text;
+       LogType          type;  
+};
+
 /* logging */
 void set_log_file      (const gchar *filename);
 void close_log_file    (void);

diff --git a/src/folder.c b/src/folder.c
index f07919af1192a2174de757acb2cf228be303e2a6..b10668e8df3fc30e53c314fa96af1fc5997b577e 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -2737,7 +2737,7 @@ void folder_update_item(FolderItem *item, gboolean contentchange)
        
        source.item = item;
        source.content_change = contentchange;
-       hooks_invoke("folder_item_update", &source);
+       hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
 }
 
 static void folder_update_item_func(FolderItem *item, gpointer contentchange)
@@ -2747,7 +2747,7 @@ static void folder_update_item_func(FolderItem *item, gpointer contentchange)
        if (item->need_update) {
                source.item = item;
                source.content_change = GPOINTER_TO_INT(contentchange);
-               hooks_invoke("folder_item_update", &source);
+               hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
 
                item->need_update = FALSE;
        }
@@ -2768,14 +2768,14 @@ void folder_update_item_recursive(FolderItem *item, gboolean update_summary)
 
        source.item = item;
        source.content_change = update_summary; 
-       hooks_invoke("folder_item_update", &source);
+       hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
        while (node != NULL) {
                if (node && node->data) {
                        FolderItem *next_item = (FolderItem*) node->data;
 
                        source.item = next_item;
                        source.content_change = update_summary; 
-                       hooks_invoke("folder_item_update", &source);
+                       hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
                }
                node = node->next;
        }

diff --git a/src/folder.h b/src/folder.h
index 44be6e1ce09b82f354583f1c701e4b3845c2471f..3472aa9d8badf151ce85a92395092f927c235784 100644 (file)
--- a/src/folder.h
+++ b/src/folder.h
@@ -55,6 +55,8 @@ typedef struct _FolderItemUpdateData  FolderItemUpdateData;
 
 #define FOLDER_ITEM(obj)       ((FolderItem *)obj)
 
+#define FOLDER_ITEM_UPDATE_HOOKLIST "folder_item_update"
+
 typedef enum
 {
        F_MH,

diff --git a/src/folderview.c b/src/folderview.c
index b62bed25db642039b3588449afe6b8995c288a5a..f36e1be813fef07ec0ae82b7c9d1e051313dbcec 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -506,7 +506,7 @@ FolderView *folderview_create(void)
        folderview->mbox_factory = mbox_factory;
 
        folderview->folder_item_update_callback_id =
-               hooks_register_hook("folder_item_update", folderview_update_item, (gpointer) folderview);
+               hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item, (gpointer) folderview);
 
        gtk_widget_show_all(scrolledwin);
 

diff --git a/src/logwindow.c b/src/logwindow.c
index 74fbf7e912fa6121d0e88f881e53f48fd7c94d8b..47875dbb512c60d5a0c1d11059fab1bdf0965acd 100644 (file)
--- a/src/logwindow.c
+++ b/src/logwindow.c
@@ -35,15 +35,17 @@
 #include "utils.h"
 #include "gtkutils.h"
 #include "prefs_common.h"
-
-static LogWindow *logwindow;
+#include "log.h"
+#include "hooks.h"
 
 static void hide_cb    (GtkWidget      *widget,
                         LogWindow      *logwin);
 static void key_pressed        (GtkWidget      *widget,
                         GdkEventKey    *event,
                         LogWindow      *logwin);
-void log_window_clear(GtkWidget *text);
+void log_window_append (gpointer        source,
+                        gpointer        data);
+void log_window_clear  (GtkWidget      *text);
 
 LogWindow *log_window_create(void)
 {
@@ -85,8 +87,7 @@ LogWindow *log_window_create(void)
        logwin->window = window;
        logwin->scrolledwin = scrolledwin;
        logwin->text = text;
-
-       logwindow = logwin;
+       logwin->hook_id = hooks_register_hook(LOG_APPEND_TEXT_HOOKLIST, log_window_append, logwin);
 
        return logwin;
 }
@@ -134,19 +135,24 @@ void log_window_show(LogWindow *logwin)
        gtk_widget_show(logwin->window);
 }
 
-void log_window_append(const gchar *str, LogType type)
+void log_window_append(gpointer source, gpointer data)
 {
+       LogText *logtext = (LogText *) source;
+       LogWindow *logwindow = (LogWindow *) data;
        GtkText *text;
        GdkColor *color = NULL;
        gchar *head = NULL;
 
+       g_return_if_fail(logtext != NULL);
+       g_return_if_fail(logtext->text != NULL);
        g_return_if_fail(logwindow != NULL);
+
        if (prefs_common.cliplog && !prefs_common.loglength)
                return;
 
        text = GTK_TEXT(logwindow->text);
 
-       switch (type) {
+       switch (logtext->type) {
        case LOG_MSG:
                color = &logwindow->msg_color;
                head = "* ";
@@ -164,7 +170,7 @@ void log_window_append(const gchar *str, LogType type)
        }
 
        if (head) gtk_text_insert(text, NULL, color, NULL, head, -1);
-       gtk_text_insert(text, NULL, color, NULL, str, -1);
+       gtk_text_insert(text, NULL, color, NULL, logtext->text, -1);
        if (prefs_common.cliplog)
               log_window_clear (GTK_WIDGET (text));
 }

diff --git a/src/logwindow.h b/src/logwindow.h
index 48b64a04571231b3fe9b305f650e10839cfc3b35..a96575e04e7261095e3d1b959c6eb3689b2838db 100644 (file)
--- a/src/logwindow.h
+++ b/src/logwindow.h
@@ -25,14 +25,6 @@
 
 typedef struct _LogWindow      LogWindow;
 
-typedef enum
-{
-       LOG_NORMAL,
-       LOG_MSG,
-       LOG_WARN,
-       LOG_ERROR
-} LogType;
-
 struct _LogWindow
 {
        GtkWidget *window;
@@ -42,12 +34,12 @@ struct _LogWindow
        GdkColor msg_color;
        GdkColor warn_color;
        GdkColor error_color;
+
+       guint hook_id;
 };
 
 LogWindow *log_window_create(void);
 void log_window_init(LogWindow *logwin);
 void log_window_show(LogWindow *logwin);
 
-void log_window_append(const gchar *str, LogType type);
-
 #endif /* __LOGWINDOW_H__ */

diff --git a/src/toolbar.c b/src/toolbar.c
index b49d7cbc0c4a2b83b3f1399776e1bc9f7de56d62..6641592471512da65fba2155d752d51cac4af1be 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -51,6 +51,7 @@
 #include "gtkutils.h"
 #include "toolbar.h"
 #include "prefs_toolbar.h"
+#include "alertpanel.h"
 
 /* elements */
 #define TOOLBAR_TAG_INDEX        "toolbar"
@@ -73,8 +74,6 @@ static void   toolbar_set_default_main       (void);
 static void   toolbar_set_default_compose    (void);
 static void   toolbar_set_default_msgview    (void);
 
-static ToolbarType detect_window(gpointer data);
-
 struct ToolbarText 
 {
        gchar *index_str;
@@ -837,7 +836,6 @@ void common_toolbar_forward_cb(GtkWidget    *widget,
                               gpointer          data)
 {
        ToolbarParent *parent = (ToolbarParent*)data;
-       MessageView *msgview;
 
        g_return_if_fail(parent != NULL);