rev 8721 - in branches/kde4/packages/kdebase-workspace/debian: . patches

[Armin Berres]

Author: trigger-guest
Date: 2008-01-02 21:46:55 +0000 (Wed, 02 Jan 2008)
New Revision: 8721

Added:
   branches/kde4/packages/kdebase-workspace/debian/patches/15_fix_kdm_crash.diff
Removed:
   branches/kde4/packages/kdebase-workspace/debian/patches/15_revert_kgreeter.cpp_to_rc2.diff
Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/patches/series
Log:
* Add proper patch to fix the kdm crash.

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-02 21:39:58 UTC (rev 8720)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-02 21:46:55 UTC (rev 8721)
@@ -6,6 +6,7 @@
 
   * Update installed files.
   * Update patches.
+  * Add proper patch to fix the kdm crash.
   * Raise build-dep to >= 4:3.98.0~svn755919-1.
   * Make kdebase-workspace-data conflict with KDE 3's kdebase-data.
 

Added: branches/kde4/packages/kdebase-workspace/debian/patches/15_fix_kdm_crash.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/15_fix_kdm_crash.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/15_fix_kdm_crash.diff	2008-01-02 21:46:55 UTC (rev 8721)
@@ -0,0 +1,11 @@
+--- a/kdm/kfrontend/kgreeter.cpp
++++ b/kdm/kfrontend/kgreeter.cpp
+@@ -321,7 +321,7 @@
+ 			if (!default_pix.load( _faceDir + "/.default.face" ))
+ 				logError( "Cannot open default user face\n" );
+ 		QSize ns( 48, 48 );
+-		if (default_pix.size() != ns) {
++		if (!default_pix.isNull() && default_pix.size() != ns) {
+ 			default_pix =
+ 			  default_pix.convertToFormat( QImage::Format_ARGB32 ).scaled( ns, Qt::KeepAspectRatio, Qt::SmoothTransformation );
+ 			expandFace( default_pix );

Deleted: branches/kde4/packages/kdebase-workspace/debian/patches/15_revert_kgreeter.cpp_to_rc2.diff

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-01-02 21:39:58 UTC (rev 8720)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-01-02 21:46:55 UTC (rev 8721)
@@ -7,4 +7,4 @@
 12_be_better_at_honouring_user_kdm_theming.diff
 13_kdm_override_docs.diff
 14_correct_kde4home_for_kstartupconfig4.diff
-15_revert_kgreeter.cpp_to_rc2.diff
+15_fix_kdm_crash.diff