remove gtk_window_set_wmclass()

replace gtk_window-position

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 6497759..f8c5b7f 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,23 @@
+2004-07-28 [paul]      0.9.12cvs37.4
+
+       * src/addressbook.c
+       * src/compose.c
+       * src/foldersel.c
+       * src/mainwindow.c
+       * src/messageview.c
+       * src/sourcewindow.c
+       * src/gtk/logwindow.c
+               remove gtk_window_set_wmclass()
+               
+       * src/prefs_filtering.c
+       * src/prefs_filtering_action.c
+       * src/prefs_fonts.c
+       * src/prefs_gtk.c
+       * src/prefs_matcher.c
+       * src/ssl_manager.c
+       * src/gtk/prefswindow.c
+               replace gtk_window_position()
+
 2004-07-28 [colin]     0.9.12cvs37.3
 
        * src/alertpanel.c

diff --git a/PATCHSETS b/PATCHSETS
index fc8e230..9d2d233 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -86,3 +86,4 @@
 ( cvs diff -u -r 1.16.2.7 -r 1.16.2.8 src/msgcache.c; ) > 0.9.12cvs37.1.patchset
 ( cvs diff -u -r 1.27.2.6 -r 1.27.2.7 src/addr_compl.c; cvs diff -u -r 1.60.2.5 -r 1.60.2.6 src/addressbook.c; cvs diff -u -r 1.17.2.5 -r 1.17.2.6 src/alertpanel.c; cvs diff -u -r 1.382.2.35 -r 1.382.2.36 src/compose.c; cvs diff -u -r 1.8.2.2 -r 1.8.2.3 src/export.c; cvs diff -u -r 1.26.2.2 -r 1.26.2.3 src/foldersel.c; cvs diff -u -r 1.207.2.10 -r 1.207.2.11 src/folderview.c; cvs diff -u -r 1.14.2.4 -r 1.14.2.5 src/grouplistdialog.c; cvs diff -u -r 1.13.2.3 -r 1.13.2.4 src/import.c; cvs diff -u -r 1.274.2.13 -r 1.274.2.14 src/mainwindow.c; cvs diff -u -r 1.3.12.3 -r 1.3.12.4 src/message_search.c; cvs diff -u -r 1.94.2.23 -r 1.94.2.24 src/messageview.c; cvs diff -u -r 1.12.2.3 -r 1.12.2.4 src/passphrase.c; cvs diff -u -r 1.60.2.4 -r 1.60.2.5 src/prefs_actions.c; cvs diff -u -r 1.204.2.17 -r 1.204.2.18 src/prefs_common.c; cvs diff -u -r 1.16.2.2 -r 1.16.2.3 src/prefs_customheader.c; cvs diff -u -r 1.16.2.3 -r 1.16.2.4 src/prefs_display_header.c; cvs diff -u -r 1.59.2.6 -r 1.59.2.7 src/prefs_filtering.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/prefs_filtering_action.c; cvs diff -u -r 1.10.2.4 -r 1.10.2.5 src/prefs_gtk.c; cvs diff -u -r 1.43.2.6 -r 1.43.2.7 src/prefs_matcher.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_msg_colors.c; cvs diff -u -r 1.10.2.1 -r 1.10.2.2 src/prefs_summary_column.c; cvs diff -u -r 1.12.2.2 -r 1.12.2.3 src/prefs_template.c; cvs diff -u -r 1.9.2.4 -r 1.9.2.5 src/sourcewindow.c; cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/ssl_manager.c; cvs diff -u -r 1.15.2.5 -r 1.15.2.6 src/summary_search.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/colorsel.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/gtk/description_window.c; cvs diff -u -r 1.9.2.7 -r 1.9.2.8 src/gtk/gtkaspell.c; cvs diff -u -r 1.2.2.1 -r 1.2.2.2 src/gtk/inputdialog.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/gtk/logwindow.c; cvs diff -u -r 1.12.2.2 -r 1.12.2.3 src/gtk/prefswindow.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/gtk/progressdialog.c; ) > 0.9.12cvs37.2.patchset
 ( cvs diff -u -r 1.61.2.7 -r 1.61.2.8 src/account.c; cvs diff -u -r 1.60.2.6 -r 1.60.2.7 src/addressbook.c; cvs diff -u -r 1.17.2.6 -r 1.17.2.7 src/alertpanel.c; cvs diff -u -r 1.5.2.1 -r 1.5.2.2 src/alertpanel.h; cvs diff -u -r 1.382.2.36 -r 1.382.2.37 src/compose.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/expldifdlg.c; cvs diff -u -r 1.115.2.10 -r 1.115.2.11 src/main.c; cvs diff -u -r 1.94.2.24 -r 1.94.2.25 src/messageview.c; cvs diff -u -r 1.395.2.25 -r 1.395.2.26 src/summaryview.c; cvs diff -u -r 1.96.2.14 -r 1.96.2.15 src/textview.c; cvs diff -u -r 1.9.2.1 -r 1.9.2.2 src/gtk/sslcertwindow.c; ) > 0.9.12cvs37.3.patchset
