Hello community,

here is the log from the commit of package yast2-control-center for 
openSUSE:Factory checked in at 2018-05-17 19:32:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-control-center (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-control-center"

Thu May 17 19:32:01 2018 rev:71 rq:607427 version:4.1.0

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/yast2-control-center/yast2-control-center.changes    
    2018-03-04 11:50:48.230034614 +0100
+++ 
/work/SRC/openSUSE:Factory/.yast2-control-center.new/yast2-control-center.changes
   2018-05-17 19:32:05.257961737 +0200
@@ -1,0 +2,13 @@
+Mon May 14 13:36:00 UTC 2018 - lsle...@suse.cz
+
+- Fixed crash when reading an invalid or incomplete .desktop file
+  (bsc#1090843)
+- 4.1.0
+
+-------------------------------------------------------------------
+Fri May 11 00:03:28 UTC 2018 - hel...@opensuse.org
+
+- Fix Gnome's display of titles/icons (boo#1092845)
+- 4.0.3
+
+-------------------------------------------------------------------

Old:
----
  yast2-control-center-4.0.2.tar.bz2

New:
----
  yast2-control-center-4.1.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.050Lgf/_old  2018-05-17 19:32:05.893938502 +0200
+++ /var/tmp/diff_new_pack.050Lgf/_new  2018-05-17 19:32:05.897938356 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-control-center
-Version:        4.0.2
+Version:        4.1.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-control-center-4.0.2.tar.bz2 -> yast2-control-center-4.1.0.tar.bz2 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-control-center-4.0.2/package/yast2-control-center.changes 
new/yast2-control-center-4.1.0/package/yast2-control-center.changes
--- old/yast2-control-center-4.0.2/package/yast2-control-center.changes 
2018-03-02 09:44:19.000000000 +0100
+++ new/yast2-control-center-4.1.0/package/yast2-control-center.changes 
2018-05-15 10:03:39.000000000 +0200
@@ -1,4 +1,17 @@
 -------------------------------------------------------------------
+Mon May 14 13:36:00 UTC 2018 - lsle...@suse.cz
+
+- Fixed crash when reading an invalid or incomplete .desktop file
+  (bsc#1090843)
+- 4.1.0
+
+-------------------------------------------------------------------
+Fri May 11 00:03:28 UTC 2018 - hel...@opensuse.org
+
+- Fix Gnome's display of titles/icons (boo#1092845)
+- 4.0.3
+
+-------------------------------------------------------------------
 Fri Mar  2 08:04:29 UTC 2018 - jreidin...@suse.com
 
 - Use yast2-control-center as replacement for dropped
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-control-center-4.0.2/package/yast2-control-center.spec 
new/yast2-control-center-4.1.0/package/yast2-control-center.spec
--- old/yast2-control-center-4.0.2/package/yast2-control-center.spec    
2018-03-02 09:44:19.000000000 +0100
+++ new/yast2-control-center-4.1.0/package/yast2-control-center.spec    
2018-05-15 10:03:39.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-control-center
-Version:        4.0.2
+Version:        4.1.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-control-center-4.0.2/src/main.cpp 
new/yast2-control-center-4.1.0/src/main.cpp
--- old/yast2-control-center-4.0.2/src/main.cpp 2018-03-02 09:44:19.000000000 
+0100
+++ new/yast2-control-center-4.1.0/src/main.cpp 2018-05-15 10:03:39.000000000 
+0200
@@ -83,7 +83,14 @@
 
     mainWin.setFullScreen ( fullscreen );
     mainWin.setNoBorder( noborder );
-    mainWin.setWindowIcon( QIcon( "/usr/share/pixmaps/yast.png"  ) );
+    if (QIcon::hasThemeIcon("yast"))
+    {
+       mainWin.setWindowIcon( QIcon::fromTheme( "yast" ) );
+    }
+    else
+    {
+       mainWin.setWindowIcon( QIcon( "/usr/share/pixmaps/yast.png"  ) );
+    }
 
     if ( fullscreen )
     {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-control-center-4.0.2/src/main_window.cpp 
new/yast2-control-center-4.1.0/src/main_window.cpp
--- old/yast2-control-center-4.0.2/src/main_window.cpp  2018-03-02 
09:44:19.000000000 +0100
+++ new/yast2-control-center-4.1.0/src/main_window.cpp  2018-05-15 
10:03:39.000000000 +0200
@@ -416,6 +416,7 @@
        }
     }
     setWindowTitle( title );
+    QCoreApplication::setApplicationName( title );
 }
 
 void MainWindow::closeEvent (QCloseEvent *event)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-control-center-4.0.2/src/yqdesktopfilesmodel.h 
new/yast2-control-center-4.1.0/src/yqdesktopfilesmodel.h
--- old/yast2-control-center-4.0.2/src/yqdesktopfilesmodel.h    2018-03-02 
09:44:19.000000000 +0100
+++ new/yast2-control-center-4.1.0/src/yqdesktopfilesmodel.h    2018-05-15 
10:03:39.000000000 +0200
@@ -41,6 +41,9 @@
 // desktop file -> properties
 typedef QMap<QString, PropertyMap > PropertyMapCache;
 typedef QMapIterator<QString, PropertyMap> PropertyMapCacheIterator;
+// mutable iterator, if you do not need to add/remove values use
+// PropertyMapCacheIterator, it's more efficient
+typedef QMutableMapIterator<QString, PropertyMap> 
PropertyMapCacheMutableIterator;
 
 class cmp;
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-control-center-4.0.2/src/yqmodulesmodel.cpp 
new/yast2-control-center-4.1.0/src/yqmodulesmodel.cpp
--- old/yast2-control-center-4.0.2/src/yqmodulesmodel.cpp       2018-03-02 
09:44:19.000000000 +0100
+++ new/yast2-control-center-4.1.0/src/yqmodulesmodel.cpp       2018-05-15 
10:03:39.000000000 +0200
@@ -227,6 +227,32 @@
        groups <<  groupsModel()->groupId( idx );
     }
 
+    // filter out the .desktop files with unknown or missing group otherwise 
grouping aborts later
+    PropertyMapCacheMutableIterator it(d->cache);
+    while ( it.hasNext() )
+    {
+        it.next();
+
+        if ( !it.value().contains("X-SuSE-YaST-Group") )
+        {
+            QString file = it.key();
+            qWarning() << "Warning: Skipping file" << file << ": missing group 
attribute (X-SuSE-YaST-Group)";
+            d->desktop_files.removeAll( file );
+            it.remove();
+            continue;
+        }
+
+        QString group = it.value().value("X-SuSE-YaST-Group").toString();
+        if ( !groups.contains( group ) )
+        {
+            QString file = it.key();
+            qWarning() << "Warning: Skipping file" << file << ": unknown group 
(X-SuSE-YaST-Group)" << group
+                << "- currently defined groups:" << groups;
+            d->desktop_files.removeAll( file );
+            it.remove();
+        }
+    }
+
     QStringListIterator  git(groups);
     while (git.hasNext())
     {


Reply via email to