Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri Nov 28 16:14:09 CET 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-11-26 13:56:14.000000000 +0100
+++ yast2-packager/yast2-packager.changes 2008-11-28 12:19:05.000000000 +0100
@@ -1,0 +2,14 @@
+Fri Nov 28 12:17:59 CET 2008 - locilka@suse.cz
+
+- DefaultDesktop module now returns desktop name translated using
+ the current language (bnc #449818).
+- 2.17.49
+
+-------------------------------------------------------------------
+Thu Nov 27 18:19:26 CET 2008 - locilka@suse.cz
+
+- Downloading slides only once (bnc #444612).
+- Do not reset/open the slide show in inst_rpmcopy when slide show
+ dialog is already available/in use (bnc #443755).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.17.48.tar.bz2
New:
----
yast2-packager-2.17.49.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.Aj9908/_old 2008-11-28 16:11:06.000000000 +0100
+++ /var/tmp/diff_new_pack.Aj9908/_new 2008-11-28 16:11:06.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.17.48)
+# spec file for package yast2-packager (Version 2.17.49)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-packager
-Version: 2.17.48
+Version: 2.17.49
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.17.48.tar.bz2
+Source0: yast2-packager-2.17.49.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
# HTTP.ycp
@@ -78,7 +78,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.17.48
+%setup -n yast2-packager-2.17.49
%build
%{prefix}/bin/y2tool y2autoconf
@@ -114,6 +114,14 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Fri Nov 28 2008 locilka@suse.cz
+- DefaultDesktop module now returns desktop name translated using
+ the current language (bnc #449818).
+- 2.17.49
+* Thu Nov 27 2008 locilka@suse.cz
+- Downloading slides only once (bnc #444612).
+- Do not reset/open the slide show in inst_rpmcopy when slide show
+ dialog is already available/in use (bnc #443755).
* Wed Nov 26 2008 locilka@suse.cz
- Using <pre> in ProductLicense (bnc #449188).
- 2.17.48
++++++ yast2-packager-2.17.48.tar.bz2 -> yast2-packager-2.17.49.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.48/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.17.49/src/clients/inst_rpmcopy.ycp
--- old/yast2-packager-2.17.48/src/clients/inst_rpmcopy.ycp 2008-09-26 12:03:29.000000000 +0200
+++ new/yast2-packager-2.17.49/src/clients/inst_rpmcopy.ycp 2008-11-27 18:30:28.000000000 +0100
@@ -13,7 +13,7 @@
* Packages module :
* "installed"
*
- * $Id: inst_rpmcopy.ycp 51562 2008-09-26 08:21:54Z lslezak $
+ * $Id: inst_rpmcopy.ycp 53672 2008-11-27 17:31:12Z locilka $
*/
{
@@ -419,7 +419,14 @@
// we want the table
SlideShow::ShowTable();
- SlideShow::OpenDialog();
+ // Do not open a new SlideShow widget, reuse the old one instead
+ boolean required_to_open_sl_dialog = (! SlideShow::HaveSlideWidget());
+
+ // BNC #443755
+ if (required_to_open_sl_dialog) {
+ y2milestone ("SlideShow dialog not yet created");
+ SlideShow::OpenDialog();
+ }
// move the progress to the packages stage
SlideShow::MoveToStage("packages");
@@ -434,7 +441,11 @@
Pkg::PkgCommit (9999);
}
- SlideShow::CloseDialog();
+ // BNC #443755
+ if (required_to_open_sl_dialog) {
+ y2milestone ("Closing previously opened SlideShow dialog");
+ SlideShow::CloseDialog();
+ }
if (result != `abort)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.48/src/modules/DefaultDesktop.ycp new/yast2-packager-2.17.49/src/modules/DefaultDesktop.ycp
--- old/yast2-packager-2.17.48/src/modules/DefaultDesktop.ycp 2008-11-20 16:44:07.000000000 +0100
+++ new/yast2-packager-2.17.49/src/modules/DefaultDesktop.ycp 2008-11-27 19:40:38.000000000 +0100
@@ -87,6 +87,8 @@
return;
}
+ string desktop_label = (string) one_desktop_cf["label_id"]:MissingKey (one_desktop_cf, "label_id");
+
// required keys
one_desktop = $[
"desktop" : one_desktop_cf["desktop"]:MissingKey (one_desktop_cf, "desktop"),
@@ -95,7 +97,9 @@
"packages" : splitstring (one_desktop_cf["packages"]:"", " \t\n"),
"patterns" : splitstring (one_desktop_cf["patterns"]:"", " \t\n"),
"order" : one_desktop_cf["order"]:MissingKey (one_desktop_cf, "order"),
- "label" : ProductControl::GetTranslatedText ((string) one_desktop_cf["label_id"]:MissingKey (one_desktop_cf, "label_id")),
+ // BNC #449818, after switching the language name should change too
+ "label_id" : desktop_label,
+ "label" : ProductControl::GetTranslatedText (desktop_label),
];
// 'icon' in optional
@@ -105,7 +109,11 @@
// 'description' is optional
if (haskey (one_desktop_cf, "description_id")) {
- one_desktop["description"] = ProductControl::GetTranslatedText ((string) one_desktop_cf["description_id"]:"");
+ string description_id = (string) one_desktop_cf["description_id"]:"";
+
+ one_desktop["description"] = ProductControl::GetTranslatedText (description_id);
+ // BNC #449818, after switching the language description should change too
+ one_desktop["description_id"] = description_id;
}
// bnc #431251
@@ -144,8 +152,10 @@
* "desktop ID" : $[
* "desktop" : "desktop to start", // DEFAULT_WM
* "order" : integer,
- * "label" : _("Desktop Name Visible in Dialog"),
- * "description" : _("Description text of the desktop"),
+ * "label" : _("Desktop Name Visible in Dialog (localized - initial localization)"),
+ * "label_id" : _("Desktop Name Visible in Dialog (original)"),
+ * "description" : _("Description text of the desktop (localized - initial localization)"),
+ * "description_id" : _("Description text of the desktop (originale)"),
* "patterns" : ["list", "of", "related", "patterns"],
* "icon" : "some-icon", // filename from the 64x64 directory of the current theme (without .png suffix)
* ],
@@ -298,7 +308,7 @@
global string Description () {
Init();
- return all_desktops[desktop, "label"]:"";
+ return ProductControl::GetTranslatedText (all_desktops[desktop, "label_id"]:"");
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.48/src/modules/Packages.ycp new/yast2-packager-2.17.49/src/modules/Packages.ycp
--- old/yast2-packager-2.17.48/src/modules/Packages.ycp 2008-11-24 12:25:20.000000000 +0100
+++ new/yast2-packager-2.17.49/src/modules/Packages.ycp 2008-11-27 18:30:28.000000000 +0100
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 53529 2008-11-21 16:23:33Z lslezak $
+ * $Id: Packages.ycp 53672 2008-11-27 17:31:12Z locilka $
*/
{
@@ -1163,6 +1163,13 @@
Init (true);
}
+ // Do not reinitialize the SlideShow if not needed
+ // bnc #444612
+ if (size (SlideShow::GetSetup()) > 0) {
+ y2milestone ("SlideShow has been already set, skipping...");
+ return;
+ }
+
integer source = base_source_id;
string lang_long = "";
@@ -1207,6 +1214,9 @@
// no images are cached
string search_for_dir = sformat ("/%1/setup/slide/", datadir);
FindAndCopySlideDirWithoutCallbacks(our_slidedir, source, search_for_dir, lang_long, lang_short, Slides::fallback_lang);
+ // Language has to be set otherwise it uses a fallback language
+ // BNC #444612 comment #2
+ SlideShow::SetLanguage (Language::language);
// fallback solution disabled
/*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.48/VERSION new/yast2-packager-2.17.49/VERSION
--- old/yast2-packager-2.17.48/VERSION 2008-11-26 13:56:19.000000000 +0100
+++ new/yast2-packager-2.17.49/VERSION 2008-11-27 18:23:11.000000000 +0100
@@ -1 +1 @@
-2.17.48
+2.17.49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org