lucas just discovered some problems with the current code: https://bugzilla.gnome.org/show_bug.cgi?id=646620 Cheese's pkg is 'cheese', not 'cheese-3.0'. That breaks build on modules depending on Cheese to build instrospection files (such as The Board). From b141cf151b142921ee48a39ed22f3d2289141ade Mon Sep 17 00:00:00 2001 From: Lucas Rocha <lucasr gnome org> Date: Sun, 3 Apr 2011 15:11:16 +0100 Subject: [PATCH 3/3] lib: export correct package on introspection files The name of Cheese's pkg is cheese, not cheese-3.0. --- libcheese/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libcheese/Makefile.am b/libcheese/Makefile.am index 37b125b..2e1136c 100644 --- a/libcheese/Makefile.am +++ b/libcheese/Makefile.am @@ -103,7 +103,7 @@ Cheese_3_0_gir_CFLAGS = -I$(srcdir) $(INCLUDES) \ $(CHEESE_CFLAGS) Cheese_3_0_gir_LIBS = libcheese.la Cheese_3_0_gir_FILES = $(introspection_sources) -Cheese_3_0_gir_SCANNERFLAGS = --verbose --warn-all --pkg-export cheese-3.0 +Cheese_3_0_gir_SCANNERFLAGS = --verbose --warn-all --pkg-export cheese girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) -- 1.7.4.1 https://bugzilla.gnome.org/show_bug.cgi?id=646622 several fixes to actually make libcheese work in other applications. many "nice to have", ie. can be done for 3.0.1 too but one critical bug: https://bugzilla.gnome.org/show_bug.cgi?id=646622#c2 without this, photos and videos would be stored in the same directory, even if the user changed that value: From 01eb467f8d13deb5ae4fc6e43b763b2ea980c162 Mon Sep 17 00:00:00 2001 From: Lucas Rocha <lucasr gnome org> Date: Fri, 1 Apr 2011 23:39:17 +0100 Subject: [PATCH 2/7] lib: fix typo when initializing photo_path private attribute --- libcheese/cheese-fileutil.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libcheese/cheese-fileutil.c b/libcheese/cheese-fileutil.c index 791a22f..dfaf8f4 100644 --- a/libcheese/cheese-fileutil.c +++ b/libcheese/cheese-fileutil.c @@ -189,7 +189,7 @@ cheese_fileutil_init (CheeseFileUtil *fileutil) settings = g_settings_new ("org.gnome.Cheese"); g_settings_get (settings, "video-path", "s", &priv->video_path); - g_settings_get (settings, "photo-path", "s", &priv->video_path); + g_settings_get (settings, "photo-path", "s", &priv->photo_path); /* get the video path from gsettings, xdg or hardcoded */ if (!priv->video_path || strcmp (priv->video_path, "") == 0) -- 1.7.4.1 thanks a lot! daniel -- this mail was sent using 100% recycled electrons ================================================ daniel g. siegel <dgsiegel gnome org> http://www.dgsiegel.net gnupg key id: 0xDB8E409F fingerprint: F9DD 693C 9E8B 9121 B20B 202E C7D3 3397 DB8E 409F encrypted email preferred
Attachment:
signature.asc
Description: This is a digitally signed message part