[uim-commit] r2957 - trunk/qt

[ekato at freedesktop.org]

Author: ekato
Date: 2006-01-20 19:12:37 -0800 (Fri, 20 Jan 2006)
New Revision: 2957

Modified:
   trunk/qt/pref-customwidgets.cpp
Log:
* qt/pref-customwidgets.cpp (CustomPathnameEdit::update) : Follow
  the change in uim-custom's pathname structure.
(CustomPathnameEdit::setDefault) : Ditto.
(CustomPathnameEdit::slotCustomTextChanged) : Ditto.


Modified: trunk/qt/pref-customwidgets.cpp
===================================================================
--- trunk/qt/pref-customwidgets.cpp	2006-01-21 02:57:49 UTC (rev 2956)
+++ trunk/qt/pref-customwidgets.cpp	2006-01-21 03:12:37 UTC (rev 2957)
@@ -181,7 +181,7 @@
     if( !m_custom || m_custom->type != UCustom_Pathname )
         return;
 
-    m_lineEdit->setText( _FU8(m_custom->value->as_pathname) );
+    m_lineEdit->setText( _FU8(m_custom->value->as_pathname->str) );
 
     /* sync with Label */
     parentWidget()->setEnabled( m_custom->is_active );
@@ -189,8 +189,9 @@
 
 void CustomPathnameEdit::setDefault()
 {
-    free( m_custom->value->as_pathname );
-    m_custom->value->as_pathname = strdup( m_custom->default_value->as_pathname );
+    free( m_custom->value->as_pathname->str );
+    m_custom->value->as_pathname->str = strdup( m_custom->default_value->as_pathname->str );
+    m_custom->value->as_pathname->type = m_custom->default_value->as_pathname->type;
 
     setCustom( m_custom );
     update();
@@ -218,8 +219,8 @@
 {
     Q_ASSERT( m_custom->type == UCustom_Pathname );
 
-    free( m_custom->value->as_pathname );
-    m_custom->value->as_pathname = strdup( (const char*)text.utf8() );
+    free( m_custom->value->as_pathname->str );
+    m_custom->value->as_pathname->str = strdup( (const char*)text.utf8() );
 
     setCustom( m_custom );
 }