callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkApplication: Rename a member for clarity

Browse Source 
'session' is a bit ambiguous (and GtkApplication may grow session
management support at some point), so rename the bus connection
to 'session_bus'.
This commit is contained in:
Matthias Clasen 2012-01-03 14:39:26 -05:00
parent c74ac08143
commit 7df5cf2a3a
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkapplication.c
View File

@ -115,7 +115,7 @@ struct _GtkApplicationPrivate
GList *windows; GList *windows;
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
GDBusConnection *session; GDBusConnection *session_bus;
gchar *window_prefix; gchar *window_prefix;
guint next_id; guint next_id;
#endif #endif
@ -131,7 +131,7 @@ static void
gtk_application_window_added_x11 (GtkApplication *application, gtk_application_window_added_x11 (GtkApplication *application,
GtkWindow *window) GtkWindow *window)
{ {
if (application->priv->session == NULL) if (application->priv->session_bus == NULL)
return; return;
if (GTK_IS_APPLICATION_WINDOW (window)) if (GTK_IS_APPLICATION_WINDOW (window))
@ -151,7 +151,7 @@ gtk_application_window_added_x11 (GtkApplication *application,
window_id = application->priv->next_id++; window_id = application->priv->next_id++;
window_path = g_strdup_printf ("%s%d", application->priv->window_prefix, window_id); window_path = g_strdup_printf ("%s%d", application->priv->window_prefix, window_id);
success = gtk_application_window_publish (app_window, application->priv->session, window_path); success = gtk_application_window_publish (app_window, application->priv->session_bus, window_path);
g_free (window_path); g_free (window_path);
} }
while (!success); while (!success);
@ -162,7 +162,7 @@ static void
gtk_application_window_removed_x11 (GtkApplication *application, gtk_application_window_removed_x11 (GtkApplication *application,
GtkWindow *window) GtkWindow *window)
{ {
if (application->priv->session == NULL) if (application->priv->session_bus == NULL)
return; return;
if (GTK_IS_APPLICATION_WINDOW (window)) if (GTK_IS_APPLICATION_WINDOW (window))
@ -193,7 +193,7 @@ gtk_application_startup_x11 (GtkApplication *application)
const gchar *application_id; const gchar *application_id;
application_id = g_application_get_application_id (G_APPLICATION (application)); application_id = g_application_get_application_id (G_APPLICATION (application));
application->priv->session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL); application->priv->session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
application->priv->window_prefix = window_prefix_from_appid (application_id); application->priv->window_prefix = window_prefix_from_appid (application_id);
} }
@ -202,11 +202,7 @@ gtk_application_shutdown_x11 (GtkApplication *application)
{ {
g_free (application->priv->window_prefix); g_free (application->priv->window_prefix);
application->priv->window_prefix = NULL; application->priv->window_prefix = NULL;
if (application->priv->session) g_clear_object (&application->priv->session_bus);
{
g_object_unref (application->priv->session);
application->priv->session = NULL;
}
} }
#endif #endif