2007-10-09 [iwkse] 3.0.2cvs43
authorSalvatore De Paolis <iwkse@claws-mail.org>
Tue, 9 Oct 2007 13:24:13 +0000 (13:24 +0000)
committerSalvatore De Paolis <iwkse@claws-mail.org>
Tue, 9 Oct 2007 13:24:13 +0000 (13:24 +0000)
* src/gtk/about.c
center the about window

ChangeLog
PATCHSETS
configure.ac
src/gtk/about.c

index b3884aae0406e412225139a03c8e20194ed92c60..6994839cbdfba69c1786fda7f2eb5d3710212175 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,21 @@
+2007-10-09 [iwkse]     3.0.2cvs43
+
+       * src/gtk/about.c
+               center the about window
+
+<<<<<<< ChangeLog
+2007-10-09 [iwkse]     3.0.2cvs42
+
+       * src/gtk/about.c
+               center the about window
+
+=======
 2007-10-09 [paul]      3.0.2cvs42
 
        * src/prefs_toolbar.c
                fix icon selector window on maemo
 
+>>>>>>> 1.396.2.2087
 2007-10-09 [paul]      3.0.2cvs41
 
        * src/messageview.c
index d60fe64250511f1dd358936e8b9d77dd4d0c5f11..a4d28cfacc3c75149f672ae33b27ace1a0e925e8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.60.2.100 -r 1.60.2.101 src/addressbook.c;  cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/addritem.c;  cvs diff -u -r 1.12.2.11 -r 1.12.2.12 src/addritem.h;  cvs diff -u -r 1.14.2.29 -r 1.14.2.30 src/editaddress.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/editaddress_other_attributes_ldap.h;  cvs diff -u -r 1.22.2.17 -r 1.22.2.18 src/addrbook.c;  cvs diff -u -r 1.155.2.77 -r 1.155.2.78 src/Makefile.am;  ) > 3.0.2cvs39.patchset
 ( cvs diff -u -r 1.9.2.42 -r 1.9.2.43 src/common/defs.h;  ) > 3.0.2cvs40.patchset
 ( cvs diff -u -r 1.94.2.154 -r 1.94.2.155 src/messageview.c;  ) > 3.0.2cvs41.patchset
+<<<<<<< PATCHSETS
+( cvs diff -u -r 1.4.2.52 -r 1.4.2.53 src/gtk/about.c;  ) > 3.0.2cvs42.patchset
+=======
 ( cvs diff -u -r 1.30.2.44 -r 1.30.2.45 src/prefs_toolbar.c;  ) > 3.0.2cvs42.patchset
+>>>>>>> 1.1.2.2966
+( cvs diff -u -r 1.4.2.52 -r 1.4.2.53 src/gtk/about.c;  ) > 3.0.2cvs43.patchset
index eb01455b9e0a91b7241e2112d6511f5ef68b0e29..37fa6b2507c525d173fa1e10edfb39519951612b 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=42
+EXTRA_VERSION=43
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index fee146813316961125c4f517a1385c58e029fd0e..907a3b6b019132553e86d42227245a8d749e874b 100644 (file)
@@ -87,8 +87,9 @@ void about_show(void)
 {
        if (!window)
                about_create();
-       else
+       else 
                gtk_window_present(GTK_WINDOW(window));
+       
 }
 
 static GtkWidget *about_create_child_page_info(void)
@@ -671,6 +672,7 @@ static void about_create(void)
        static GdkGeometry geometry;
 
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "about");
+       gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER_ALWAYS);
        gtk_window_set_title(GTK_WINDOW(window), _("About Claws Mail"));
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
        gtk_widget_set_size_request(window, -1, -1);