[gnome-software] Use libappstream-glib with g_autoptr as well
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] Use libappstream-glib with g_autoptr as well
- Date: Tue, 8 Sep 2015 12:15:21 +0000 (UTC)
commit 7c14bd395456318c07eb44afa98fb8e464c66212
Author: Kalev Lember <klember redhat com>
Date: Tue Sep 8 14:11:30 2015 +0200
Use libappstream-glib with g_autoptr as well
... and bump libappstream-glib dep for g_autoptr support.
configure.ac | 2 +-
src/gs-screenshot-image.c | 6 +++---
src/plugins/gs-plugin-fwupd.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 467e17e..3545871 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ dnl - Check library dependencies
dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.17.7 gio-unix-2.0)
PKG_CHECK_MODULES(PACKAGEKIT, packagekit-glib2 >= 1.0.0)
-PKG_CHECK_MODULES(APPSTREAM, appstream-glib >= 0.4.2)
+PKG_CHECK_MODULES(APPSTREAM, appstream-glib >= 0.5.1)
PKG_CHECK_MODULES(SQLITE, sqlite3)
PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.42)
PKG_CHECK_MODULES(GSETTINGS_DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.11.5)
diff --git a/src/gs-screenshot-image.c b/src/gs-screenshot-image.c
index 6defab7..b440ff3 100644
--- a/src/gs-screenshot-image.c
+++ b/src/gs-screenshot-image.c
@@ -108,7 +108,7 @@ gs_screenshot_image_get_desktop_pixbuf (GsScreenshotImage *ssimg)
static gboolean
gs_screenshot_image_use_desktop_background (GsScreenshotImage *ssimg, GdkPixbuf *pixbuf)
{
- _cleanup_object_unref_ AsImage *im = NULL;
+ g_autoptr(AsImage) im = NULL;
/* nothing to show, means no background mode */
if (pixbuf == NULL)
@@ -186,7 +186,7 @@ static void
gs_screenshot_image_show_blurred (GsScreenshotImage *ssimg,
const gchar *filename_thumb)
{
- _cleanup_object_unref_ AsImage *im = NULL;
+ g_autoptr(AsImage) im = NULL;
g_autoptr(GdkPixbuf) pb = NULL;
/* create an helper which can do the blurring for us */
@@ -220,7 +220,7 @@ gs_screenshot_image_complete_cb (SoupSession *session,
g_autoptr(GsScreenshotImage) ssimg = GS_SCREENSHOT_IMAGE (user_data);
gboolean ret;
g_autoptr(GError) error = NULL;
- _cleanup_object_unref_ AsImage *im = NULL;
+ g_autoptr(AsImage) im = NULL;
g_autoptr(GdkPixbuf) pixbuf = NULL;
g_autoptr(GInputStream) stream = NULL;
diff --git a/src/plugins/gs-plugin-fwupd.c b/src/plugins/gs-plugin-fwupd.c
index a57ca67..3e69778 100644
--- a/src/plugins/gs-plugin-fwupd.c
+++ b/src/plugins/gs-plugin-fwupd.c
@@ -247,7 +247,7 @@ gs_plugin_add_update_app (GsPlugin *plugin,
g_autofree gchar *update_version = NULL;
g_autofree gchar *vendor = NULL;
g_autofree gchar *version = NULL;
- _cleanup_object_unref_ AsIcon *icon = NULL;
+ g_autoptr(AsIcon) icon = NULL;
g_autoptr(GsApp) app = NULL;
while (g_variant_iter_next (iter_device, "{&sv}", &key, &variant)) {
@@ -989,7 +989,7 @@ gs_plugin_filename_to_app (GsPlugin *plugin,
gboolean supported;
gint fd;
gint retval;
- _cleanup_object_unref_ AsIcon *icon = NULL;
+ g_autoptr(AsIcon) icon = NULL;
g_autoptr(GDBusConnection) conn = NULL;
g_autoptr(GDBusMessage) message = NULL;
g_autoptr(GDBusMessage) request = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]