diff options
| author | Marcus Lundblad <malu@pidgin.im> | 2010-08-31 18:28:10 +0000 |
|---|---|---|
| committer | Marcus Lundblad <malu@pidgin.im> | 2010-08-31 18:28:10 +0000 |
| commit | 5fc609e8fed5539079413d29fa6c23167e9cc718 (patch) | |
| tree | 09fe88b7b9c8ad75a3980b876ca970adc0d458f3 /pidgin/gtksession.c | |
| parent | 24f0a2f2edff9c48f57dd3607ad17b709470a1ff (diff) | |
| parent | d96df2d0de45a2b4b0dc5e0dfddb2e13b3c8bb44 (diff) | |
| download | pidgin-5fc609e8fed5539079413d29fa6c23167e9cc718.tar.gz | |
propagate from branch 'im.pidgin.pidgin' (head f9599fe0199c86262cea569a5dfb4081df23691d)cpw.malu.xmpp.google_refactor
to branch 'im.pidgin.cpw.malu.xmpp.google_refactor' (head 93935229617363d8fdaf50a9a350c93f0987f66c)
Diffstat (limited to 'pidgin/gtksession.c')
| -rw-r--r-- | pidgin/gtksession.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pidgin/gtksession.c b/pidgin/gtksession.c index 4d088d0f35..a972865c76 100644 --- a/pidgin/gtksession.c +++ b/pidgin/gtksession.c @@ -166,7 +166,7 @@ static gchar **session_make_command(gchar *client_id, gchar *config_dir) { ret[j++] = g_strdup("--display"); ret[j++] = g_strdup((gchar *)gdk_display_get_name(gdk_display_get_default())); - ret[j++] = NULL; + ret[j] = NULL; return ret; } @@ -346,7 +346,7 @@ pidgin_session_init(gchar *argv0, gchar *previous_id, gchar *config_dir) purple_debug(PURPLE_DEBUG_INFO, "Session Management", "Connected to manager (%s) with client ID %s\n", tmp, client_id); - g_free(tmp); + free(tmp); session_managed = TRUE; gdk_set_sm_client_id(client_id); |