applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

region: Remove other uses of gtk_dialog_run()

Browse source
This commit is contained in:
Bastien Nocera 2011-01-24 12:30:59 +00:00
parent 0dd5a8ac18
commit f70af6ee47
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
panels/region/gnome-region-panel-xkbltadd.c
View file

@ -404,6 +404,7 @@ xkb_layout_chooser_response (GtkDialog * dialog,
gtk_window_get_size (GTK_WINDOW (dialog), &rect.width, gtk_window_get_size (GTK_WINDOW (dialog), &rect.width,
&rect.height); &rect.height);
gkbd_preview_save_position (&rect); gkbd_preview_save_position (&rect);
gtk_widget_destroy (GTK_WIDGET (dialog));
} }
void void
@ -505,8 +506,7 @@ xkb_layout_choose (GtkBuilder * dialog)
} }
xkb_layout_preview_update (chooser_dialog); xkb_layout_preview_update (chooser_dialog);
gtk_dialog_run (GTK_DIALOG (chooser)); gtk_widget_show (chooser);
gtk_widget_destroy (chooser);
} }
gchar * gchar *

16
panels/region/gnome-region-panel-xkbmc.c
View file

@ -299,18 +299,19 @@ xkb_model_chooser_response (GtkDialog * dialog,
g_free (model_name); g_free (model_name);
} }
} }
gtk_widget_destroy (GTK_WIDGET (dialog));
} }
void void
choose_model (GtkBuilder * dialog) choose_model (GtkBuilder * dialog)
{ {
GtkBuilder *chooser_dialog; GtkBuilder *chooser_dialog;
GtkWidget *chooser; GtkWidget *chooser;
chooser_dialog = gtk_builder_new (); chooser_dialog = gtk_builder_new ();
gtk_builder_add_from_file (chooser_dialog, GNOMECC_UI_DIR gtk_builder_add_from_file (chooser_dialog, GNOMECC_UI_DIR
"/gnome-region-panel-model-chooser.ui", "/gnome-region-panel-model-chooser.ui",
NULL); NULL);
chooser = CWID ("xkb_model_chooser"); chooser = CWID ("xkb_model_chooser");
gtk_window_set_transient_for (GTK_WINDOW (chooser), gtk_window_set_transient_for (GTK_WINDOW (chooser),
GTK_WINDOW (WID GTK_WINDOW (WID
@ -331,7 +332,6 @@ choose_model (GtkBuilder * dialog)
"response", "response",
G_CALLBACK (xkb_model_chooser_response), G_CALLBACK (xkb_model_chooser_response),
chooser_dialog); chooser_dialog);
gtk_dialog_run (GTK_DIALOG (chooser)); gtk_widget_show (chooser);
gtk_widget_destroy (chooser);
g_free (current_model_name); g_free (current_model_name);
} }