GNOME.org
 

gnome-packagekit r100 - in trunk: . libgbus src

Author: rhughes
Date: Wed Feb 20 19:01:41 2008
New Revision: 100
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=100&view=rev

Log:
from git

Added:
   trunk/configure.ac
Removed:
   trunk/configure.in
Modified:
   trunk/autogen.sh
   trunk/libgbus/libgbus.c
   trunk/src/pk-application.c
   trunk/src/pk-auto-refresh.c
   trunk/src/pk-common-gui.c
   trunk/src/pk-progress.c
   trunk/src/pk-smart-icon.c

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Wed Feb 20 19:01:41 2008
@@ -6,7 +6,7 @@
 
 PKG_NAME=gnome-packagekit
 
-(test -f $srcdir/configure.in \
+(test -f $srcdir/configure.ac \
   && test -f $srcdir/autogen.sh \
   && test -d $srcdir/src) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"

Added: trunk/configure.ac
==============================================================================
--- (empty file)
+++ trunk/configure.ac	Wed Feb 20 19:01:41 2008
@@ -0,0 +1,177 @@
+AC_PREREQ(2.52)
+
+AC_INIT(gnome-packagekit, 0.1.8)
+AC_CONFIG_SRCDIR(src)
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AM_CONFIG_HEADER(config.h)
+
+AC_PROG_CC
+AC_PROG_INSTALL
+AM_PROG_LIBTOOL
+IT_PROG_INTLTOOL([0.35.0])
+
+GNOME_COMPILE_WARNINGS
+GNOME_DOC_INIT
+
+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+
+dnl ---------------------------------------------------------------------------
+dnl - Extra verbose warning switches
+dnl ---------------------------------------------------------------------------
+if test "$GCC" = "yes"; then
+    CPPFLAGS="$CPPFLAGS -Werror -Wcast-align -Wno-uninitialized"
+    CPPFLAGS="$CPPFLAGS -Wall"
+fi
+
+dnl ---------------------------------------------------------------------------
+dnl - Debugging switches (uncomment this if you want to use gdb)
+dnl ---------------------------------------------------------------------------
+CPPFLAGS="$CPPFLAGS -g"
+CPPFLAGS="$CPPFLAGS -fexceptions"
+
+dnl ---------------------------------------------------------------------------
+dnl - gettext stuff
+dnl ---------------------------------------------------------------------------
+GETTEXT_PACKAGE=AC_PACKAGE_NAME
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE(GETTEXT_PACKAGE, "AC_PACKAGE_NAME", [foo])
+
+AM_GLIB_GNU_GETTEXT
+
+dnl ---------------------------------------------------------------------------
+dnl - Library dependencies
+dnl ---------------------------------------------------------------------------
+PACKAGEKIT_REQUIRED=0.1.2
+GLIB_REQUIRED=2.14.0
+GTK_REQUIRED=2.12.0
+DBUS_REQUIRED=1.1.2
+GCONF_REQUIRED=0.22
+DBUS_GLIB_REQUIRED=0.73
+LIBGLADE_REQUIRED=2.5.0
+LIBNOTIFY_REQUIRED=0.4.3
+LIBSEXY_REQUIRED=0.1.10
+
+dnl ---------------------------------------------------------------------------
+dnl - Make above strings available for packaging files (e.g. rpm spec files)
+dnl ---------------------------------------------------------------------------
+AC_SUBST(PACKAGEKIT_REQUIRED)
+AC_SUBST(GLIB_REQUIRED)
+AC_SUBST(GTK_REQUIRED)
+AC_SUBST(DBUS_REQUIRED)
+AC_SUBST(DBUS_GLIB_REQUIRED)
+AC_SUBST(LIBGLADE_REQUIRED)
+AC_SUBST(LIBNOTIFY_REQUIRED)
+AC_SUBST(LIBSEXY_REQUIRED)
+
+dnl ---------------------------------------------------------------------------
+dnl - Check library dependencies
+dnl ---------------------------------------------------------------------------
+PKG_CHECK_MODULES(PACKAGEKIT, packagekit >= $PACKAGEKIT_REQUIRED)
+AC_SUBST(PACKAGEKIT_CFLAGS)
+AC_SUBST(PACKAGEKIT_LIBS)
+
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
+PKG_CHECK_MODULES(DBUS, \
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
+ dbus-1 >= $DBUS_REQUIRED \
+ gthread-2.0)
+AC_SUBST(DBUS_CFLAGS)
+AC_SUBST(DBUS_LIBS)
+
+PKG_CHECK_MODULES(GTK, \
+ gtk+-2.0 >= $GTK_REQUIRED)
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
+
+PKG_CHECK_MODULES(LIBSEXY, \
+ libsexy >= $LIBSEXY_REQUIRED)
+AC_SUBST(LIBSEXY_CFLAGS)
+AC_SUBST(LIBSEXY_LIBS)
+
+PKG_CHECK_MODULES(LIBGLADE, \
+ libglade-2.0 >= $LIBGLADE_REQUIRED)
+AC_SUBST(LIBGLADE_CFLAGS)
+AC_SUBST(LIBGLADE_LIBS)
+
+PKG_CHECK_MODULES(GCONF, \
+ gconf-2.0 >= $GCONF_REQUIRED)
+AC_SUBST(GCONF_CFLAGS)
+AC_SUBST(GCONF_LIBS)
+
+PKG_CHECK_MODULES(LIBNOTIFY, \
+ libnotify >= $LIBNOTIFY_REQUIRED)
+AC_SUBST(LIBNOTIFY_CFLAGS)
+AC_SUBST(LIBNOTIFY_LIBS)
+
+AC_PATH_PROG(GCONFTOOL, gconftool-2)
+AM_GCONF_SOURCE_2
+
+AC_PATH_XTRA
+
+ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+
+dnl ---------------------------------------------------------------------------
+dnl - Make paths available for source files
+dnl ---------------------------------------------------------------------------
+AC_SUBST(SYSCONFDIR, $sysconfdir)
+AC_SUBST(DATADIR, $datadir)
+AC_SUBST(BINDIR, $bindir)
+AC_SUBST(SBINDIR, $sbindir)
+
+dnl ---------------------------------------------------------------------------
+dnl - Where should we put documentation ?
+dnl ---------------------------------------------------------------------------
+AC_ARG_WITH(doc-dir,
+              [AC_HELP_STRING([--with-doc-dir=<dir>],
+              [directory to install documentation])])
+if ! test -z "$with_doc_dir"; then
+   DOCDIR="$with_doc_dir/gnome-packagekit-$VERSION"
+else
+   DOCDIR="$DATADIR/doc/gnome-packagekit-$VERSION"
+fi
+AC_SUBST(DOCDIR)
+
+dnl ---------------------------------------------------------------------------
+dnl - Makefiles, etc.
+dnl ---------------------------------------------------------------------------
+AC_OUTPUT([
+Makefile
+libselftest/Makefile
+libgbus/Makefile
+src/Makefile
+help/Makefile
+po/Makefile.in
+data/Makefile
+data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/22x22/Makefile
+data/icons/24x24/Makefile
+data/icons/48x48/Makefile
+data/icons/scalable/Makefile
+data/icons/16x16/categories/Makefile
+data/icons/16x16/status/Makefile
+data/icons/22x22/categories/Makefile
+data/icons/22x22/status/Makefile
+data/icons/24x24/categories/Makefile
+data/icons/24x24/status/Makefile
+data/icons/48x48/categories/Makefile
+data/icons/48x48/status/Makefile
+data/icons/scalable/categories/Makefile
+data/icons/scalable/status/Makefile
+])
+
+dnl ==========================================================================
+echo "
+                    gnome-packagekit $VERSION
+                  =============================
+
+        prefix:                    ${prefix}
+        datadir:                   ${datadir}
+        compiler:                  ${CC}
+        cflags:                    ${CFLAGS}
+	gconf-schema dir:          $GCONF_SCHEMA_FILE_DIR
+"
+

Modified: trunk/libgbus/libgbus.c
==============================================================================
--- trunk/libgbus/libgbus.c	(original)
+++ trunk/libgbus/libgbus.c	Wed Feb 20 19:01:41 2008
@@ -50,7 +50,7 @@
 	LAST_SIGNAL
 };
 
