Hello community, here is the log from the commit of package nemo for openSUSE:Factory checked in at 2017-11-21 15:35:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nemo (Old) and /work/SRC/openSUSE:Factory/.nemo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nemo" Tue Nov 21 15:35:20 2017 rev:21 rq:544088 version:3.6.4 Changes: -------- --- /work/SRC/openSUSE:Factory/nemo/nemo.changes 2017-11-19 11:12:57.555956959 +0100 +++ /work/SRC/openSUSE:Factory/.nemo.new/nemo.changes 2017-11-21 15:35:35.282217894 +0100 @@ -1,0 +2,9 @@ +Tue Nov 21 07:11:21 UTC 2017 - sor.ale...@meowr.ru + +- Update to version 3.6.4: + * nemo-window: Restore initial synchronisation of view buttons. + This was inadvertantly removed in d237626 when getting rid of + some actual unused code related to an old way view types used + to be selected. + +------------------------------------------------------------------- Old: ---- nemo-3.6.3.tar.gz New: ---- nemo-3.6.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nemo.spec ++++++ --- /var/tmp/diff_new_pack.4Vwlzs/_old 2017-11-21 15:35:36.402177311 +0100 +++ /var/tmp/diff_new_pack.4Vwlzs/_new 2017-11-21 15:35:36.402177311 +0100 @@ -20,7 +20,7 @@ %define sover 1 %define typelib typelib-1_0-Nemo-3_0 Name: nemo -Version: 3.6.3 +Version: 3.6.4 Release: 0 Summary: File browser for Cinnamon License: GPL-2.0+ ++++++ nemo-3.6.3.tar.gz -> nemo-3.6.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.6.3/configure.ac new/nemo-3.6.4/configure.ac --- old/nemo-3.6.3/configure.ac 2017-11-17 11:52:45.000000000 +0100 +++ new/nemo-3.6.4/configure.ac 2017-11-20 11:10:50.000000000 +0100 @@ -19,7 +19,7 @@ m4_define(nemo_extension_current, 5) m4_define(nemo_extension_revision, 0) -AC_INIT(nemo, 3.6.3, https://github.com/linuxmint/nemo) +AC_INIT(nemo, 3.6.4, https://github.com/linuxmint/nemo) dnl =========================================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.6.3/debian/changelog new/nemo-3.6.4/debian/changelog --- old/nemo-3.6.3/debian/changelog 2017-11-17 11:52:45.000000000 +0100 +++ new/nemo-3.6.4/debian/changelog 2017-11-20 11:10:50.000000000 +0100 @@ -1,3 +1,10 @@ +nemo (3.6.4) sylvia; urgency=medium + + [ Michael Webster ] + * nemo-window: Restore initial syncing of view buttons. This was inadvertantly removed in d23762640b48d8 while getting rid of some actual unused code related to an old way view types used to be selected. + + -- Clement Lefebvre <r...@linuxmint.com> Mon, 20 Nov 2017 10:10:17 +0000 + nemo (3.6.3) sylvia; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.6.3/src/nemo-window-manage-views.c new/nemo-3.6.4/src/nemo-window-manage-views.c --- old/nemo-3.6.3/src/nemo-window-manage-views.c 2017-11-17 11:52:45.000000000 +0100 +++ new/nemo-3.6.4/src/nemo-window-manage-views.c 2017-11-20 11:10:50.000000000 +0100 @@ -1452,6 +1452,8 @@ nemo_window_sync_up_button (window); nemo_window_sync_zoom_widgets (window); + nemo_window_sync_view_type (window); + /* Load menus from nemo extensions for this location */ nemo_window_load_extension_menus (window); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.6.3/src/nemo-window-private.h new/nemo-3.6.4/src/nemo-window-private.h --- old/nemo-3.6.3/src/nemo-window-private.h 2017-11-17 11:52:45.000000000 +0100 +++ new/nemo-3.6.4/src/nemo-window-private.h 2017-11-20 11:10:50.000000000 +0100 @@ -127,6 +127,7 @@ typedef void (*NemoBookmarkFailedCallback) (NemoWindow *window, NemoBookmark *bookmark); +void nemo_window_sync_view_type (NemoWindow *window); void nemo_window_load_extension_menus (NemoWindow *window); NemoWindowPane *nemo_window_get_next_pane (NemoWindow *window); void nemo_menus_append_bookmark_to_menu (NemoWindow *window, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.6.3/src/nemo-window-slot.c new/nemo-3.6.4/src/nemo-window-slot.c --- old/nemo-3.6.3/src/nemo-window-slot.c 2017-11-17 11:52:45.000000000 +0100 +++ new/nemo-3.6.4/src/nemo-window-slot.c 2017-11-20 11:10:50.000000000 +0100 @@ -235,6 +235,7 @@ nemo_window_pane_sync_search_widgets (slot->pane); if (slot->viewed_file != NULL) { + nemo_window_sync_view_type (window); nemo_window_load_extension_menus (window); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.6.3/src/nemo-window.c new/nemo-3.6.4/src/nemo-window.c --- old/nemo-3.6.3/src/nemo-window.c 2017-11-17 11:52:45.000000000 +0100 +++ new/nemo-3.6.4/src/nemo-window.c 2017-11-20 11:10:50.000000000 +0100 @@ -123,11 +123,6 @@ static guint signals[LAST_SIGNAL] = { 0 }; static GParamSpec *properties[NUM_PROPERTIES] = { NULL, }; -typedef struct { - NemoWindow *window; - char *id; -} ActivateViewData; - G_DEFINE_TYPE (NemoWindow, nemo_window, GTK_TYPE_APPLICATION_WINDOW); static const struct { @@ -1140,6 +1135,58 @@ * Main API */ +static void +sync_view_type_callback (NemoFile *file, + gpointer callback_data) +{ + NemoWindow *window; + NemoWindowSlot *slot; + + slot = callback_data; + window = nemo_window_slot_get_window (slot); + + if (slot == nemo_window_get_active_slot (window)) { + NemoWindowPane *pane; + const gchar *view_id; + + if (slot->content_view == NULL) { + return; + } + + pane = nemo_window_get_active_pane(window); + view_id = nemo_window_slot_get_content_view_id (slot); + + toolbar_set_view_button (toolbar_action_for_view_id (view_id), pane); + } +} + +static void +cancel_sync_view_type_callback (NemoWindowSlot *slot) +{ + nemo_file_cancel_call_when_ready (slot->viewed_file, + sync_view_type_callback, + slot); +} + +void +nemo_window_sync_view_type (NemoWindow *window) +{ + NemoWindowSlot *slot; + NemoFileAttributes attributes; + + g_return_if_fail (NEMO_IS_WINDOW (window)); + + attributes = nemo_mime_actions_get_required_file_attributes (); + + slot = nemo_window_get_active_slot (window); + + cancel_sync_view_type_callback (slot); + nemo_file_call_when_ready (slot->viewed_file, + attributes, + sync_view_type_callback, + slot); +} + void nemo_window_sync_menu_bar (NemoWindow *window) { @@ -1307,6 +1354,11 @@ G_CALLBACK (zoom_level_changed_callback), window); + /* Update displayed the selected view type in the toolbar and menu. */ + if (slot->pending_location == NULL) { + nemo_window_sync_view_type (window); + } + nemo_view_grab_focus (view); } @@ -1416,6 +1468,8 @@ nemo_file_ref (file); + cancel_sync_view_type_callback (slot); + if (slot->viewed_file != NULL) { nemo_file_monitor_remove (slot->viewed_file, slot);
