← Back to branch summary

~ubuntu-branches/ubuntu/utopic/xfce4-panel/utopic-proposed

« back to all changes in this revision

Viewing changes to plugins/systray/systray-box.c

  • Committer: Package Import Robot
  • Author(s): Lionel Le Folgoc
  • Date: 2011-09-22 20:49:42 UTC
  • mfrom: (1.1.34 upstream)
  • Revision ID: package-import@ubuntu.com-20110922204942-i4ajy71ldiq17sz2
Tags: 4.8.6-0ubuntu1
https://launchpad.net/bugs/747137
* Upload pkg-xfce trunk (r6047) to oneiric, remaining Ubuntu changes:
  - debian/patches:
    + xubuntu_support-multiple-vendor-default-configs.patch: search for
      the default.xml default config in XDG_CONFIG_DIRS as well, and do
      not display the chooser dialog in this case. lp: #747137
    + series: refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/systray/systray-box.c
399
399
  border = GTK_CONTAINER (widget)->border_width;
400
400
 
401
401
  alloc_size = box->horizontal ? allocation->height : allocation->width;
 
402
 
402
403
  systray_box_size_get_max_child_size (box, alloc_size, &rows, &row_size, &offset);
403
404
 
404
 
  panel_debug_filtered (PANEL_DEBUG_SYSTRAY, "allocate rows=%d, row_size=%d, w=%d, h=%d, horiz=%s",
 
405
  panel_debug_filtered (PANEL_DEBUG_SYSTRAY, "allocate rows=%d, row_size=%d, w=%d, h=%d, horiz=%s, border=%d",
405
406
                        rows, row_size, allocation->width, allocation->height,
406
 
                        PANEL_DEBUG_BOOL (box->horizontal));
 
407
                        PANEL_DEBUG_BOOL (box->horizontal), border);
407
408
 
408
409
  /* get allocation bounds */
409
410
  x_start = allocation->x + border;