CodingStyle | 31 +++++++++++++++++++++++++++++++
backends/apt/pk-sqlite-pkg-cache.h | 1 -
backends/opkg/pk-backend-opkg.c | 4 ++--
contrib/gnome-packagekit.spec.in | 1 +
libpackagekit/pk-enum.c | 1 +
libpackagekit/pk-enum.h | 1 +
6 files changed, 36 insertions(+), 3 deletions(-)
New commits:
commit 9634d6f7267a7183698dced432c7dc88ae55d17b
Author: Thomas Wood <thomas at openedhand.com>
Date: Fri May 2 15:52:35 2008 +0100
opkg: fix uninitialised variable warning
diff --git a/backends/opkg/pk-backend-opkg.c b/backends/opkg/pk-backend-opkg.c
index 29d3993..97e90c4 100644
--- a/backends/opkg/pk-backend-opkg.c
+++ b/backends/opkg/pk-backend-opkg.c
@@ -440,7 +440,7 @@ backend_update_system_thread (PkBackend *backend)
{
gint err;
- opkg_upgrade_all (opkg, pk_opkg_progress_cb, backend);
+ err = opkg_upgrade_all (opkg, pk_opkg_progress_cb, backend);
if (err)
opkg_unknown_error (backend, err, "Upgrading system");
commit f65d83cac58c109b13f0a603c6abe680c207df83
Author: Richard Hughes <richard at hughsie.com>
Date: Fri May 2 14:42:51 2008 +0100
don't winge about coding style without justification; justify it.
diff --git a/CodingStyle b/CodingStyle
new file mode 100644
index 0000000..edfee01
--- /dev/null
+++ b/CodingStyle
@@ -0,0 +1,31 @@
+== Indent ==
+
+Use "indent -kr -i8 -pcs -lps -psl *.c" to convert to "mostly correct" indenting levels.
+
+== Tabs ==
+
+Tabs are the size of 8 spaces, and should be used in preference to spaces.
+
+== Overlong lines ==
+
+Functions that are two long for one line are intented with tabs and then
+spaces to the start of the bracket:
+
+libnotify_event ("HAL does not have PowerManagement capability",
+ LIBNOTIFY_URGENCY_CRITICAL, NULL);
+
+== Braces ==
+
+Functions have curly brace on same line:
+
+if (icon == NULL) {
+ g_warning ("Cannot find icon");
+ return FALSE;
+}
+
+Braces not-ommitted for single line:
+
+if (!false) {
+ g_warning ("Cannot find icon");
+}
+
commit 1007f7bcef9a9a19a81f83f5a990e085d7d35b2f
Merge: 70f315e... 07362c1...
Author: Richard Hughes <richard at hughsie.com>
Date: Fri May 2 14:18:13 2008 +0100
Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit
commit 70f315ee333d82b3bccab09d63547d1569a6e99f
Author: Richard Hughes <richard at hughsie.com>
Date: Fri May 2 14:17:55 2008 +0100
add another provides enum for future work
diff --git a/contrib/gnome-packagekit.spec.in b/contrib/gnome-packagekit.spec.in
index 6cf4822..ca6afb7 100644
--- a/contrib/gnome-packagekit.spec.in
+++ b/contrib/gnome-packagekit.spec.in
@@ -1,5 +1,6 @@
%define dbus_version 0.61
%define alphatag #ALPHATAG#
+%define _use_internal_dependency_generator 0
Summary: GNOME PackageKit Client
Name: gnome-packagekit
diff --git a/libpackagekit/pk-enum.c b/libpackagekit/pk-enum.c
index af3b879..921b1e8 100644
--- a/libpackagekit/pk-enum.c
+++ b/libpackagekit/pk-enum.c
@@ -277,6 +277,7 @@ static PkEnumMatch enum_provides[] = {
{PK_PROVIDES_ENUM_ANY, "any"},
{PK_PROVIDES_ENUM_MODALIAS, "modalias"},
{PK_PROVIDES_ENUM_CODEC, "codec"},
+ {PK_PROVIDES_ENUM_MIMETYPE, "mimetype"},
{0, NULL}
};
diff --git a/libpackagekit/pk-enum.h b/libpackagekit/pk-enum.h
index 70aabfe..22336e7 100644
--- a/libpackagekit/pk-enum.h
+++ b/libpackagekit/pk-enum.h
@@ -363,6 +363,7 @@ typedef enum {
PK_PROVIDES_ENUM_ANY,
PK_PROVIDES_ENUM_MODALIAS,
PK_PROVIDES_ENUM_CODEC,
+ PK_PROVIDES_ENUM_MIMETYPE,
PK_PROVIDES_ENUM_UNKNOWN
} PkProvidesEnum;
commit 07362c1994ca09bf83c78bc979370edaf3a25538
Author: Thomas Wood <thomas at openedhand.com>
Date: Fri May 2 13:58:30 2008 +0100
opkg: include pk-backend-internal.h for PK_BACKEND macro
diff --git a/backends/opkg/pk-backend-opkg.c b/backends/opkg/pk-backend-opkg.c
index 5818ada..29d3993 100644
--- a/backends/opkg/pk-backend-opkg.c
+++ b/backends/opkg/pk-backend-opkg.c
@@ -24,6 +24,7 @@
#include <glib.h>
#include <string.h>
#include <pk-backend.h>
+#include <pk-backend-internal.h>
#include <pk-debug.h>
#include <pk-package-ids.h>
#include <pk-enum.h>
commit 561e67f8e8ebf185354c648a4ec30badfd112a0b
Author: Richard Hughes <richard at hughsie.com>
Date: Fri May 2 12:12:41 2008 +0100
remove includes to files that no longer exist
diff --git a/backends/apt/pk-sqlite-pkg-cache.h b/backends/apt/pk-sqlite-pkg-cache.h
index 74fa276..e9a77a2 100644
--- a/backends/apt/pk-sqlite-pkg-cache.h
+++ b/backends/apt/pk-sqlite-pkg-cache.h
@@ -29,7 +29,6 @@ typedef enum {
} SearchDepth;
#include <pk-backend.h>
-#include <pk-backend-thread.h>
#include <sqlite3.h>
void sqlite_init_cache(PkBackend *backend, const char* dbname, const char* compare_fname, void (*build_db)(PkBackend *, sqlite3 *db));
diff --git a/backends/opkg/pk-backend-opkg.c b/backends/opkg/pk-backend-opkg.c
index b5caad6..5818ada 100644
--- a/backends/opkg/pk-backend-opkg.c
+++ b/backends/opkg/pk-backend-opkg.c
@@ -24,7 +24,6 @@
#include <glib.h>
#include <string.h>
#include <pk-backend.h>
-#include <pk-backend-thread.h>
#include <pk-debug.h>
#include <pk-package-ids.h>
#include <pk-enum.h>