Commit fe71fa93 authored by Stefan Walter's avatar Stefan Walter

Check result of gtk_init_with_args(). Should fix bug #544352. Patch by

	* src/main.c:
	* daemon/seahorse-daemon.c: Check result of gtk_init_with_args().
	Should fix bug #544352. Patch by Christian Persch.

svn path=/trunk/; revision=2507
parent b15b3289
2008-09-14 Stef Walter <stef@memberwebs.com>
* src/main.c:
* daemon/seahorse-daemon.c: Check result of gtk_init_with_args().
Should fix bug #544352. Patch by Christian Persch.
2008-09-13 Stef Walter <stef@memberwebs.com>
* libcryptui/cryptui.c: Request a minimum width for the
......
......@@ -182,13 +182,22 @@ int main(int argc, char* argv[])
{
SeahorseOperation *op;
GOptionContext *octx = NULL;
GError *error = NULL;
g_thread_init (NULL);
seahorse_secure_memory_init ();
octx = g_option_context_new ("");
g_option_context_add_main_entries (octx, options, GETTEXT_PACKAGE);
gtk_init_with_args (&argc, &argv, _("Encryption Daemon (Seahorse)"), (GOptionEntry *) options, GETTEXT_PACKAGE, NULL);
if (!gtk_init_with_args (&argc, &argv, _("Encryption Daemon (Seahorse)"),
(GOptionEntry *)options, GETTEXT_PACKAGE, &error)) {
g_printerr ("seahorse-daemon: %s\n", error->message);
g_error_free (error);
exit (1);
}
/*
* All functions after this point have to print messages
......
......@@ -57,8 +57,11 @@ int
main (int argc, char **argv)
{
SeahorseOperation *op = NULL;
GError *error = NULL;
int ret = 0;
g_thread_init (NULL);
seahorse_secure_memory_init ();
#ifdef ENABLE_NLS
......@@ -67,7 +70,11 @@ main (int argc, char **argv)
textdomain (GETTEXT_PACKAGE);
#endif
gtk_init_with_args (&argc, &argv, _("Encryption Key Manager"), NULL, GETTEXT_PACKAGE, NULL);
if (!gtk_init_with_args (&argc, &argv, _("Encryption Key Manager"), NULL, GETTEXT_PACKAGE, &error)) {
g_printerr ("seahorse: %s\n", error->message);
g_error_free (error);
exit (1);
}
/* Insert Icons into Stock */
seahorse_gtkstock_init ();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment