brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome-shell-calendar-server: Initialize GTK+

Browse Source 
If evolution-data-server needs to prompt for a password, it will try
to pop up a GTK+ dialog. When GTK+ is not initialized, the result is
a crash. So, initialize GTK+ and run a main loop.

See https://bugzilla.redhat.com/show_bug.cgi?id=809681

The result is ugly since we have a Gnome-shell-calendar-server fallback
application, but I don't think it's worth installing a desktop file
and having a string break, since this is pretty uncommon (only for
manually added calendars without the password stored in gnome-keyring),
and apparently this is being rewritten for 3.5 to have the dialogs come
the e-d-s daemon rather than from the individual application.

https://bugzilla.gnome.org/show_bug.cgi?id=673608
This commit is contained in:
Owen W. Taylor 2012-04-05 17:17:35 -04:00
parent 2daa98a694
commit 6099a5dbc3
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calendar-server/gnome-shell-calendar-server.c
View File

@ -70,7 +70,6 @@ static GDBusNodeInfo *introspection_data = NULL;
struct _App; struct _App;
typedef struct _App App; typedef struct _App App;
static GMainLoop *loop = NULL;
static gboolean opt_replace = FALSE; static gboolean opt_replace = FALSE;
static GOptionEntry opt_entries[] = { static GOptionEntry opt_entries[] = {
{"replace", 0, 0, G_OPTION_ARG_NONE, &opt_replace, "Replace existing daemon", NULL}, {"replace", 0, 0, G_OPTION_ARG_NONE, &opt_replace, "Replace existing daemon", NULL},
@ -970,7 +969,7 @@ on_name_lost (GDBusConnection *connection,
{ {
g_print ("gnome-shell-calendar-server[%d]: Lost (or failed to acquire) the name " BUS_NAME " - exiting\n", g_print ("gnome-shell-calendar-server[%d]: Lost (or failed to acquire) the name " BUS_NAME " - exiting\n",
(gint) getpid ()); (gint) getpid ());
g_main_loop_quit (loop); gtk_main_quit ();
} }
static void static void
@ -990,7 +989,7 @@ stdin_channel_io_func (GIOChannel *source,
{ {
g_debug ("gnome-shell-calendar-server[%d]: Got HUP on stdin - exiting\n", g_debug ("gnome-shell-calendar-server[%d]: Got HUP on stdin - exiting\n",
(gint) getpid ()); (gint) getpid ());
g_main_loop_quit (loop); gtk_main_quit ();
} }
else else
{ {
@ -1010,12 +1009,13 @@ main (int argc,
GIOChannel *stdin_channel; GIOChannel *stdin_channel;
ret = 1; ret = 1;
loop = NULL;
opt_context = NULL; opt_context = NULL;
name_owner_id = 0; name_owner_id = 0;
stdin_channel = NULL; stdin_channel = NULL;
g_type_init (); /* We need to initialize GTK+ since evolution-data-server may decide to use
* GTK+ to pop up a dialog box */
gtk_init (&argc, &argv);
introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL); introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
g_assert (introspection_data != NULL); g_assert (introspection_data != NULL);
@ -1036,8 +1036,6 @@ main (int argc,
stdin_channel_io_func, stdin_channel_io_func,
NULL); NULL);
loop = g_main_loop_new (NULL, FALSE);
name_owner_id = g_bus_own_name (G_BUS_TYPE_SESSION, name_owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
BUS_NAME, BUS_NAME,
G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT | G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
@ -1048,7 +1046,7 @@ main (int argc,
NULL, NULL,
NULL); NULL);
g_main_loop_run (loop); gtk_main ();
ret = 0; ret = 0;
@ -1059,8 +1057,6 @@ main (int argc,
app_free (_global_app); app_free (_global_app);
if (name_owner_id != 0) if (name_owner_id != 0)
g_bus_unown_name (name_owner_id); g_bus_unown_name (name_owner_id);
if (loop != NULL)
g_main_loop_unref (loop);
if (opt_context != NULL) if (opt_context != NULL)
g_option_context_free (opt_context); g_option_context_free (opt_context);
return ret; return ret;