[cheese] Adapt to use new cheese_init and cheese_gtk_init
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese] Adapt to use new cheese_init and cheese_gtk_init
- Date: Sat, 21 Jan 2012 22:01:53 +0000 (UTC)
commit 8e2863a27d5839759ba2cc1b85aab0e8e2c3202e
Author: David King <amigadave amigadave com>
Date: Sat Jan 21 21:53:22 2012 +0000
Adapt to use new cheese_init and cheese_gtk_init
Additionally, use EXIT_SUCCESS and EXIT_FAILURE when exiting.
Makefile.am | 1 +
src/cheese-main.vala | 4 ++--
src/vapi/cheese-common.vapi | 6 ++++++
tests/cheese-test-camera.c | 9 ++++++---
tests/cheese-test-chooser.c | 8 ++++----
tests/cheese-test-flash.c | 3 ++-
tests/cheese-test-monitor.c | 6 ++++--
tests/cheese-test-widget.c | 7 ++++---
tests/test-libcheese-gtk.c | 6 +++---
tests/test-libcheese.c | 4 +++-
10 files changed, 35 insertions(+), 19 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 30cd109..8b26ebd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,6 +55,7 @@ VALAFLAGS = \
--thread \
--vapidir $(top_srcdir)/src/vapi \
--pkg config \
+ --pkg posix \
--pkg gtk+-3.0 \
--pkg gmodule-2.0 \
--pkg gee-1.0 \
diff --git a/src/cheese-main.vala b/src/cheese-main.vala
index d98389a..961a0a2 100644
--- a/src/cheese-main.vala
+++ b/src/cheese-main.vala
@@ -172,8 +172,8 @@ public class Cheese.Main : Gtk.Application
Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
Intl.textdomain (Config.GETTEXT_PACKAGE);
- if (GtkClutter.init (ref args) != InitError.SUCCESS)
- return 1;
+ if (!Cheese.gtk_init (ref args))
+ return Posix.EXIT_FAILURE;
Cheese.Main app;
app = new Cheese.Main ("org.gnome.Cheese", ApplicationFlags.FLAGS_NONE);
diff --git a/src/vapi/cheese-common.vapi b/src/vapi/cheese-common.vapi
index 1dc08f3..5b59b0d 100644
--- a/src/vapi/cheese-common.vapi
+++ b/src/vapi/cheese-common.vapi
@@ -3,6 +3,12 @@
[CCode (cprefix = "Cheese", lower_case_cprefix = "cheese_")]
namespace Cheese
{
+ [CCode (cheader_filename = "cheese.h")]
+ public static bool init([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
+
+ [CCode (cheader_filename = "cheese-gtk.h")]
+ public static bool gtk_init([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
+
[CCode (cheader_filename = "cheese-effect.h")]
public class Effect : GLib.Object
{
diff --git a/tests/cheese-test-camera.c b/tests/cheese-test-camera.c
index 148c51f..aa9f713 100644
--- a/tests/cheese-test-camera.c
+++ b/tests/cheese-test-camera.c
@@ -6,6 +6,7 @@
#include <clutter-gtk/clutter-gtk.h>
#include <gst/gst.h>
#include "cheese-camera.h"
+#include "cheese.h"
static gboolean
delete_callback (GtkWidget *window,
@@ -36,14 +37,16 @@ main (int argc, char **argv)
g_thread_init (NULL);
gdk_threads_init ();
- gst_init (&argc, &argv);
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
if (gtk_clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
- return 1;
+ return EXIT_FAILURE;
+
+ if (!cheese_init (&argc, &argv))
+ return EXIT_FAILURE;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
@@ -76,5 +79,5 @@ main (int argc, char **argv)
gtk_main ();
- return 0;
+ return EXIT_SUCCESS;
}
diff --git a/tests/cheese-test-chooser.c b/tests/cheese-test-chooser.c
index 506a853..558d285 100644
--- a/tests/cheese-test-chooser.c
+++ b/tests/cheese-test-chooser.c
@@ -6,6 +6,7 @@
#include <gst/gst.h>
#include <clutter-gtk/clutter-gtk.h>
#include "cheese-avatar-chooser.h"
+#include "cheese-gtk.h"
static void
response_cb (GtkDialog *dialog,
@@ -29,14 +30,13 @@ main (int argc, char **argv)
g_thread_init (NULL);
gdk_threads_init ();
- gst_init (&argc, &argv);
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- if (gtk_clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
- return 1;
+ if (!cheese_gtk_init (&argc, &argv))
+ return EXIT_FAILURE;
window = cheese_avatar_chooser_new ();
g_signal_connect (G_OBJECT (window), "response",
@@ -48,5 +48,5 @@ main (int argc, char **argv)
gtk_widget_destroy (window);
- return 0;
+ return EXIT_SUCCESS;
}
diff --git a/tests/cheese-test-flash.c b/tests/cheese-test-flash.c
index 1fde939..486a0f1 100644
--- a/tests/cheese-test-flash.c
+++ b/tests/cheese-test-flash.c
@@ -1,3 +1,4 @@
+#include <stdlib.h>
#include <gtk/gtk.h>
#include "cheese-flash.h"
@@ -37,5 +38,5 @@ int main (int argc, char **argv)
gtk_main ();
- return 0;
+ return EXIT_SUCCESS;
}
diff --git a/tests/cheese-test-monitor.c b/tests/cheese-test-monitor.c
index 7153d51..8fd0b6f 100644
--- a/tests/cheese-test-monitor.c
+++ b/tests/cheese-test-monitor.c
@@ -2,6 +2,7 @@
#include "cheese-camera-device-monitor.h"
#include "cheese-camera-device.h"
+#include "cheese.h"
static void
added_cb (CheeseCameraDeviceMonitor *monitor,
@@ -25,7 +26,8 @@ main (int argc, char **argv)
{
CheeseCameraDeviceMonitor *monitor;
- gst_init (&argc, &argv);
+ if (!cheese_init (&argc, &argv))
+ return EXIT_FAILURE;
monitor = cheese_camera_device_monitor_new ();
g_signal_connect (G_OBJECT (monitor), "added",
@@ -36,5 +38,5 @@ main (int argc, char **argv)
g_main_loop_run (g_main_loop_new (NULL, FALSE));
- return 0;
+ return EXIT_SUCCESS;
}
diff --git a/tests/cheese-test-widget.c b/tests/cheese-test-widget.c
index 3bc53c8..19f1fc6 100644
--- a/tests/cheese-test-widget.c
+++ b/tests/cheese-test-widget.c
@@ -4,6 +4,7 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gst/gst.h>
+#include "cheese-gtk.h"
#include "cheese-widget.h"
static gboolean
@@ -30,8 +31,8 @@ main (int argc, char **argv)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- if (gtk_clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
- return 1;
+ if (!cheese_gtk_init (&argc, &argv))
+ return EXIT_FAILURE;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
@@ -46,5 +47,5 @@ main (int argc, char **argv)
gtk_main ();
- return 0;
+ return EXIT_SUCCESS;
}
diff --git a/tests/test-libcheese-gtk.c b/tests/test-libcheese-gtk.c
index 29dc465..c862942 100644
--- a/tests/test-libcheese-gtk.c
+++ b/tests/test-libcheese-gtk.c
@@ -27,6 +27,7 @@
#include "cheese-flash.h"
#include "cheese-widget.h"
#include "um-crop-area.h"
+#include "cheese-gtk.h"
/* CheeseAvatarChooser */
static void
@@ -97,10 +98,9 @@ int main (int argc, gchar *argv[])
{
g_thread_init (NULL);
gdk_threads_init ();
- gst_init (&argc, &argv);
gtk_test_init (&argc, &argv, NULL);
- if (gtk_clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
- return 1;
+ if (!cheese_gtk_init (&argc, &argv))
+ return EXIT_FAILURE;
g_test_add_func ("/libcheese-gtk/avatar_chooser", avatar_chooser);
g_test_add_func ("/libcheese-gtk/flash", flash);
diff --git a/tests/test-libcheese.c b/tests/test-libcheese.c
index 5f9b26a..9657922 100644
--- a/tests/test-libcheese.c
+++ b/tests/test-libcheese.c
@@ -24,6 +24,7 @@
#include "cheese-camera-device-monitor.h"
#include "cheese-effect.h"
#include "cheese-fileutil.h"
+#include "cheese.h"
/* Test CheeseCameraDeviceMonitor */
static void
@@ -209,7 +210,8 @@ main(int argc, gchar *argv[])
g_test_init (&argc, &argv, NULL);
- gst_init (&argc, &argv);
+ if (!cheese_init (&argc, &argv))
+ return EXIT_FAILURE;
g_test_add_func ("/libcheese/cameradevicemonitor/create",
cameradevicemonitor_create);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]