Author: jdsn
Date: Thu Nov 6 15:25:46 2008
New Revision: 52996
URL: http://svn.opensuse.org/viewcvs/yast?rev=52996&view=rev
Log:
split off branding packages (bnc#436644)
fix error code handling of SuseRegister
updated yastbrowser for xulrunner191
Modified:
trunk/registration/package/yast2-registration.changes
trunk/registration/src/clients/inst_suse_register.ycp
trunk/registration/src/yastbrowser/application.ini
trunk/registration/src/yastbrowser/chrome/yastbrowser.jar
trunk/registration/src/yastbrowser/components/nsCmdlineHandler.js
trunk/registration/src/yastbrowser/defaults/preferences/yastbrowser-prefs.js
trunk/registration/yast2-registration.spec.in
Modified: trunk/registration/package/yast2-registration.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=52996&r1=52995&r2=52996&view=diff
==============================================================================
--- trunk/registration/package/yast2-registration.changes (original)
+++ trunk/registration/package/yast2-registration.changes Thu Nov 6 15:25:46 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Nov 6 15:21:49 CET 2008 - jdsn@suse.de
+
+- split off branding packages (bnc#436644)
+- fix error code handling of SuseRegister
+- updated yastbrowser for xulrunner191
+
+-------------------------------------------------------------------
Wed Nov 5 14:37:32 CET 2008 - ug@suse.de
- desktop file changed
Modified: trunk/registration/src/clients/inst_suse_register.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_suse_register.ycp?rev=52996&r1=52995&r2=52996&view=diff
==============================================================================
--- trunk/registration/src/clients/inst_suse_register.ycp (original)
+++ trunk/registration/src/clients/inst_suse_register.ycp Thu Nov 6 15:25:46 2008
@@ -1002,9 +1002,10 @@
// show a message when there are no products to register
- if ( SRstatus == 101 )
+ if ( SRstatus == 100 || SRstatus == 101 )
{
Popup::Message(no_product_msg);
+ y2error("No products to be registered. SuseRegister returned with exit code: %1", SRstatus);
loopend = true;
}
@@ -1013,6 +1014,7 @@
if ( SRstatus == 198 )
{
Popup::Message(no_browser_msg);
+ y2error("No browser found to display registration website. SuseRegister returned with exit code: %1", SRstatus);
loopend = true;
}
@@ -1021,13 +1023,15 @@
if ( SRstatus == 113 )
{
Popup::Message(error_target_init_failed);
+ y2error("Initialization of target failed.");
loopend = true;
}
// handle any other error codes
- if ( contains([0, 1, 3, 101, 113, 198, 199], SRstatus) == false )
+ if ( contains([0, 1, 3, 100, 101, 113, 198, 199], SRstatus) == false )
{
+ y2error("An error occurred. SuseRegister exit code (or internal error status) is: %1", SRstatus);
// display error message
error_msg_details = YSR::get_errormsg();
report_error();
Modified: trunk/registration/src/yastbrowser/application.ini
URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/yastbrowser/application.ini?rev=52996&r1=52995&r2=52996&view=diff
==============================================================================
--- trunk/registration/src/yastbrowser/application.ini (original)
+++ trunk/registration/src/yastbrowser/application.ini Thu Nov 6 15:25:46 2008
@@ -8,15 +8,15 @@
Name=Browser
;
; This field specifies your application's version. This field is optional.
-Version=0.2
+Version=0.3
;
; This field specifies your application's build ID (timestamp). This field is
; required.
-BuildID=2006082200
+BuildID=2008102400
;
; This field specifies a compact copyright notice for your application. This
; field is optional.
-Copyright=Copyright (c) 2006 SUSE Linux Products GmbH
+Copyright=Copyright (c) 2006-2008 SUSE Linux Products GmbH
;
; This ID is just an example. Every XUL app ought to have it's own unique ID.
; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
@@ -27,7 +27,7 @@
;
; This field is required. It specifies the minimum Gecko version that this
; application requires.
-MinVersion=1.8.1b1
+MinVersion=1.9
;
; This field is optional. It specifies the maximum Gecko version that this
; application requires. It should be specified if your application uses
Modified: trunk/registration/src/yastbrowser/chrome/yastbrowser.jar
URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/yastbrowser/chrome/yastbrowser.jar?rev=52996&r1=52995&r2=52996&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/registration/src/yastbrowser/components/nsCmdlineHandler.js
URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/yastbrowser/components/nsCmdlineHandler.js?rev=52996&r1=52995&r2=52996&view=diff
==============================================================================
--- trunk/registration/src/yastbrowser/components/nsCmdlineHandler.js (original)
+++ trunk/registration/src/yastbrowser/components/nsCmdlineHandler.js Thu Nov 6 15:25:46 2008
@@ -20,7 +20,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
- * Wolfgang Rosenauer