-static guint	     signals [LAST_SIGNAL] = { 0, };
+static guint	     signals [LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (LibGBus, libgbus, G_TYPE_OBJECT)
 
@@ -224,6 +224,7 @@
 	if (libgbus->priv->proxy != NULL) {
 		g_object_unref (libgbus->priv->proxy);
 	}
+	G_OBJECT_CLASS (libgbus_parent_class)->finalize (object);
 }
 
 /**

Modified: trunk/src/pk-application.c
==============================================================================
--- trunk/src/pk-application.c	(original)
+++ trunk/src/pk-application.c	Wed Feb 20 19:01:41 2008
@@ -104,7 +104,7 @@
 	GROUPS_COLUMN_LAST
 };
 
-static guint	     signals [LAST_SIGNAL] = { 0, };
+static guint	     signals [LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (PkApplication, pk_application, G_TYPE_OBJECT)
 

Modified: trunk/src/pk-auto-refresh.c
==============================================================================
--- trunk/src/pk-auto-refresh.c	(original)
+++ trunk/src/pk-auto-refresh.c	Wed Feb 20 19:01:41 2008
@@ -80,7 +80,7 @@
 	LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = { 0, };
+static guint signals [LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (PkAutoRefresh, pk_auto_refresh, G_TYPE_OBJECT)
 

Modified: trunk/src/pk-common-gui.c
==============================================================================
--- trunk/src/pk-common-gui.c	(original)
+++ trunk/src/pk-common-gui.c	Wed Feb 20 19:01:41 2008
@@ -51,7 +51,7 @@
 	{PK_INFO_ENUM_REMOVING,			"pk-package-delete"},
 	{PK_INFO_ENUM_OBSOLETING,		"pk-package-cleanup"},
 	{PK_INFO_ENUM_CLEANUP,			"pk-package-cleanup"},
-	{0, NULL},
+	{0, NULL}
 };
 
 static PkEnumMatch enum_status_icon_name[] = {
@@ -73,7 +73,7 @@
 	{PK_STATUS_ENUM_REQUEST,		"pk-package-search"},
 	{PK_STATUS_ENUM_FINISHED,		"pk-package-cleanup"}, /* TODO: need better icon */
 	{PK_STATUS_ENUM_CANCEL,			"pk-package-cleanup"}, /* TODO: need better icon */
