[gnome-nettool/gnome-2-32] Fix memory leak #595139
- From: GermÃn Poà CaamaÃo <gpoo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-nettool/gnome-2-32] Fix memory leak #595139
- Date: Wed, 13 Jul 2011 08:50:03 +0000 (UTC)
commit 7a07056835e7d205df53882297f7dcbb56ad4700
Author: GermÃn PÃo-CaamaÃo <gpoo gnome org>
Date: Wed Jul 13 01:49:16 2011 -0700
Fix memory leak #595139
https://bugzilla.gnome.org/show_bug.cgi?id=595139
Signed-off-by: GermÃn PÃo-CaamaÃo <gpoo gnome org>
src/finger.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/src/finger.c b/src/finger.c
index eec1af2..e9f23cd 100644
--- a/src/finger.c
+++ b/src/finger.c
@@ -43,7 +43,6 @@ finger_do (Netinfo * netinfo)
const gchar *user = NULL;
gchar *command = NULL;
gchar *program = NULL;
- gchar *program_name = NULL;
GtkWidget *parent;
gchar **command_line;
@@ -60,8 +59,8 @@ finger_do (Netinfo * netinfo)
if (g_ascii_strcasecmp (user, "") != 0)
netinfo->stbar_text =
- g_strdup_printf (_("Getting information of %s on \"%s\""), user,
- g_ascii_strcasecmp (host, "") != 0 ? host : "localhost");
+ g_strdup_printf (_("Getting information of %s on \"%s\""), user,
+ g_ascii_strcasecmp (host, "") != 0 ? host : "localhost");
else
netinfo->stbar_text =
g_strdup_printf (_("Getting information of all users on \"%s\""),
@@ -82,11 +81,8 @@ finger_do (Netinfo * netinfo)
program = util_find_program_in_path ("finger", NULL);
- if (program != NULL) {
- program_name = g_strdup ("finger");
- } else {
- program = util_find_program_dialog ("pinky", parent);
- program_name = g_strdup ("pinky");
+ if (program == NULL) {
+ program = util_find_program_dialog ("pinky", NULL);
}
if (program != NULL) {
@@ -103,7 +99,7 @@ finger_do (Netinfo * netinfo)
} else if (! user_is_set && host_is_set) {
command_arg = g_strdup_printf ("@%s", host);
}
-
+
num_terms = 3;
if (command_arg != NULL)
num_terms++;
@@ -116,7 +112,7 @@ finger_do (Netinfo * netinfo)
command_line = g_new (gchar *, num_terms + 1);
i = 0;
command_line[i++] = g_strdup (program);
- command_line[i++] = g_strdup (program_name);
+ command_line[i++] = g_strdup (program);
if (command_options != NULL) {
for (j = 0; command_options[j] != NULL; j++)
command_line[i++] = g_strdup (command_options[j]);
@@ -147,7 +143,7 @@ finger_foreach (Netinfo * netinfo, gchar * line, gssize len,
gsize bytes_written;
GtkTextBuffer *buffer = NULL;
GtkTextIter iter;
-
+
g_return_if_fail (netinfo != NULL);
g_return_if_fail (line != NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]