Fix parent class in template definition
This commit is contained in:
parent
170b8a50f3
commit
f3abf03133
@ -0,0 +1,43 @@
|
||||
From dc7618a2ff94622c413bcbbce6f13a301cb12969 Mon Sep 17 00:00:00 2001
|
||||
From: Yosef Or Boczko <yoseforb@src.gnome.org>
|
||||
Date: Sat, 3 May 2014 23:54:22 +0300
|
||||
Subject: [PATCH] data: Use the correct name for parent widgets in templates
|
||||
|
||||
Recent versions of GTK+ started complaining about this, for example:
|
||||
(totem:5745): Gtk-CRITICAL **: Error building template class 'TotemMainToolbar' for an instance of type 'TotemMainToolbar': Template parent type `GtkBox' does not match instance parent type `GtkHeaderBar'.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=729479
|
||||
---
|
||||
src/grilo.ui | 2 +-
|
||||
src/totemmaintoolbar.ui | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/grilo.ui b/src/grilo.ui
|
||||
index 7b8103d..aa7b9ac 100644
|
||||
--- a/src/grilo.ui
|
||||
+++ b/src/grilo.ui
|
||||
@@ -91,7 +91,7 @@
|
||||
<column type="gint"/>
|
||||
</columns>
|
||||
</object>
|
||||
- <template class="TotemGrilo" parent="GtkVBox">
|
||||
+ <template class="TotemGrilo" parent="GtkBox">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="border_width">0</property>
|
||||
diff --git a/src/totemmaintoolbar.ui b/src/totemmaintoolbar.ui
|
||||
index a185d42..4a81ada 100644
|
||||
--- a/src/totemmaintoolbar.ui
|
||||
+++ b/src/totemmaintoolbar.ui
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<interface domain="totem">
|
||||
<!-- interface-requires gtk+ 3.11 -->
|
||||
- <template class="TotemMainToolbar" parent="GtkBox">
|
||||
+ <template class="TotemMainToolbar" parent="GtkHeaderBar">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<child>
|
||||
--
|
||||
2.0.0
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
Summary: Movie player for GNOME
|
||||
Name: totem
|
||||
Version: 3.12.1
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Epoch: 1
|
||||
License: GPLv2+ with exceptions
|
||||
Group: Applications/Multimedia
|
||||
URL: http://projects.gnome.org/totem/
|
||||
Source0: http://download.gnome.org/sources/totem/3.12/totem-%{version}.tar.xz
|
||||
|
||||
Patch0: 0001-data-Use-the-correct-name-for-parent-widgets-in-temp.patch
|
||||
|
||||
Requires: gnome-icon-theme
|
||||
# For the opensubtitles plugin
|
||||
Requires: pyxdg
|
||||
@ -149,6 +151,7 @@ audio and video files in the properties dialog.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
export BROWSER_PLUGIN_DIR=%{_libdir}/mozilla/plugins
|
||||
@ -276,6 +279,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
||||
%{_libdir}/mozilla/plugins/libtotem-vegas-plugin.so
|
||||
|
||||
%changelog
|
||||
* Thu May 29 2014 Kalev Lember <kalevlember@gmail.com> - 1:3.12.1-2
|
||||
- Fix parent class in template definition
|
||||
|
||||
* Tue May 20 2014 Kalev Lember <kalevlember@gmail.com> - 1:3.12.1-1
|
||||
- Update to 3.12.1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user