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

application: Plug a leak

Browse Source 
The key returned by g_variant_iter_next() should be freed as well.

Also, clean up the coding style a bit.
This commit is contained in:
Emmanuele Bassi
2010-06-18 12:06:39 +01:00
parent 5f4309be96
commit 3e1b82336c
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtkapplication.c
View File

@ -71,6 +71,7 @@
enum
{
PROP_0,
PROP_WINDOW
};
@ -142,6 +143,8 @@ gtk_application_default_prepare_activation (GApplication *application,
if (strcmp (key, "startup-notification-id") == 0 &&
g_variant_is_of_type (value, G_VARIANT_TYPE_STRING))
gdk_notify_startup_complete_with_id (g_variant_get_string (value, NULL));
g_free (key);
g_variant_unref (value);
}
@ -152,25 +155,24 @@ static void
gtk_application_default_activated (GtkApplication *application,
GVariant *arguments)
{
GtkApplication *app = GTK_APPLICATION (application);
GtkApplicationPrivate *priv = application->priv;
/* TODO: should we raise the last focused window instead ? */
if (app->priv->default_window != NULL)
gtk_window_present (app->priv->default_window);
if (priv->default_window != NULL)
gtk_window_present (priv->default_window);
}
static void
gtk_application_default_action (GtkApplication *application,
const gchar *action_name)
{
GtkApplicationPrivate *priv = application->priv;
GtkAction *action;
action = gtk_action_group_get_action (application->priv->main_actions, action_name);
action = gtk_action_group_get_action (priv->main_actions, action_name);
if (action)
{
gtk_action_activate (action);
}
}
static GtkWindow *
gtk_application_default_create_window (GtkApplication *application)
@ -265,6 +267,7 @@ gtk_application_new (const gchar *appid,
argc_for_app = *argc;
else
argc_for_app = 0;
if (argv)
argv_for_app = *argv;
else
@ -278,7 +281,7 @@ gtk_application_new (const gchar *appid,
"application-id", appid,
"argv", argv_variant,
NULL);
if (!app)
if (app == NULL)
{
g_error ("%s", error->message);
g_clear_error (&error);
@ -326,6 +329,7 @@ gtk_application_set_action_group (GtkApplication *app,
GList *actions, *iter;
g_return_if_fail (GTK_IS_APPLICATION (app));
g_return_if_fail (GTK_IS_ACTION_GROUP (group));
g_return_if_fail (app->priv->main_actions == NULL);
app->priv->main_actions = g_object_ref (group);
@ -510,8 +514,7 @@ gtk_application_quit (GtkApplication *app)
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
g_variant_builder_add (&builder, "{sv}",
"timestamp",
g_variant_new ("u",
gtk_get_current_event_time ()));
g_variant_new ("u", gtk_get_current_event_time ()));
platform_data = g_variant_builder_end (&builder);
g_application_quit_with_data (G_APPLICATION (app), platform_data);