Accepting request 147185 from GNOME:Apps

Update to 2.91.6 (forwarded request 146983 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/147185
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtranslator?expand=0&rev=27
This commit is contained in:
Stephan Kulow 2013-01-07 14:18:53 +00:00 committed by Git OBS Bridge
commit 8ae56ae1c4
5 changed files with 17 additions and 112 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7dcdabd5c2156bef98f35d2ec31798287d1721e400ea738fb3ccc2ff2ef186e6
size 4559540

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a1fd4b17b1f32cc7223a31d34e34f95b20acc7b5a23768351a34ff0b7a4bcdf6
size 2235796

View File

@ -1,96 +0,0 @@
diff --git a/data/layout.xml b/data/layout.xml
index 85f7f64..117f471 100644
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -3,30 +3,20 @@
<dock-layout>
<layout name="__default__">
<dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0">
- <paned orientation="horizontal" locked="no" position="1164">
- <paned orientation="horizontal" locked="no" position="244">
- <notebook orientation="vertical" locked="no" page="0">
- <item name="GtrOpenTranPlugin" orientation="vertical" locked="no"/>
- <item name="GtrCharmapPanel" orientation="vertical" locked="no"/>
- <placeholder name="ph_left" next-placement="center"/>
+ <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="1164">
+ <paned orientation="vertical" locked="no" iconified="no" closed="no" position="416">
+ <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
+ <item name="GtrMessageTable" orientation="vertical" locked="no" iconified="no" closed="no"/>
+ </notebook>
+ <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
+ <item name="GtrTranslationFields" orientation="vertical" locked="no" iconified="no" closed="no"/>
</notebook>
- <paned orientation="vertical" locked="no" position="416">
- <notebook orientation="vertical" locked="no" page="0">
- <item name="GtrMessageTable" orientation="vertical" locked="no"/>
- <placeholder name="ph_top" next-placement="center"/>
- </notebook>
- <notebook orientation="vertical" locked="no" page="0">
- <item name="GtrTranslationFields" orientation="vertical" locked="no"/>
- <placeholder name="ph_center" next-placement="bottom"/>
- </notebook>
- </paned>
</paned>
- <paned orientation="vertical" locked="no" position="387">
- <item name="GtrTranslationMemoryUI" orientation="vertical" locked="no"/>
- <notebook orientation="vertical" locked="no" page="0">
- <item name="GtrContextPanel" orientation="vertical" locked="no"/>
- <item name="GtrAlternateLangPluginPanel" orientation="vertical" locked="no"/>
- <placeholder name="ph_right" next-placement="center"/>
+ <paned orientation="vertical" locked="no" iconified="no" closed="no" position="387">
+ <item name="GtrTranslationMemoryUI" orientation="vertical" locked="no" iconified="no" closed="no"/>
+ <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
+ <item name="GtrContextPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
+ <item name="GtrAlternateLangPluginPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
</notebook>
</paned>
</paned>
diff --git a/src/gtr-tab.c b/src/gtr-tab.c
index 75fbd35..2ebf60b 100644
--- a/src/gtr-tab.c
+++ b/src/gtr-tab.c
@@ -727,19 +727,14 @@ gtr_tab_init (GtrTab * tab)
gtk_widget_show (priv->dock);
gtk_box_pack_end (GTK_BOX (hbox), priv->dock, TRUE, TRUE, 0);
- dockbar = gdl_dock_bar_new (GDL_DOCK (priv->dock));
+ dockbar = gdl_dock_bar_new (G_OBJECT (priv->dock));
gtk_widget_show (dockbar);
gtk_box_pack_start (GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
- priv->layout_manager = gdl_dock_layout_new (GDL_DOCK (priv->dock));
- g_signal_connect (priv->layout_manager->master,
- "layout-changed",
- G_CALLBACK (on_layout_changed),
- tab);
-
+ priv->layout_manager = gdl_dock_layout_new (G_OBJECT (priv->dock));
g_settings_bind (priv->ui_settings,
GTR_SETTINGS_PANEL_SWITCHER_STYLE,
- priv->layout_manager->master,
+ gdl_dock_layout_get_master (priv->layout_manager),
"switcher-style",
G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
@@ -894,6 +889,9 @@ gtr_tab_dispose (GObject * object)
if (!priv->dispose_has_run)
{
+ g_signal_handlers_disconnect_by_func (gdl_dock_layout_get_master (priv->layout_manager),
+ G_CALLBACK (on_layout_changed),
+ object);
save_layout (GTR_TAB (object));
priv->dispose_has_run = TRUE;
}
@@ -974,6 +972,11 @@ gtr_tab_realize (GtkWidget *widget)
g_free (filename);
tab->priv->tab_realized = TRUE;
+
+ g_signal_connect (gdl_dock_layout_get_master (tab->priv->layout_manager),
+ "layout-changed",
+ G_CALLBACK (on_layout_changed),
+ tab);
}
}

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Jan 4 13:32:30 UTC 2013 - dimstar@opensuse.org
- Update to version 2.91.6:
+ Misc bugfixes.
+ Updated translations.
- Drop gtranslator-gdl362.patch: fixed upstream.
- Replace gnome-doc-utils-devel BuildRequires with yelp-tools,
following upstreams port to the new documentation infrastructure.
-------------------------------------------------------------------
Mon Nov 26 20:23:38 UTC 2012 - dimstar@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package gtranslator
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,18 +17,16 @@
Name: gtranslator
Version: 2.91.5
Version: 2.91.6
Release: 0
Summary: A GNOME po file editor with many bells and whistles
License: GPL-3.0+
Group: Development/Tools/Other
Url: http://gtranslator.sourceforge.net
Source: http://download.gnome.org/sources/gtranslator/2.91/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gtranslator-gdl362.patch dimstar@opensuse.org -- fix build with gdl 3.6.2, taken from git.
Patch0: gtranslator-gdl362.patch
BuildRequires: fdupes
BuildRequires: gnome-doc-utils-devel
BuildRequires: intltool
BuildRequires: yelp-tools
# Not using a pkgconfig() BuildRequires, to allow building against libgda 4.0 and 5.0
BuildRequires: libgda-devel
BuildRequires: translation-update-upstream
@ -68,7 +66,6 @@ files imminently.
%lang_package
%prep
%setup -q
%patch0 -p1
translation-update-upstream
%build
@ -105,13 +102,7 @@ find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print
%files
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS
%dir %{_datadir}/gnome/
%dir %{_datadir}/gnome/help/
%dir %{_datadir}/gnome/help/%{name}/
%doc %{_datadir}/gnome/help/%{name}/C/
%dir %{_datadir}/omf/
%dir %{_datadir}/omf/%{name}/
%doc %{_datadir}/omf/%{name}/%{name}-C.omf
%doc %{_datadir}/help/C/%{name}/
%doc %{_mandir}/man?/*
%{_bindir}/%{name}
%{_libdir}/%{name}/