← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.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
https://launchpad.net/bugs/1365382
https://launchpad.net/bugs/1313728
* 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

Lines of Context:
.pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c
204
204
    desktop->priv->system_font_size = pango_font_description_get_size(pfd);
205
205
    /* FIXME: this seems backwards from the documentation */
206
206
    if(!pango_font_description_get_size_is_absolute(pfd)) {
207
 
        DBG("dividing by PANGO_SCALE");
 
207
        XF_DEBUG("dividing by PANGO_SCALE");
208
208
        desktop->priv->system_font_size /= PANGO_SCALE;
209
209
    }
210
210
    XF_DEBUG("system font size is %.05f", desktop->priv->system_font_size);
336
336
    /* If the workspaces haven't been created yet there's no need to do the
337
337
     * background pixmap */
338
338
    if(desktop->priv->workspaces == NULL) {
339
 
        DBG("exiting, desktop->priv->workspaces == NULL");
 
339
        XF_DEBUG("exiting, desktop->priv->workspaces == NULL");
340
340
        return NULL;
341
341
    }
342
342
 
698
698
                              gpointer user_data)
699
699
{
700
700
    XfceDesktop *desktop = XFCE_DESKTOP(user_data);
 
701
    gint current_workspace = 0, monitor = 0, i;
701
702
 
702
703
    TRACE("entering");
703
704
 
704
705
    g_return_if_fail(XFCE_IS_WORKSPACE(workspace) && XFCE_IS_BACKDROP(backdrop));
705
706
 
706
 
    if(xfce_desktop_get_current_workspace(desktop) == xfce_workspace_get_workspace_num(workspace))
707
 
        backdrop_changed_cb(backdrop, user_data);
 
707
    current_workspace = xfce_desktop_get_current_workspace(desktop);
 
708
 
 
709
    /* Find out which monitor the backdrop is on */
 
710
    for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) {
 
711
        if(backdrop == xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i)) {
 
712
            monitor = i;
 
713
            break;
 
714
        }
 
715
    }
 
716
 
 
717
    if(xfce_desktop_get_current_workspace(desktop) == xfce_workspace_get_workspace_num(workspace)) {
 
718
        /* Update the backdrop!
 
719
         * In spanning mode, ignore updates to monitors other than the primary
 
720
         */
 
721
        if(!xfce_workspace_get_xinerama_stretch(workspace) || monitor == 0) {
 
722
            backdrop_changed_cb(backdrop, user_data);
 
723
        }
 
724
    }
708
725
}
709
726
 
710
727
static void
1683
1700
 
1684
1701
    desktop->priv->single_workspace_mode = single_workspace;
1685
1702
 
1686
 
    DBG("single_workspace_mode now %s", single_workspace ? "TRUE" : "FALSE");
 
1703
    XF_DEBUG("single_workspace_mode now %s", single_workspace ? "TRUE" : "FALSE");
1687
1704
 
1688
1705
 
1689
1706
    /* If the desktop has been realized then fake a screen size change to
1701
1718
    if(workspace_num == desktop->priv->single_workspace_num)
1702
1719
        return;
1703
1720
 
1704
 
    DBG("single_workspace_num now %d", workspace_num);
 
1721
    XF_DEBUG("single_workspace_num now %d", workspace_num);
1705
1722
 
1706
1723
    desktop->priv->single_workspace_num = workspace_num;
1707
1724