~ubuntu-branches/ubuntu/vivid/xfdesktop4/vivid-proposed

Viewing changes to src/xfdesktop-file-icon-manager.c

Committer: Package Import Robot
Author(s): Sean Davis
Date: 2014-09-15 06:24:44 UTC
mfrom: (1.5.12)
Revision ID: package-import@ubuntu.com-20140915062444-bbwf7f2smpusfgfb

Tags: 4.11.8-0ubuntu1

* New upstream development release
* Bugs fixed:
  - Infobar in desktop settings for <2 desktops (LP: #1365382)
  - Background color resets when starting settings (LP: #1313728)
  - Wallpaper spans multiple screens on reload (LP #1312577)

Show diffs side-by-side

added added

removed removed

src/xfdesktop-file-icon-manager.c

1963

g_assert(g_list_find(_alive_icon_list, obj));

1964

_alive_icon_list = g_list_remove(_alive_icon_list, obj);

1965

1966

DBG("icon finalized: '%s'", xfdesktop_icon_peek_label(XFDESKTOP_ICON(obj)));

1966

XF_DEBUG("icon finalized: '%s'", xfdesktop_icon_peek_label(XFDESKTOP_ICON(obj)));

1967

}

1968

#endif

1969

2652

2653

switch(event) {

2654

case G_FILE_MONITOR_EVENT_CHANGED:

2655

DBG("metadata file changed event");

2655

XF_DEBUG("metadata file changed event");

2656

2657

/* cool down timer so we don't call this due to multiple file

2658

* changes at the same time. */

2741

const gchar *name = g_file_info_get_name(l->data);

2742

GFile *file = g_file_get_child(fmanager->priv->folder, name);

2743

2744

DBG("got a GFileInfo: %s", g_file_info_get_display_name(l->data));

2744

XF_DEBUG("got a GFileInfo: %s", g_file_info_get_display_name(l->data));

2745

2746

xfdesktop_file_icon_manager_add_regular_icon(fmanager,

2747

file, l->data,

Older »