pidgin/gtkprefs.c

branch
next.minor
changeset 22006
723c56414c2f
parent 21777
0662651f6902
parent 22005
0183020ba2cc
child 22008
f9c24e25b08f
equal deleted inserted replaced
21784:f3baacdf1de8 22006:723c56414c2f
2145 } 2145 }
2146 2146
2147 void pidgin_prefs_show(void) 2147 void pidgin_prefs_show(void)
2148 { 2148 {
2149 GtkWidget *vbox; 2149 GtkWidget *vbox;
2150 GtkWidget *bbox;
2151 GtkWidget *notebook; 2150 GtkWidget *notebook;
2152 GtkWidget *button; 2151 GtkWidget *button;
2153 2152
2154 if (prefs) { 2153 if (prefs) {
2155 gtk_window_present(GTK_WINDOW(prefs)); 2154 gtk_window_present(GTK_WINDOW(prefs));
2161 /* (that should have been "effect," right?) */ 2160 /* (that should have been "effect," right?) */
2162 2161
2163 /* Back to instant-apply! I win! BU-HAHAHA! */ 2162 /* Back to instant-apply! I win! BU-HAHAHA! */
2164 2163
2165 /* Create the window */ 2164 /* Create the window */
2166 prefs = pidgin_create_window(_("Preferences"), PIDGIN_HIG_BORDER, "preferences", FALSE); 2165 prefs = pidgin_create_dialog(_("Preferences"), PIDGIN_HIG_BORDER, "preferences", FALSE);
2167 g_signal_connect(G_OBJECT(prefs), "destroy", 2166 g_signal_connect(G_OBJECT(prefs), "destroy",
2168 G_CALLBACK(delete_prefs), NULL); 2167 G_CALLBACK(delete_prefs), NULL);
2169 2168
2170 vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); 2169 vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(prefs), FALSE, PIDGIN_HIG_BORDER);
2171 gtk_container_add(GTK_CONTAINER(prefs), vbox);
2172 gtk_widget_show(vbox);
2173 2170
2174 /* The notebook */ 2171 /* The notebook */
2175 prefsnotebook = notebook = gtk_notebook_new (); 2172 prefsnotebook = notebook = gtk_notebook_new ();
2176 gtk_box_pack_start (GTK_BOX (vbox), notebook, FALSE, FALSE, 0); 2173 gtk_box_pack_start (GTK_BOX (vbox), notebook, FALSE, FALSE, 0);
2177 gtk_widget_show(prefsnotebook); 2174 gtk_widget_show(prefsnotebook);
2178 2175
2179 /* The buttons to press! */ 2176 button = pidgin_dialog_add_button(GTK_DIALOG(prefs), GTK_STOCK_CLOSE, NULL, NULL);
2180 bbox = gtk_hbutton_box_new();
2181 gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
2182 gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
2183 gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
2184 gtk_widget_show (bbox);
2185
2186 button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
2187 g_signal_connect_swapped(G_OBJECT(button), "clicked", 2177 g_signal_connect_swapped(G_OBJECT(button), "clicked",
2188 G_CALLBACK(gtk_widget_destroy), prefs); 2178 G_CALLBACK(gtk_widget_destroy), prefs);
2189 gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
2190 gtk_widget_show(button);
2191 2179
2192 prefs_notebook_init(); 2180 prefs_notebook_init();
2193 2181
2194 /* Show everything. */ 2182 /* Show everything. */
2195 gtk_widget_show(prefs); 2183 gtk_widget_show(prefs);

mercurial