+( cvs diff -u -r 1.60.2.7 -r 1.60.2.8 src/addressbook.c; cvs diff -u -r 1.382.2.37 -r 1.382.2.38 src/compose.c; cvs diff -u -r 1.26.2.3 -r 1.26.2.4 src/foldersel.c; cvs diff -u -r 1.274.2.14 -r 1.274.2.15 src/mainwindow.c; cvs diff -u -r 1.94.2.25 -r 1.94.2.26 src/messageview.c; cvs diff -u -r 1.59.2.7 -r 1.59.2.8 src/prefs_filtering.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/prefs_filtering_action.c; cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/prefs_fonts.c; cvs diff -u -r 1.10.2.5 -r 1.10.2.6 src/prefs_gtk.c; cvs diff -u -r 1.43.2.7 -r 1.43.2.8 src/prefs_matcher.c; cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/sourcewindow.c; cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/ssl_manager.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/logwindow.c; cvs diff -u -r 1.12.2.3 -r 1.12.2.4 src/gtk/prefswindow.c; ) > 0.9.12cvs37.4.patchset

diff --git a/configure.ac b/configure.ac
index 0a0e217..ec0fa7c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=37
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.3
+EXTRA_GTK2_VERSION=.4
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/addressbook.c b/src/addressbook.c
index 1f05f93..5ce8fca 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -648,7 +648,6 @@ static void addressbook_create(void)
        gtk_window_set_title(GTK_WINDOW(window), _("Address book"));
        gtk_widget_set_size_request(window, ADDRESSBOOK_WIDTH, ADDRESSBOOK_HEIGHT);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
-       gtk_window_set_wmclass(GTK_WINDOW(window), "addressbook", "Sylpheed");
        gtk_widget_realize(window);
 
        g_signal_connect(G_OBJECT(window), "delete_event",

diff --git a/src/compose.c b/src/compose.c
index fa88f08..3f9d36b 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -5134,7 +5134,6 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
        gtk_widget_set_size_request(window, -1, prefs_common.compose_height);
-       gtk_window_set_wmclass(GTK_WINDOW(window), "compose window", "Sylpheed");
 
        if (!geometry.max_width) {
                geometry.max_width = gdk_screen_width();

diff --git a/src/foldersel.c b/src/foldersel.c
index ecc0682..70ecb77 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -155,8 +155,6 @@ static void foldersel_create(void)
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
-       gtk_window_set_wmclass
-               (GTK_WINDOW(window), "folder_selection", "Sylpheed");
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(delete_event), NULL);
        g_signal_connect(G_OBJECT(window), "key_press_event",

diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c
index 277f810..a4f7fc0 100644 (file)
--- a/src/gtk/logwindow.c
+++ b/src/gtk/logwindow.c
@@ -61,7 +61,6 @@ LogWindow *log_window_create(void)
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), _("Protocol log"));
-       gtk_window_set_wmclass(GTK_WINDOW(window), "log_window", "Sylpheed");
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
        gtk_widget_set_size_request(window, 520, 400);
        g_signal_connect(G_OBJECT(window), "delete_event",

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index 885b317..6da71e2 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -221,7 +221,7 @@ void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
        prefswindow->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(prefswindow->window), title);
        gtk_window_set_default_size(GTK_WINDOW(prefswindow->window), 600, 340);