-	{0, NULL},
+	{0, NULL}
 };
 
 static PkEnumMatch enum_role_icon_name[] = {
@@ -100,7 +100,7 @@
 	{PK_ROLE_ENUM_GET_REPO_LIST,		"emblem-system"},
 	{PK_ROLE_ENUM_REPO_ENABLE,		"emblem-system"},
 	{PK_ROLE_ENUM_REPO_SET_DATA,		"emblem-system"},
-	{0, NULL},
+	{0, NULL}
 };
 
 static PkEnumMatch enum_group_icon_name[] = {
@@ -133,7 +133,7 @@
 	{PK_GROUP_ENUM_NETWORK,			"network-wired"},
 	{PK_GROUP_ENUM_MAPS,			"applications-multimedia"},
 	{PK_GROUP_ENUM_REPOS,			"system-file-manager"},
-	{0, NULL},
+	{0, NULL}
 };
 
 static PkEnumMatch enum_restart_icon_name[] = {
@@ -142,7 +142,7 @@
 	{PK_RESTART_ENUM_SYSTEM,		"dialog-error"},
 	{PK_RESTART_ENUM_SESSION,		"dialog-warning"},
 	{PK_RESTART_ENUM_APPLICATION,		"dialog-warning"},
-	{0, NULL},
+	{0, NULL}
 };
 
 static PkEnumMatch enum_message_icon_name[] = {
@@ -150,7 +150,7 @@
 	{PK_MESSAGE_ENUM_NOTICE,		"dialog-information"},
 	{PK_MESSAGE_ENUM_WARNING,		"dialog-warning"},
 	{PK_MESSAGE_ENUM_DAEMON,		"dialog-error"},
-	{0, NULL},
+	{0, NULL}
 };
 
 /**

Modified: trunk/src/pk-progress.c
==============================================================================
--- trunk/src/pk-progress.c	(original)
+++ trunk/src/pk-progress.c	Wed Feb 20 19:01:41 2008
@@ -59,7 +59,7 @@
 	LAST_SIGNAL
 };
 
-static guint	     signals [LAST_SIGNAL] = { 0, };
+static guint	     signals [LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (PkProgress, pk_progress, G_TYPE_OBJECT)
 

Modified: trunk/src/pk-smart-icon.c
==============================================================================
--- trunk/src/pk-smart-icon.c	(original)
+++ trunk/src/pk-smart-icon.c	Wed Feb 20 19:01:41 2008
@@ -69,7 +69,7 @@
 
 G_DEFINE_TYPE (PkSmartIcon, pk_smart_icon, G_TYPE_OBJECT)
 
-static guint signals [LAST_SIGNAL] = { 0, };
+static guint signals [LAST_SIGNAL] = { 0 };
 
 static PkEnumMatch enum_button_ids[] = {
 	{PK_NOTIFY_BUTTON_UNKNOWN,		"unknown"},	/* fall though value */
@@ -78,7 +78,7 @@
 	{PK_NOTIFY_BUTTON_CANCEL_UPDATE,	"cancel-update"},
 	{PK_NOTIFY_BUTTON_UPDATE_COMPUTER,	"update-computer"},
 	{PK_NOTIFY_BUTTON_RESTART_COMPUTER,	"restart-computer"},
-	{0, NULL},
+	{0, NULL}
 };
 
 /**
@@ -183,8 +183,8 @@
 GtkStatusIcon *
 pk_smart_icon_get_status_icon (PkSmartIcon *sicon)
 {
-	g_return_val_if_fail (sicon != NULL, FALSE);
-	g_return_val_if_fail (PK_IS_SMART_ICON (sicon), FALSE);
+	g_return_val_if_fail (sicon != NULL, NULL);
+	g_return_val_if_fail (PK_IS_SMART_ICON (sicon), NULL);
 	return sicon->priv->status_icon;
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]