sync with 0.9.8cvs5

diff --git a/ChangeLog b/ChangeLog
index 4c959b2d1956cdad43073b9d16966dcfbe578054..c39750053f594e1cbc72d2ff2fe2c31f06f01696 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-22
+
+       * src/mainwindow.c: fixed automatic expansion of window size because
+         of toolbar.
+
+2004-01-21
+
+       * src/addr_compl.[ch]
+         src/gtkshruler.[ch]: changed the copyright notice.
+

 2004-01-20
 
        * src/gtkstext.c: find_line_params(): also break between mutlibyte
 2004-01-20
 
        * src/gtkstext.c: find_line_params(): also break between mutlibyte

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d155a76df32db7c0b4d707084beb1d9aec91d7c8..2270a80754509a0f8bbf858c9d9e1eea28b7c6a3 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-01-23 [paul]      0.9.8.claws44
+
+       * sync with 0.9.8cvs5
+               see ChangeLog 2004-01-22
+

 2004-01-23 [alfons]    0.9.8claws43
 
        * src/procmsg.c
 2004-01-23 [alfons]    0.9.8claws43
 
        * src/procmsg.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 34e33831db9e41942b72416d414e4ef982d97fea..6f93dc1ec82a6264581fd5fff656a513deae25ee 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,13 @@
+2004-01-22
+
+       * src/mainwindow.c: ¥Ä¡¼¥ë¥Ð¡¼¤Ë¤è¤Ã¤Æ¥¦¥£¥ó¥É¥¦¥µ¥¤¥º¤¬¼«Æ°Åª¤Ë
+         ¿­Ä¹¤·¤Æ¤·¤Þ¤¦¤Î¤ò½¤Àµ¡£
+
+2004-01-21
+
+       * src/addr_compl.[ch]
+         src/gtkshruler.[ch]: Ãøºî¸¢É½¼¨¤òÊѹ¹¡£
+

 2004-01-20
 
        * src/gtkstext.c: find_line_params(): ¥Þ¥ë¥Á¥Ð¥¤¥È¤È¥·¥ó¥°¥ë¥Ð¥¤¥È
 2004-01-20
 
        * src/gtkstext.c: find_line_params(): ¥Þ¥ë¥Á¥Ð¥¤¥È¤È¥·¥ó¥°¥ë¥Ð¥¤¥È

diff --git a/configure.ac b/configure.ac
index 42b478d8a276aafac80a57b6947a00af65b2ebd1..044991ed17974e63b1fb05c49bd1ae688f62fd07 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=43
+EXTRA_VERSION=44

 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 836babe04a86eea94b3b5e6cae4ebdeade5c8c41..b4b9d49c2022147c621ca989385bb2fc72dde4f5 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -109,6 +109,14 @@ static void toolbar_account_button_pressed (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
 #endif
                                                 GdkEventButton *event,
                                                 gpointer        data);
 #endif

+
+static void toolbar_child_attached             (GtkWidget      *widget,
+                                                GtkWidget      *child,
+                                                gpointer        data);
+static void toolbar_child_detached             (GtkWidget      *widget,
+                                                GtkWidget      *child,
+                                                gpointer        data);
+

 static void ac_label_button_pressed            (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
 static void ac_label_button_pressed            (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);


@@ -823,6 +831,10 @@ MainWindow *main_window_create(SeparateType type)
        handlebox = gtk_handle_box_new();
        gtk_widget_show(handlebox);
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
        handlebox = gtk_handle_box_new();
        gtk_widget_show(handlebox);
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);

+       gtk_signal_connect(GTK_OBJECT(handlebox), "child_attached",
+                          GTK_SIGNAL_FUNC(toolbar_child_attached), mainwin);
+       gtk_signal_connect(GTK_OBJECT(handlebox), "child_detached",
+                          GTK_SIGNAL_FUNC(toolbar_child_detached), mainwin);

 
        /* link window to mainwin->window to avoid gdk warnings */
        mainwin->window       = window;
 
        /* link window to mainwin->window to avoid gdk warnings */
        mainwin->window       = window;


@@ -2146,6 +2158,18 @@ static void toolbar_account_button_pressed(GtkWidget *widget,
 }
 #endif
 
 }
 #endif
 

+static void toolbar_child_attached(GtkWidget *widget, GtkWidget *child,
+                                  gpointer data)
+{
+       gtk_widget_set_usize(child, 1, -1);
+}
+
+static void toolbar_child_detached(GtkWidget *widget, GtkWidget *child,
+                                  gpointer data)
+{
+       gtk_widget_set_usize(child, -1, -1);
+}
+

 static void ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
                                    gpointer data)
 {
 static void ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
                                    gpointer data)
 {

diff --git a/src/toolbar.c b/src/toolbar.c
index 35dd21481cb7b1648d7905a89c22a56749d42e94..89729f1f0559f99aa40ae8e4e23a62d62a81aa98 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -774,6 +774,8 @@ void toolbar_set_style(GtkWidget *toolbar_wid, GtkWidget *handlebox_wid, guint a
        }
 
        prefs_common.toolbar_style = (ToolbarStyle)action;
        }
 
        prefs_common.toolbar_style = (ToolbarStyle)action;

+       gtk_widget_set_usize(handlebox_wid, 1, -1);
+       

        if (prefs_common.toolbar_style != TOOLBAR_NONE) {
                gtk_widget_show(handlebox_wid);
                gtk_widget_queue_resize(handlebox_wid);
        if (prefs_common.toolbar_style != TOOLBAR_NONE) {
                gtk_widget_show(handlebox_wid);
                gtk_widget_queue_resize(handlebox_wid);