Mailinglist Archive: yast-commit (650 mails)

< Previous Next >
[yast-commit] r55550 - in /branches/SuSE-Code-11-Branch/ncurses: VERSION package/yast2-ncurses.changes src/NCAskForDirectory.cc src/NCAskForFile.cc src/NCDialog.cc src/NCFileSelection.cc
  • From: gs@xxxxxxxxxxxxxxxx
  • Date: Tue, 17 Feb 2009 13:29:10 -0000
  • Message-id: <E1LZQ0c-00020P-5O@xxxxxxxxxxxxxxxx>
Author: gs
Date: Tue Feb 17 14:29:09 2009
New Revision: 55550

URL: http://svn.opensuse.org/viewcvs/yast?rev=55550&view=rev
Log:
don't set textdomain to "ncurses" in constructor of NCDialog,
reset textdomain "ncurses" in NCFileSelection (bnc#476245)

Modified:
branches/SuSE-Code-11-Branch/ncurses/VERSION
branches/SuSE-Code-11-Branch/ncurses/package/yast2-ncurses.changes
branches/SuSE-Code-11-Branch/ncurses/src/NCAskForDirectory.cc
branches/SuSE-Code-11-Branch/ncurses/src/NCAskForFile.cc
branches/SuSE-Code-11-Branch/ncurses/src/NCDialog.cc
branches/SuSE-Code-11-Branch/ncurses/src/NCFileSelection.cc

Modified: branches/SuSE-Code-11-Branch/ncurses/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses/VERSION?rev=55550&r1=55549&r2=55550&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/ncurses/VERSION (original)
+++ branches/SuSE-Code-11-Branch/ncurses/VERSION Tue Feb 17 14:29:09 2009
@@ -1 +1 @@
-2.17.13
+2.17.14

Modified: branches/SuSE-Code-11-Branch/ncurses/package/yast2-ncurses.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses/package/yast2-ncurses.changes?rev=55550&r1=55549&r2=55550&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/ncurses/package/yast2-ncurses.changes
(original)
+++ branches/SuSE-Code-11-Branch/ncurses/package/yast2-ncurses.changes Tue Feb
17 14:29:09 2009
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Feb 17 12:37:56 CET 2009 - gs@xxxxxxx
+
+- Don't set textdomain to "ncurses" in constructor of NCDialog
+ (would overwrite other textdomains) bnc#476245
+- V 2.17.14
+
+-------------------------------------------------------------------
Tue Jan 20 16:34:33 CET 2009 - kmachalkova@xxxxxxx

- Table widget: two variants of addItem method (all-at-once and

Modified: branches/SuSE-Code-11-Branch/ncurses/src/NCAskForDirectory.cc
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses/src/NCAskForDirectory.cc?rev=55550&r1=55549&r2=55550&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/ncurses/src/NCAskForDirectory.cc (original)
+++ branches/SuSE-Code-11-Branch/ncurses/src/NCAskForDirectory.cc Tue Feb 17
14:29:09 2009
@@ -50,7 +50,6 @@
, detailed( 0 )
{
createLayout( iniDir, headline );
- setTextdomain( "ncurses" );
}


@@ -62,6 +61,9 @@
void NCAskForExistingDirectory::createLayout( const string & iniDir,
const string & headline )
{
+ string old_textdomain = textdomain( NULL );
+ setTextdomain( "ncurses" );
+
// the vertical split is the (only) child of the dialog
NCLayoutBox * split = new NCLayoutBox( this, YD_VERT );

@@ -113,6 +115,8 @@
cancelButton->setStretchable( YD_HORIZ, true );

new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 );
+ // restore former text domain
+ setTextdomain( old_textdomain.c_str() );
}



Modified: branches/SuSE-Code-11-Branch/ncurses/src/NCAskForFile.cc
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses/src/NCAskForFile.cc?rev=55550&r1=55549&r2=55550&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/ncurses/src/NCAskForFile.cc (original)
+++ branches/SuSE-Code-11-Branch/ncurses/src/NCAskForFile.cc Tue Feb 17
14:29:09 2009
@@ -52,7 +52,7 @@
, fileList( 0 )
, fileName( 0 )
{
- setTextdomain( "ncurses" );
+
}


@@ -103,7 +103,9 @@
bool edit )
{
string startDir;
-
+ string old_textdomain = textdomain( NULL );
+ setTextdomain( "ncurses" );
+
startDir = checkIniDir( iniDir );

// the vertical split is the (only) child of the dialog
@@ -195,6 +197,8 @@
cancelButton->setStretchable( YD_HORIZ, true );

new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 );
+ // restore former text domain
+ setTextdomain( old_textdomain.c_str() );
}



Modified: branches/SuSE-Code-11-Branch/ncurses/src/NCDialog.cc
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses/src/NCDialog.cc?rev=55550&r1=55549&r2=55550&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/ncurses/src/NCDialog.cc (original)
+++ branches/SuSE-Code-11-Branch/ncurses/src/NCDialog.cc Tue Feb 17 14:29:09
2009
@@ -75,7 +75,8 @@
void NCDialog::_init()
{
NCurses::RememberDlg( this );
- setTextdomain( "ncurses" );
+ // don't set text domain to ncurses - other text domains won't work (bnc
#476245)
+ // setTextdomain( "ncurses" );
_init_size();
wstate = NC::WSdumb;


Modified: branches/SuSE-Code-11-Branch/ncurses/src/NCFileSelection.cc
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses/src/NCFileSelection.cc?rev=55550&r1=55549&r2=55550&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/ncurses/src/NCFileSelection.cc (original)
+++ branches/SuSE-Code-11-Branch/ncurses/src/NCFileSelection.cc Tue Feb 17
14:29:09 2009
@@ -170,7 +170,7 @@
, tableType( type )
{
SetSepChar( ' ' );
- setTextdomain( "ncurses" );
+ //setTextdomain( "ncurses" );

struct stat64 statInfo;

@@ -424,7 +424,9 @@
void NCFileTable::fillHeader( )
{
vector<string> header;
-
+ string old_textdomain = textdomain(NULL);
+ setTextdomain( "ncurses" );
+
switch ( tableType )
{
case T_Overview:
@@ -463,6 +465,8 @@
}

setHeader( header );
+ // restore former text domain
+ setTextdomain( old_textdomain.c_str() );
}


@@ -652,7 +656,9 @@
void NCDirectoryTable::fillHeader()
{
vector<string> header;
-
+ string old_textdomain = textdomain(NULL);
+ setTextdomain( "ncurses" );
+
switch ( tableType )
{
case T_Overview:
@@ -686,6 +692,8 @@
}

setHeader( header );
+ // restore former text domain
+ setTextdomain( old_textdomain.c_str() );
}



--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages