Hello community, here is the log from the commit of package cinnamon-menus for openSUSE:Factory checked in at 2018-05-11 09:15:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-menus (Old) and /work/SRC/openSUSE:Factory/.cinnamon-menus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-menus" Fri May 11 09:15:49 2018 rev:9 rq:605843 version:3.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-menus/cinnamon-menus.changes 2018-04-26 13:37:07.602069556 +0200 +++ /work/SRC/openSUSE:Factory/.cinnamon-menus.new/cinnamon-menus.changes 2018-05-11 09:16:07.839176928 +0200 @@ -1,0 +2,9 @@ +Thu May 8 20:40:20 UTC 2018 - [email protected] + +- Update to version 3.8.1: + * Check for a valid GDesktopAppInfo before calling + GDesktopAppInfo methods. Fix retry handling to only apply to + new entries. Use g_timeout_add instead of g_idle_add for change + signal accumulation. + +------------------------------------------------------------------- Old: ---- cinnamon-menus-3.8.0.tar.gz New: ---- cinnamon-menus-3.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-menus.spec ++++++ --- /var/tmp/diff_new_pack.6oy8V2/_old 2018-05-11 09:16:08.567150554 +0200 +++ /var/tmp/diff_new_pack.6oy8V2/_new 2018-05-11 09:16:08.571150409 +0200 @@ -20,7 +20,7 @@ %define soname libcinnamon-menu-3 %define sover 0 Name: cinnamon-menus -Version: 3.8.0 +Version: 3.8.1 Release: 0 Summary: A menu system for the Cinnamon Desktop License: LGPL-2.1-or-later ++++++ cinnamon-menus-3.8.0.tar.gz -> cinnamon-menus-3.8.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-3.8.0/configure.ac new/cinnamon-menus-3.8.1/configure.ac --- old/cinnamon-menus-3.8.0/configure.ac 2018-04-16 13:17:54.000000000 +0200 +++ new/cinnamon-menus-3.8.1/configure.ac 2018-05-06 15:39:07.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ(2.62) -AC_INIT([cinnamon-menus], [3.8.0]) +AC_INIT([cinnamon-menus], [3.8.1]) AC_CONFIG_SRCDIR(libmenu/gmenu-tree.h) m4_ifdef([AX_IS_RELEASE], [AX_IS_RELEASE([always])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-3.8.0/debian/changelog new/cinnamon-menus-3.8.1/debian/changelog --- old/cinnamon-menus-3.8.0/debian/changelog 2018-04-16 13:17:54.000000000 +0200 +++ new/cinnamon-menus-3.8.1/debian/changelog 2018-05-06 15:39:07.000000000 +0200 @@ -1,3 +1,10 @@ +cinnamon-menus (3.8.1) tara; urgency=medium + + [ Michael Webster ] + * Check for a valid GDesktopAppInfo before calling GDesktopAppInfo methods. Fix retry handling to only apply to new entries. Use g_timeout_add instead of g_idle_add for change signal accumulation. + + -- Clement Lefebvre <[email protected]> Sun, 06 May 2018 14:38:48 +0100 + cinnamon-menus (3.8.0) tara; urgency=medium * Add CI configuration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-3.8.0/libmenu/desktop-entries.c new/cinnamon-menus-3.8.1/libmenu/desktop-entries.c --- old/cinnamon-menus-3.8.0/libmenu/desktop-entries.c 2018-04-16 13:17:54.000000000 +0200 +++ new/cinnamon-menus-3.8.1/libmenu/desktop-entries.c 2018-05-06 15:39:07.000000000 +0200 @@ -275,9 +275,7 @@ const char *categories_str; entry_desktop->appinfo = g_desktop_app_info_new_from_filename (entry->path); - if (!entry_desktop->appinfo || - !g_app_info_get_name (G_APP_INFO (entry_desktop->appinfo)) || - !g_app_info_get_executable (G_APP_INFO (entry_desktop->appinfo))) + if (!G_IS_DESKTOP_APP_INFO (((DesktopEntryDesktop*)entry)->appinfo)) { menu_verbose ("Failed to load \"%s\"\n", entry->path); return DESKTOP_ENTRY_LOAD_FAIL_APPINFO; @@ -573,7 +571,11 @@ desktop_entry_get_name (DesktopEntry *entry) { if (entry->type == DESKTOP_ENTRY_DESKTOP) - return g_app_info_get_name (G_APP_INFO (((DesktopEntryDesktop*)entry)->appinfo)); + { + g_return_val_if_fail (G_IS_DESKTOP_APP_INFO (((DesktopEntryDesktop*)entry)->appinfo), NULL); + return g_app_info_get_name (G_APP_INFO (((DesktopEntryDesktop*)entry)->appinfo)); + } + return ((DesktopEntryDirectory*)entry)->name; } @@ -581,7 +583,11 @@ desktop_entry_get_generic_name (DesktopEntry *entry) { if (entry->type == DESKTOP_ENTRY_DESKTOP) - return g_desktop_app_info_get_generic_name (((DesktopEntryDesktop*)entry)->appinfo); + { + g_return_val_if_fail (G_IS_DESKTOP_APP_INFO (((DesktopEntryDesktop*)entry)->appinfo), NULL); + return g_desktop_app_info_get_generic_name (((DesktopEntryDesktop*)entry)->appinfo); + } + return ((DesktopEntryDirectory*)entry)->generic_name; } @@ -589,7 +595,11 @@ desktop_entry_get_comment (DesktopEntry *entry) { if (entry->type == DESKTOP_ENTRY_DESKTOP) - return g_app_info_get_description (G_APP_INFO (((DesktopEntryDesktop*)entry)->appinfo)); + { + g_return_val_if_fail (G_IS_DESKTOP_APP_INFO (((DesktopEntryDesktop*)entry)->appinfo), NULL); + return g_app_info_get_description (G_APP_INFO (((DesktopEntryDesktop*)entry)->appinfo)); + } + return ((DesktopEntryDirectory*)entry)->comment; } @@ -597,7 +607,11 @@ desktop_entry_get_icon (DesktopEntry *entry) { if (entry->type == DESKTOP_ENTRY_DESKTOP) - return g_app_info_get_icon (G_APP_INFO (((DesktopEntryDesktop*)entry)->appinfo)); + { + g_return_val_if_fail (G_IS_DESKTOP_APP_INFO (((DesktopEntryDesktop*)entry)->appinfo), NULL); + return g_app_info_get_icon (G_APP_INFO (((DesktopEntryDesktop*)entry)->appinfo)); + } + return ((DesktopEntryDirectory*)entry)->icon; } @@ -605,7 +619,11 @@ desktop_entry_get_no_display (DesktopEntry *entry) { if (entry->type == DESKTOP_ENTRY_DESKTOP) - return g_desktop_app_info_get_nodisplay (((DesktopEntryDesktop*)entry)->appinfo); + { + g_return_val_if_fail (G_IS_DESKTOP_APP_INFO (((DesktopEntryDesktop*)entry)->appinfo), FALSE); + return g_desktop_app_info_get_nodisplay (((DesktopEntryDesktop*)entry)->appinfo); + } + return ((DesktopEntryDirectory*)entry)->nodisplay; } @@ -613,7 +631,11 @@ desktop_entry_get_hidden (DesktopEntry *entry) { if (entry->type == DESKTOP_ENTRY_DESKTOP) - return g_desktop_app_info_get_is_hidden (((DesktopEntryDesktop*)entry)->appinfo); + { + g_return_val_if_fail (G_IS_DESKTOP_APP_INFO (((DesktopEntryDesktop*)entry)->appinfo), FALSE); + return g_desktop_app_info_get_is_hidden (((DesktopEntryDesktop*)entry)->appinfo); + } + return ((DesktopEntryDirectory*)entry)->hidden; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-3.8.0/libmenu/entry-directories.c new/cinnamon-menus-3.8.1/libmenu/entry-directories.c --- old/cinnamon-menus-3.8.0/libmenu/entry-directories.c 2018-04-16 13:17:54.000000000 +0200 +++ new/cinnamon-menus-3.8.1/libmenu/entry-directories.c 2018-05-06 15:39:07.000000000 +0200 @@ -353,9 +353,9 @@ if (strcmp (desktop_entry_get_basename (tmp->data), basename) == 0) { if (!desktop_entry_reload (tmp->data)) - { - dir->entries = g_slist_delete_link (dir->entries, tmp); - } + { + dir->entries = g_slist_delete_link (dir->entries, tmp); + } return TRUE; } @@ -363,7 +363,7 @@ tmp = tmp->next; } - return cached_dir_add_entry (dir, basename, path); + return FALSE; } static gboolean @@ -520,10 +520,12 @@ cached_dir_queue_monitor_event (dir->parent); } - if (monitors_idle_handler == 0) + if (monitors_idle_handler > 0) { - monitors_idle_handler = g_idle_add ((GSourceFunc) emit_monitors_in_idle, NULL); + g_source_remove (monitors_idle_handler); } + + monitors_idle_handler = g_timeout_add (100, (GSourceFunc) emit_monitors_in_idle, NULL); } static void @@ -550,6 +552,8 @@ switch (event) { case MENU_MONITOR_EVENT_CREATED: + handled = cached_dir_add_entry (dir, basename, path); + break; case MENU_MONITOR_EVENT_CHANGED: handled = cached_dir_update_entry (dir, basename, path); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-3.8.0/libmenu/menu-monitor.c new/cinnamon-menus-3.8.1/libmenu/menu-monitor.c --- old/cinnamon-menus-3.8.0/libmenu/menu-monitor.c 2018-04-16 13:17:54.000000000 +0200 +++ new/cinnamon-menus-3.8.1/libmenu/menu-monitor.c 2018-05-06 15:39:07.000000000 +0200 @@ -146,10 +146,12 @@ { pending_events = g_slist_append (pending_events, event_info); - if (events_idle_handler == 0) + if (events_idle_handler > 0) { - events_idle_handler = g_idle_add ((GSourceFunc) emit_events_in_idle, NULL); + g_source_remove (events_idle_handler); } + + events_idle_handler = g_timeout_add (100, (GSourceFunc) emit_events_in_idle, NULL); } static inline char *
