remove gtk_window_set_wmclass()

[claws.git] / src / gtk / prefswindow.c

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index 13e706a5a5f2d3d43a1f6f353c488bade09ae68f..6da71e2556691d4a8e6c593aa547d809aed37b2e 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -83,7 +83,6 @@ static gboolean ctree_select_row(GtkCTree *ctree, GList *node, gint column, gpoi
 
        if (!page->page_open) {
                page->create_widget(page, GTK_WINDOW(prefswindow->window), prefswindow->data);
-               gtk_widget_show_all(page->widget);
                gtk_container_add(GTK_CONTAINER(prefswindow->notebook), page->widget);
                page->page_open = TRUE;
        }
@@ -222,9 +221,9 @@ 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_policy (GTK_WINDOW(prefswindow->window), FALSE, TRUE, FALSE);
+       gtk_window_set_resizable (GTK_WINDOW(prefswindow->window), TRUE);
        gtk_container_set_border_width(GTK_CONTAINER(prefswindow->window), 4);
 
        prefswindow->table1 = gtk_table_new(2, 2, FALSE);
@@ -302,7 +301,8 @@ void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
                                curnode->treeweight = page->weight;
                }
        }
-       gtk_signal_connect(GTK_OBJECT(prefswindow->ctree), "tree-select-row", GTK_SIGNAL_FUNC(ctree_select_row), prefswindow);
+       g_signal_connect(G_OBJECT(prefswindow->ctree), "tree-select-row", 
+                        G_CALLBACK(ctree_select_row), prefswindow);
 
        gtk_clist_set_selection_mode(GTK_CLIST(prefswindow->ctree), GTK_SELECTION_BROWSE);
        gtk_clist_column_titles_passive(GTK_CLIST(prefswindow->ctree));
@@ -322,10 +322,14 @@ void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data)
 
        gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->confirm_area, 0, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 2);
 
-       gtk_signal_connect(GTK_OBJECT(prefswindow->ok_btn), "released", GTK_SIGNAL_FUNC(ok_button_released), prefswindow);
-       gtk_signal_connect(GTK_OBJECT(prefswindow->cancel_btn), "released", GTK_SIGNAL_FUNC(cancel_button_released), prefswindow);
-       gtk_signal_connect(GTK_OBJECT(prefswindow->apply_btn), "released", GTK_SIGNAL_FUNC(apply_button_released), prefswindow);
-       gtk_signal_connect(GTK_OBJECT(prefswindow->window), "delete_event", GTK_SIGNAL_FUNC(window_closed), prefswindow);
+       g_signal_connect(G_OBJECT(prefswindow->ok_btn), "released", 
+                        G_CALLBACK(ok_button_released), prefswindow);
+       g_signal_connect(G_OBJECT(prefswindow->cancel_btn), "released", 
+                        G_CALLBACK(cancel_button_released), prefswindow);
+       g_signal_connect(G_OBJECT(prefswindow->apply_btn), "released", 
+                        G_CALLBACK(apply_button_released), prefswindow);
+       g_signal_connect(G_OBJECT(prefswindow->window), "delete_event", 
+                        G_CALLBACK(window_closed), prefswindow);
 
        gtk_widget_show_all(prefswindow->window);
 }