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

fix some reference leaks and don't segfault if the glade file is not

Browse source 
2007-02-08  Jens Granseuer  <jensgr@gmx.net>

	* main.c: (create_dialog), (main): fix some reference leaks and don't
	segfault if the glade file is not available

svn path=/trunk/; revision=7264
This commit is contained in:
Jens Granseuer 2007-02-08 19:45:59 +00:00 • committed by Jens Granseuer
parent a9b2d9ed9f
commit c76a7cc349
2 changed files with 35 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
capplets/accessibility/at-properties/ChangeLog
View file

@ -1,3 +1,8 @@
2007-02-08 Jens Granseuer <jensgr@gmx.net>
* main.c: (create_dialog), (main): fix some reference leaks and don't
segfault if the glade file is not available
2006-08-07 Willie Walker <william.walker@sun.com>
Fixes #348630

51
capplets/accessibility/at-properties/main.c
View file

@ -72,18 +72,20 @@ static GladeXML *
create_dialog (void)
{
GladeXML *dialog;
dialog = glade_xml_new (GLADEDIR "/at-enable-dialog.glade", "at_properties_dialog", NULL);
gtk_image_set_from_stock (GTK_IMAGE (WID ("at_close_and_logout_image")),
GTK_STOCK_QUIT, GTK_ICON_SIZE_BUTTON);
gtk_image_set_from_file (GTK_IMAGE (WID ("at_enable_image")),
PIXMAPDIR "/at-support.png");
gtk_image_set_from_file (GTK_IMAGE (WID ("at_applications_image")),
PIXMAPDIR "/at-startup.png");
if (dialog) {
gtk_image_set_from_stock (GTK_IMAGE (WID ("at_close_and_logout_image")),
GTK_STOCK_QUIT, GTK_ICON_SIZE_BUTTON);
gtk_image_set_from_file (GTK_IMAGE (WID ("at_enable_image")),
PIXMAPDIR "/at-support.png");
gtk_image_set_from_file (GTK_IMAGE (WID ("at_applications_image")),
PIXMAPDIR "/at-startup.png");
}
return dialog;
}
@ -271,26 +273,33 @@ setup_dialog (GladeXML *dialog)
int
main (int argc, char *argv[])
{
GnomeProgram *program;
GladeXML *dialog;
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
gnome_program_init ("gnome-at-properties", VERSION,
LIBGNOMEUI_MODULE, argc, argv,
GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
NULL);
program = gnome_program_init ("gnome-at-properties", VERSION,
LIBGNOMEUI_MODULE, argc, argv,
GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
NULL);
activate_settings_daemon ();
dialog = create_dialog ();
init_startup_state (dialog);
setup_dialog (dialog);
gtk_main ();
if (dialog) {
init_startup_state (dialog);
setup_dialog (dialog);
gtk_main ();
g_object_unref (dialog);
}
g_object_unref (program);
return 0;
}