[packagekit] packagekit: Branch 'master' - 4 commits

Richard Hughes hughsient at kemper.freedesktop.org
Mon Nov 5 15:41:37 PST 2007


 client/.gitignore                  |    1 +
 dev/null                           |binary
 html/img/pk-application-groups.png |binary
 html/img/pk-application-search.png |binary
 html/pk-screenshots.html           |    7 +++++--
 libpackagekit/pk-client.c          |   14 +++++++++++---
 libpackagekit/pk-job-list.c        |    4 +---
 7 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit 00865c9d842f438145507e0573a13933f3534f8a
Merge: bcea127... 62354e1...
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Nov 5 23:37:33 2007 +0000

    Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit

commit bcea12785a931f855a3b6ff963dbd221ea29e226
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Nov 5 23:37:10 2007 +0000

    add the new look pk-application

diff --git a/client/.gitignore b/client/.gitignore
index e0f363e..ef63722 100644
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -13,4 +13,5 @@ pk-application
 *.gcov
 *.gcda
 *.gcno
+*.out
 
diff --git a/html/img/pk-application-groups.png b/html/img/pk-application-groups.png
new file mode 100644
index 0000000..98fa802
Binary files /dev/null and b/html/img/pk-application-groups.png differ
diff --git a/html/img/pk-application-search.png b/html/img/pk-application-search.png
new file mode 100644
index 0000000..9f0b151
Binary files /dev/null and b/html/img/pk-application-search.png differ
diff --git a/html/img/pk-application.png b/html/img/pk-application.png
deleted file mode 100644
index 1cf7019..0000000
Binary files a/html/img/pk-application.png and /dev/null differ
diff --git a/html/pk-screenshots.html b/html/pk-screenshots.html
index c65c539..9d02130 100644
--- a/html/pk-screenshots.html
+++ b/html/pk-screenshots.html
@@ -18,8 +18,11 @@
 <h1>Screenshots</h1>
 
 
-<center><img src="img/pk-application.png"/></center>
-<p class="caption">Add/Remove Software</p>
+<center><img src="img/pk-application-search.png"/></center>
+<p class="caption">Add/Remove Software search</p>
+
+<center><img src="img/pk-application-groups.png"/></center>
+<p class="caption">Add/Remove Software groups</p>
 
 <center><img src="img/pk-transactions.png"/></center>
 <p class="caption">Transaction viewer</p>
commit 62354e11b870d375534af17131a0baf80e562458
Author: James Bowes <jbowes at dangerouslyinc.com>
Date:   Mon Nov 5 18:25:09 2007 -0500

    pk-client: Fix dbus related memleaks.

diff --git a/libpackagekit/pk-client.c b/libpackagekit/pk-client.c
index 785d3a7..f5dddd3 100644
--- a/libpackagekit/pk-client.c
+++ b/libpackagekit/pk-client.c
@@ -656,6 +656,7 @@ pk_client_get_status (PkClient *client, PkStatusEnum *status)
 		return FALSE;
 	}
 	*status = pk_status_enum_from_text (status_text);
+	g_free (status_text);
 	return TRUE;
 }
 
@@ -780,8 +781,11 @@ pk_client_get_role (PkClient *client, PkRoleEnum *role, gchar **package_id)
 		return FALSE;
 	}
 	*role = pk_role_enum_from_text (role_text);
+	g_free (role_text);
 	if (package_id != NULL) {
-		*package_id = g_strdup (package_id_temp);
+		*package_id = package_id_temp;
+	} else {
+		g_free (package_id_temp);
 	}
 	return TRUE;
 }
@@ -2060,11 +2064,15 @@ pk_client_get_backend_detail (PkClient *client, gchar **name, gchar **author)
 
 	/* copy needed bits */
 	if (name != NULL) {
-		*name = g_strdup (tname);
+		*name = tname;
+	} else {
+		g_free (tauthor);
 	}
 	/* copy needed bits */
 	if (author != NULL) {
-		*author = g_strdup (tauthor);
+		*author = tauthor;
+	} else {
+		g_free (tauthor);
 	}
 	return TRUE;
 }
commit 635992d391e064082780321e6922e69d7a1752a3
Author: James Bowes <jbowes at dangerouslyinc.com>
Date:   Mon Nov 5 18:08:53 2007 -0500

    job-list: Fix leak in job_list_refresh.

diff --git a/libpackagekit/pk-job-list.c b/libpackagekit/pk-job-list.c
index f052446..43848ec 100644
--- a/libpackagekit/pk-job-list.c
+++ b/libpackagekit/pk-job-list.c
@@ -98,7 +98,6 @@ pk_job_list_refresh (PkJobList *jlist)
 {
 	gboolean ret;
 	GError *error;
-	gchar **array;
 
 	g_return_val_if_fail (jlist != NULL, FALSE);
 	g_return_val_if_fail (PK_IS_JOB_LIST (jlist), FALSE);
@@ -111,7 +110,7 @@ pk_job_list_refresh (PkJobList *jlist)
 	error = NULL;
 	ret = dbus_g_proxy_call (jlist->priv->proxy, "GetTransactionList", &error,
 				 G_TYPE_INVALID,
-				 G_TYPE_STRV, &array,
+				 G_TYPE_STRV, &jlist->priv->array,
 				 G_TYPE_INVALID);
 	if (error != NULL) {
 		pk_debug ("ERROR: %s", error->message);
@@ -123,7 +122,6 @@ pk_job_list_refresh (PkJobList *jlist)
 		jlist->priv->array = NULL;
 		return FALSE;
 	}
-	jlist->priv->array = g_strdupv (array);
 	return TRUE;
 }
 



More information about the PackageKit mailing list