[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 109482] k3b --cdimage iso doesn't works always,
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2005-08-02 10:39:33
Message-ID: 20050802103933.10088.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
         
http://bugs.kde.org/show_bug.cgi?id=109482         
sebastian trueg de changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From sebastian trueg de  2005-08-02 12:39 -------
SVN commit 442330 by trueg:

Do not overwrite image set with --cdimage or --dvdimage when loading user defaults.

BUG: 109482


 M  +4 -0      ChangeLog  
 M  +3 -3      libk3bdevice/configure.in.in  
 M  +1 -1      src/main.cpp  
 M  +5 -3      src/misc/k3bcdimagewritingdialog.cpp  
 M  +5 -3      src/misc/k3bisoimagewritingdialog.cpp  


--- branches/stable/extragear/multimedia/k3b/ChangeLog #442329:442330
 @ -1,3 +1,7  @
+0.12.4
+======
+ * Fixed --cdimage and --dvdimage parameters.
+
 0.12.3
 ======
  * Ignore dock config from K3b versions older than 0.12
--- branches/stable/extragear/multimedia/k3b/libk3bdevice/configure.in.in \
#442329:442330  @ -36,7 +36,7  @
     fi
   fi
 
-  search_libs="$kde_libraries /usr/lib /usr/local/lib"
+  search_libs="$kde_libraries /usr/lib64 /usr/lib /usr/local/lib"
   AC_FIND_FILE(libhal.so, $search_libs, hal_libdir)
 
   if [test -r $hal_libdir/libhal.so] ; then
 @ -67,7 +67,7  @
   search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include \
/usr/local/include/dbus-1.0"  AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir)
 
-  search_incs_arch_deps="$kde_includes /usr/lib/dbus-1.0/include \
/usr/local/lib/dbus-1.0/include" +  search_incs_arch_deps="$kde_includes \
/usr/lib64/dbus-1.0/include /usr/lib/dbus-1.0/include \
/usr/local/lib/dbus-1.0/include"  AC_FIND_FILE(dbus/dbus-arch-deps.h, \
$search_incs_arch_deps, dbus_incdir_arch_deps)  
   if [test -r $dbus_incdir/dbus/dbus.h] && [test -r \
$dbus_incdir_arch_deps/dbus/dbus-arch-deps.h] ; then  @ -75,7 +75,7  @
     dbus_inc=FOUND
   fi
 
-  search_libs="$kde_libraries /usr/lib /usr/local/lib"
+  search_libs="$kde_libraries /usr/lib64 /usr/lib /usr/local/lib"
   AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir)
 
   if test -r $dbus_libdir/libdbus-1.so ; then
--- branches/stable/extragear/multimedia/k3b/src/main.cpp #442329:442330
 @ -38,7 +38,7  @
 
 #include <config.h>
 
-static const char* appVersion = "0.12.3-svn";
+static const char* appVersion = "0.12.4-svn";
 static const char* description = I18N_NOOP("A CD and DVD burning application");
 
 
--- branches/stable/extragear/multimedia/k3b/src/misc/k3bcdimagewritingdialog.cpp \
#442329:442330  @ -874,9 +874,11  @
 
   m_writerSelectionWidget->loadConfig( c );
 
-  QString image = c->readPathEntry( "image path", c->readPathEntry( "last written \
                image" ) );
-  if( QFile::exists( image ) )
-    m_editImagePath->setURL( image );
+  if( !d->imageForced ) {
+    QString image = c->readPathEntry( "image path", c->readPathEntry( "last written \
image" ) ); +    if( QFile::exists( image ) )
+      m_editImagePath->setURL( image );
+  }
 
   QString imageType = c->readEntry( "image type", "auto" );
   int x = 0;
--- branches/stable/extragear/multimedia/k3b/src/misc/k3bisoimagewritingdialog.cpp \
#442329:442330  @ -461,9 +461,11  @
 
   m_writerSelectionWidget->loadConfig( c );
 
-  QString image = c->readPathEntry( "image path", c->readPathEntry( "last written \
                image" ) );
-  if( QFile::exists( image ) )
-    m_editImagePath->setURL( image );
+  if( !d->imageForced ) {
+    QString image = c->readPathEntry( "image path", c->readPathEntry( "last written \
image" ) ); +    if( QFile::exists( image ) )
+      m_editImagePath->setURL( image );
+  }
 }


[prev in list] [next in list] [prev in thread] [next in thread]