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

List:       kde-commits
Subject:    playground/base/plasma/applets/rssnow
From:       Alexis Ménard <darktears31 () gmail ! com>
Date:       2008-07-06 20:12:43
Message-ID: 1215375163.238390.11744.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 828855 by menard:

fix a correct default size
fix a double free when the feed has no icon


 M  +2 -0      news.cpp  
 M  +6 -3      scroller.cpp  


--- trunk/playground/base/plasma/applets/rssnow/news.cpp #828854:828855
@@ -44,6 +44,8 @@
     setHasConfigurationInterface(true);
     setBackgroundHints(DefaultBackground);
     setAcceptDrops(true);
+
+    resize(300,300);
 }
 
 News::~News()
--- trunk/playground/base/plasma/applets/rssnow/scroller.cpp #828854:828855
@@ -91,7 +91,9 @@
         Animator::self()->stopCustomAnimation(m_animid);
     }
     foreach (KIcon * icon, m_feedIcons) {
-        delete icon;
+        if (icon) {
+	   delete icon;
+	}
     }
     delete m_list;
     delete m_itemlist;
@@ -418,12 +420,13 @@
                     QPixmap p = QPixmap(icon);
                     if (!p.isNull()) {
                         m_feedIcons[icon] = new KIcon(p.scaled(16, 16));
+			data.icon = m_feedIcons[icon];
                     } else {
-                        m_feedIcons[icon] = m_feedIcons["generic"];
+			data.icon = m_feedIcons["generic"];
                     }
                 }
 
-                data.icon = m_feedIcons[icon];
+                
                 data.itemNumber = m_list->size();
                 m_list->append(data);
             }
[prev in list] [next in list] [prev in thread] [next in thread]