rpms/cheese
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 2.29.92

Browse Source
This commit is contained in:
Bastien Nocera 2010-03-09 15:34:12 +00:00
parent 62d8feed58
commit ec9fd4381b
6 changed files with 8 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
cheese-2.29.90.tar.gz
cheese-2.29.92.tar.bz2

26
0001-Require-gstreamer-plugins-base-0.10.patch
View File

@ -1,26 +0,0 @@
From 3143a81476f8653eff34759d01e2c4de1458ee40 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 9 Feb 2010 18:21:29 +0000
Subject: [PATCH] Require gstreamer-plugins-base-0.10
So that the xoverlay interface is available
---
cheese-gtk.pc.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cheese-gtk.pc.in b/cheese-gtk.pc.in
index a2a4966..954c9bf 100644
--- a/cheese-gtk.pc.in
+++ b/cheese-gtk.pc.in
@@ -7,7 +7,7 @@ includedir=@includedir@
Name: cheese
Description: Cheese Webcam widgets
Version: @VERSION@
-Requires.private: gtk+-x11-2.0 gstreamer-0.10 libcanberra-gtk
+Requires.private: gtk+-x11-2.0 gstreamer-0.10 gstreamer-plugins-base-0.10 libcanberra-gtk
Libs: -L${libdir} -lcheese-gtk
Cflags: -I${includedir}/cheese
--
1.6.6

15
cheese.spec
View File

@ -1,12 +1,12 @@
Name: cheese
Version: 2.29.90
Release: 2%{?dist}
Version: 2.29.92
Release: 1%{?dist}
Summary: Application for taking pictures and movies from a webcam
Group: Amusements/Graphics
License: GPLv2+
URL: http://projects.gnome.org/cheese/
Source0: http://download.gnome.org/sources/cheese/2.29/%{name}-%{version}.tar.gz
Source0: http://download.gnome.org/sources/cheese/2.29/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= 2.19.1
@ -35,10 +35,6 @@ Requires(post): GConf2
Requires(pre): GConf2
Requires(preun): GConf2
# http://bugzilla.gnome.org/show_bug.cgi?id=592663
Patch1: trash-menu.patch
Patch2: 0001-Require-gstreamer-plugins-base-0.10.patch
%description
Cheese is a Photobooth-inspired GNOME application for taking pictures and
videos from a webcam. It can also apply fancy graphical effects.
@ -65,8 +61,6 @@ for writing applications that require a webcam display widget.
%prep
%setup -q
%patch1 -p1 -b .trash-menu
%patch2 -p1 -b .reqs
%build
%configure --disable-static
@ -170,6 +164,9 @@ fi
%{_libdir}/pkgconfig/cheese-gtk.pc
%changelog
* Tue Mar 09 2010 Bastien Nocera <bnocera@redhat.com> 2.29.92-1
- Update to 2.29.92
* Tue Feb 09 2010 Bastien Nocera <bnocera@redhat.com> 2.29.90-2
- Fix include path, and missing requires for the pkg-config file

11
fix-schemas.patch
View File

@ -1,11 +0,0 @@
diff -up cheese-2.27.90/data/cheese.schemas.in.fix-schemas cheese-2.27.90/data/cheese.schemas.in
--- cheese-2.27.90/data/cheese.schemas.in.fix-schemas 2009-08-14 15:54:43.643811926 -0400
+++ cheese-2.27.90/data/cheese.schemas.in 2009-08-14 15:54:48.860844990 -0400
@@ -148,6 +148,7 @@
</locale>
</schema>
+ <schema>
<key>/schemas/apps/cheese/wide_mode</key>
<applyto>/apps/cheese/wide_mode</applyto>
<owner>cheese</owner>

2
sources
View File

@ -1 +1 @@
fb63599bde76947a2253507e6fe411a9 cheese-2.29.90.tar.gz
46f5d4cf026b9109b226350e214a1f75 cheese-2.29.92.tar.bz2

123
trash-menu.patch
View File