-       gtk_window_position (GTK_WINDOW(prefswindow->window), GTK_WIN_POS_CENTER);
+       gtk_window_set_position (GTK_WINDOW(prefswindow->window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal (GTK_WINDOW (prefswindow->window), TRUE);
        gtk_window_set_resizable (GTK_WINDOW(prefswindow->window), TRUE);
        gtk_container_set_border_width(GTK_CONTAINER(prefswindow->window), 4);

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 708bdbe..12ae40a 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -811,7 +811,6 @@ MainWindow *main_window_create(SeparateType type)
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
-       gtk_window_set_wmclass(GTK_WINDOW(window), "main_window", "Sylpheed");
 
        if (!geometry.min_height) {
                geometry.min_width = 320;
@@ -1958,8 +1957,6 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                folderwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
                gtk_window_set_title(GTK_WINDOW(folderwin),
                                     _("Sylpheed - Folder View"));
-               gtk_window_set_wmclass(GTK_WINDOW(folderwin),
-                                      "folder_view", "Sylpheed");
                gtk_window_set_resizable(GTK_WINDOW(folderwin), TRUE);
                gtk_window_move(GTK_WINDOW(folderwin), prefs_common.folderwin_x,
                                prefs_common.folderwin_y);
@@ -1978,8 +1975,6 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                messagewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
                gtk_window_set_title(GTK_WINDOW(messagewin),
                                     _("Sylpheed - Message View"));
-               gtk_window_set_wmclass(GTK_WINDOW(messagewin),
-                                      "message_view", "Sylpheed");
                gtk_window_set_resizable(GTK_WINDOW(messagewin), TRUE);
                gtk_window_move(GTK_WINDOW(messagewin), 
                                prefs_common.main_msgwin_x,

diff --git a/src/messageview.c b/src/messageview.c
index 7fc7114..4ae9bd7 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -411,7 +411,6 @@ MessageView *messageview_create_with_new_window(MainWindow *mainwin)
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), _("Sylpheed - Message View"));
-       gtk_window_set_wmclass(GTK_WINDOW(window), "message_view", "Sylpheed");
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
        gtk_widget_set_size_request(window, prefs_common.msgwin_width,
                                    prefs_common.msgwin_height);

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 159a0a3..d28a354 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -188,7 +188,7 @@ static void prefs_filtering_create(void)
 
        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-       gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+       gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal (GTK_WINDOW (window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
 

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index b8e7844..54e2c64 100644 (file)
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -267,7 +267,7 @@ static void prefs_filtering_action_create(void)
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-       gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+       gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 

diff --git a/src/prefs_fonts.c b/src/prefs_fonts.c
index 7947f2a..63e55e2 100644 (file)
--- a/src/prefs_fonts.c
+++ b/src/prefs_fonts.c
@@ -71,7 +71,7 @@ static void prefs_font_select(GtkButton *button, GtkEntry *entry)
        if (!font_sel_win) {
                font_sel_win = gtk_font_selection_dialog_new
                        (_("Font selection"));
-               gtk_window_position(GTK_WINDOW(font_sel_win),
+               gtk_window_set_position(GTK_WINDOW(font_sel_win),
                                    GTK_WIN_POS_CENTER);
                g_signal_connect(G_OBJECT(font_sel_win), "delete_event",
                                 G_CALLBACK(gtk_widget_hide_on_delete),

diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index db55d1f..98bc2cb 100644 (file)
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -468,7 +468,7 @@ void prefs_dialog_create(PrefsDialog *dialog)
 
        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-       gtk_window_position (GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+       gtk_window_set_position (GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal (GTK_WINDOW (window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index ef20092..3d98139 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -361,7 +361,7 @@ static void prefs_matcher_create(void)
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-       gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+       gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 

diff --git a/src/sourcewindow.c b/src/sourcewindow.c
index 8937632..4c8b1c6 100644 (file)
--- a/src/sourcewindow.c
+++ b/src/sourcewindow.c
@@ -61,7 +61,6 @@ SourceWindow *source_window_create(void)
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), _("Source of the message"));
-       gtk_window_set_wmclass(GTK_WINDOW(window), "source_window", "Sylpheed");
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
        gtk_widget_set_size_request(window, prefs_common.sourcewin_width,
                                    prefs_common.sourcewin_height);

diff --git a/src/ssl_manager.c b/src/ssl_manager.c
index 04afac4..3a9844e 100644 (file)
--- a/src/ssl_manager.c
+++ b/src/ssl_manager.c
@@ -81,7 +81,7 @@ void ssl_manager_create(void)
        gtk_window_set_title (GTK_WINDOW(window),
                              _("Saved SSL Certificates"));
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-       gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+       gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
        gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(ssl_manager_ok_cb), NULL);