fix shortcuts without modifiers beeing detected even when modifier were active

Author: jangernert

src/Widgets/MainWindow.vala

@@ -554,17 +554,18 @@ public class FeedReader.MainWindow : Gtk.ApplicationWindow
 		Gdk.ModifierType? mod;
 		string setting = Settings.keybindings().get_string(gsettingKey);
 		Gtk.accelerator_parse(setting, out key, out mod);
+		Logger.debug(gsettingKey);
 
 		if(key != null && Gdk.keyval_to_lower(event.keyval) == key)
 		{
-			if(mod == null && event.state == 0)
+			if(mod == null || mod == 0)
 			{
-				return true;
+				if(event.state == 16)
+					return true;
 			}
-			else
+			else if(mod in event.state)
 			{
-				if((event.state & mod) == mod)
-					return true;
+				return true;
 			}
 		}
 
@@ -579,31 +580,31 @@ public class FeedReader.MainWindow : Gtk.ApplicationWindow
 		if(ColumnView.get_default().searchFocused())
 			return false;
 
-		if(checkShortcut(event, "feedlist-prev"))
+		if(checkShortcut(event, "articlelist-prev"))
 		{
-			Logger.debug("shortcut: feedlist prev");
-			ColumnView.get_default().FeedListPREV();
+			Logger.debug("shortcut: articlelist prev");
+			ColumnView.get_default().ArticleListPREV();
 			return true;
 		}
 
-		if(checkShortcut(event, "feedlist-next"))
+		if(checkShortcut(event, "articlelist-next"))
 		{
-			Logger.debug("shortcut: feedlist next");
-			ColumnView.get_default().FeedListNEXT();
+			Logger.debug("shortcut: articlelist next");
+			ColumnView.get_default().ArticleListNEXT();
 			return true;
 		}
 
-		if(checkShortcut(event, "articlelist-prev"))
+		if(checkShortcut(event, "feedlist-prev"))
 		{
-			Logger.debug("shortcut: articlelist prev");
-			ColumnView.get_default().ArticleListPREV();
+			Logger.debug("shortcut: feedlist prev");
+			ColumnView.get_default().FeedListPREV();
 			return true;
 		}
 
-		if(checkShortcut(event, "articlelist-next"))
+		if(checkShortcut(event, "feedlist-next"))
 		{
-			Logger.debug("shortcut: articlelist next");
-			ColumnView.get_default().ArticleListNEXT();
+			Logger.debug("shortcut: feedlist next");
+			ColumnView.get_default().FeedListNEXT();
 			return true;
 		}