[gnome-contacts] AvatarDialog: fix #138 crash when taking a webcam picture
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-contacts] AvatarDialog: fix #138 crash when taking a webcam picture
- Date: Mon, 29 Jul 2019 18:06:07 +0000 (UTC)
commit 8bcb75001ad5c8b0be1ae200fc1b77e198b5155c
Author: Julian Sparber <julian sparber net>
Date: Tue Jul 9 10:27:39 2019 +0200
AvatarDialog: fix #138 crash when taking a webcam picture
Since get cheese_widget_get_camera () and get_video_area () are not
defined static they are are exported but we don't have the function
signature, therefore this adds the header file with the function
signatures.
src/cheese-widget.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++
vapi/cheese.vapi | 5 +++--
2 files changed, 60 insertions(+), 2 deletions(-)
---
diff --git a/src/cheese-widget.h b/src/cheese-widget.h
new file mode 100644
index 0000000..a422fe9
--- /dev/null
+++ b/src/cheese-widget.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2009 Bastien Nocera <hadess hadess net>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CHEESE_WIDGET_H_
+#define CHEESE_WIDGET_H_
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+#include <clutter/clutter.h>
+#include <clutter-gtk/clutter-gtk.h>
+
+G_BEGIN_DECLS
+
+#define CHEESE_TYPE_WIDGET (cheese_widget_get_type ())
+G_DECLARE_FINAL_TYPE (CheeseWidget, cheese_widget, CHEESE, WIDGET, GtkNotebook)
+
+GtkWidget *cheese_widget_new (void);
+void cheese_widget_get_error (CheeseWidget *widget, GError **error);
+GObject *cheese_widget_get_camera (CheeseWidget *widget);
+GtkWidget *cheese_widget_get_video_area (CheeseWidget *widget);
+
+
+/**
+ * CheeseWidgetState:
+ * @CHEESE_WIDGET_STATE_NONE: Default state, camera uninitialized
+ * @CHEESE_WIDGET_STATE_READY: The camera should be ready and the widget should be displaying the preview
+ * @CHEESE_WIDGET_STATE_ERROR: An error occurred while setting up the camera, check what went wrong with
cheese_widget_get_error()
+ *
+ * Current #CheeseWidget state.
+ *
+ */
+typedef enum
+{
+ CHEESE_WIDGET_STATE_NONE,
+ CHEESE_WIDGET_STATE_READY,
+ CHEESE_WIDGET_STATE_ERROR
+} CheeseWidgetState;
+
+G_END_DECLS
+
+#endif /* CHEESE_WIDGET_H_ */
diff --git a/vapi/cheese.vapi b/vapi/cheese.vapi
index 46f95de..1faa347 100644
--- a/vapi/cheese.vapi
+++ b/vapi/cheese.vapi
@@ -24,12 +24,13 @@ namespace Cheese {
READY,
ERROR
}
- [CCode (cheader_filename = "cheese/cheese-widget.h")]
+ [CCode (cheader_filename = "cheese-widget.h")]
public class Widget : Gtk.Widget {
[CCode (has_construct_function = false, type = "CheeseWidget*")]
public Widget ();
public WidgetState state { get; }
- public unowned GLib.Object get_camera ();
+ public unowned GLib.Object get_camera ();
+ public unowned Gtk.Widget get_video_area ();
}
[CCode (cheader_filename = "cheese/cheese-camera.h")]
public class Camera : GLib.Object {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]