@ -1,123 +0,0 @@
From 2a16851e43cac594bf8983221411e19aa00082cd Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 9 Feb 2010 15:46:59 +0000
Subject: [PATCH] Update sensitivity of "move all to trash"
https://bugzilla.gnome.org/show_bug.cgi?id=592663
---
src/cheese-ui.h | 7 +++++--
src/cheese-window.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/src/cheese-ui.h b/src/cheese-ui.h
index 0068b73..c9c76bb 100644
--- a/src/cheese-ui.h
+++ b/src/cheese-ui.h
@@ -79,12 +79,15 @@ const GtkActionEntry action_entries_file[] = {
G_CALLBACK (cheese_cmd_file_save_as)},
{"MoveToTrash", "user-trash", N_("Move to _Trash"), "Delete", NULL,
G_CALLBACK (cheese_cmd_file_move_to_trash)},
- {"RemoveAll", NULL, N_("Move All to Trash"), NULL, NULL,
- G_CALLBACK (cheese_cmd_file_move_all_to_trash)},
{"Delete", NULL, N_("Delete"), "<shift>Delete", NULL,
G_CALLBACK (cheese_cmd_file_delete)},
};
+static const GtkActionEntry action_entries_trash[] = {
+ {"RemoveAll", NULL, N_("Move All to Trash"), NULL, NULL,
+ G_CALLBACK (cheese_cmd_file_move_all_to_trash)},
+};
+
G_END_DECLS
#endif /* __CHEESE_UI_H__ */
diff --git a/src/cheese-window.c b/src/cheese-window.c
index e4d06fa..e1c672e 100644
--- a/src/cheese-window.c
+++ b/src/cheese-window.c
@@ -164,6 +164,7 @@ typedef struct
GtkActionGroup *actions_burst;
GtkActionGroup *actions_fullscreen;
GtkActionGroup *actions_wide_mode;
+ GtkActionGroup *actions_trash;
GtkUIManager *ui_manager;
@@ -479,6 +480,40 @@ cheese_window_selection_changed_cb (GtkIconView *iconview,
}
}
+static void
+cheese_window_thumbnails_changed (GtkTreeModel *model,
+ CheeseWindow *cheese_window)
+{
+ CheeseWindowPrivate *priv = CHEESE_WINDOW_GET_PRIVATE (cheese_window);
+ GtkTreeIter iter;
+
+ if (gtk_tree_model_get_iter_first (model, &iter))
+ {
+ gtk_action_group_set_sensitive (priv->actions_trash, TRUE);
+ }
+ else
+ {
+ gtk_action_group_set_sensitive (priv->actions_trash, FALSE);
+ }
+}
+
+static void
+cheese_window_thumbnail_inserted (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ CheeseWindow *cheese_window)
+{
+ cheese_window_thumbnails_changed (model, cheese_window);
+}
+
+static void
+cheese_window_thumbnail_deleted (GtkTreeModel *model,
+ GtkTreePath *path,
+ CheeseWindow *cheese_window)
+{
+ cheese_window_thumbnails_changed (model, cheese_window);
+}
+
static gboolean
cheese_window_button_press_event_cb (GtkWidget *iconview, GdkEventButton *event,
CheeseWindow *cheese_window)
@@ -1085,6 +1120,11 @@ setup_menubar_and_actions (CheeseWindow *cheese_window)
G_N_ELEMENTS (action_entries_file));
gtk_action_group_set_sensitive (priv->actions_file, FALSE);
+ priv->actions_trash = cheese_window_action_group_new (cheese_window,
+ "ActionsTrash",
+ action_entries_trash,
+ G_N_ELEMENTS (action_entries_trash));
+
priv->actions_photo = cheese_window_action_group_new (cheese_window,
"ActionsPhoto",
action_entries_photo,
@@ -1253,6 +1293,13 @@ cheese_window_init (CheeseWindow *cheese_window)
g_signal_connect (priv->thumb_view, "button_press_event",
G_CALLBACK (cheese_window_button_press_event_cb), cheese_window);
+ g_signal_connect (gtk_icon_view_get_model (GTK_ICON_VIEW (priv->thumb_view)), "row-inserted",
+ G_CALLBACK (cheese_window_thumbnail_inserted), cheese_window);
+ g_signal_connect (gtk_icon_view_get_model (GTK_ICON_VIEW (priv->thumb_view)), "row-deleted",
+ G_CALLBACK (cheese_window_thumbnail_deleted), cheese_window);
+
+ cheese_window_thumbnails_changed (gtk_icon_view_get_model (GTK_ICON_VIEW (priv->thumb_view)), cheese_window);
+
cheese_window_set_mode (cheese_window, CAMERA_MODE_PHOTO);
}
@@ -1331,6 +1378,7 @@ cheese_window_finalize (GObject *object)
g_object_unref (priv->actions_video);
g_object_unref (priv->actions_burst);
g_object_unref (priv->actions_fullscreen);
+ g_object_unref (priv->actions_trash);
if (G_OBJECT_CLASS (cheese_window_parent_class)->finalize)
G_OBJECT_CLASS (cheese_window_parent_class)->finalize (object);
--
1.6.6