0.8.6claws79
authorChristoph Hohmann <reboot@gmx.ch>
Sun, 8 Dec 2002 14:58:03 +0000 (14:58 +0000)
committerChristoph Hohmann <reboot@gmx.ch>
Sun, 8 Dec 2002 14:58:03 +0000 (14:58 +0000)
* src/folderview.c
* src/logwindow.c
* src/statusbar.c
* src/summaryview.c
        only abort hook invokation if required data is missing not
        if our own data pointer is NULL, update hookfunction for
        log window

ChangeLog.claws
configure.in
src/folderview.c
src/logwindow.c
src/statusbar.c
src/summaryview.c

index c0b9330..17eb812 100644 (file)
@@ -1,3 +1,13 @@
+2002-12-08 [christoph] 0.8.6claws79
+
+       * src/folderview.c
+       * src/logwindow.c
+       * src/statusbar.c
+       * src/summaryview.c
+               only abort hook invokation if required data is missing not
+               if our own data pointer is NULL, update hookfunction for
+               log window
+
 2002-12-08 [paul]      0.8.6claws78
 
        * src/about.c
index da2f467..1f47cdd 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws78
+EXTRA_VERSION=claws79
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 590ae6d..b4f97d9 100644 (file)
@@ -1270,7 +1270,7 @@ gboolean folderview_update_item(gpointer source, gpointer data)
 
        g_return_val_if_fail(update_info != NULL, TRUE);
        g_return_val_if_fail(update_info->item != NULL, TRUE);
-       g_return_val_if_fail(folderview != NULL, TRUE);
+       g_return_val_if_fail(folderview != NULL, FALSE);
 
        ctree = GTK_CTREE(folderview->ctree);
 
index 47875db..1d84560 100644 (file)
 #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_append (gpointer        source,
-                        gpointer        data);
-void log_window_clear  (GtkWidget      *text);
+static void hide_cb                    (GtkWidget      *widget,
+                                        LogWindow      *logwin);
+static void key_pressed                        (GtkWidget      *widget,
+                                        GdkEventKey    *event,
+                                        LogWindow      *logwin);
+static gboolean log_window_append      (gpointer        source,
+                                        gpointer        data);
+void log_window_clear                  (GtkWidget      *text);
 
 LogWindow *log_window_create(void)
 {
@@ -135,7 +135,7 @@ void log_window_show(LogWindow *logwin)
        gtk_widget_show(logwin->window);
 }
 
-void log_window_append(gpointer source, gpointer data)
+static gboolean log_window_append(gpointer source, gpointer data)
 {
        LogText *logtext = (LogText *) source;
        LogWindow *logwindow = (LogWindow *) data;
@@ -143,12 +143,12 @@ void log_window_append(gpointer source, gpointer data)
        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);
+       g_return_val_if_fail(logtext != NULL, TRUE);
+       g_return_val_if_fail(logtext->text != NULL, TRUE);
+       g_return_val_if_fail(logwindow != NULL, FALSE);
 
        if (prefs_common.cliplog && !prefs_common.loglength)
-               return;
+               return FALSE;
 
        text = GTK_TEXT(logwindow->text);
 
@@ -173,6 +173,8 @@ void log_window_append(gpointer source, gpointer data)
        gtk_text_insert(text, NULL, color, NULL, logtext->text, -1);
        if (prefs_common.cliplog)
               log_window_clear (GTK_WIDGET (text));
+
+       return FALSE;
 }
 
 static void hide_cb(GtkWidget *widget, LogWindow *logwin)
index 7f4cc8e..f91868e 100644 (file)
@@ -55,7 +55,8 @@ gboolean statusbar_puts_all_hook (gpointer source, gpointer data)
 {
        LogText *logtext = (LogText *) source;
 
-       g_return_val_if_fail(logtext != NULL, NULL);
+       g_return_val_if_fail(logtext != NULL, TRUE);
+       g_return_val_if_fail(logtext->text != NULL, TRUE);
 
        statusbar_puts_all(logtext->text);
 
index 9a2e7b6..3892a8d 100644 (file)
@@ -5422,7 +5422,7 @@ static gboolean summary_update_msg(gpointer source, gpointer data) {
        GtkCTreeNode *node;
 
        g_return_val_if_fail(msginfo_update != NULL, TRUE);
-       g_return_val_if_fail(summaryview != NULL, TRUE);
+       g_return_val_if_fail(summaryview != NULL, FALSE);
 
        node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);