← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/evince/oneiric-updates

« back to all changes in this revision

Viewing changes to shell/ev-utils.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya, Josselin Mouette, Rodrigo Moya
  • Date: 2011-05-19 12:12:42 UTC
  • mfrom: (1.1.65 upstream) (1.3.6 experimental)
  • Revision ID: james.westby@ubuntu.com-20110519121242-967hbn2nh2hunp4y
Tags: 3.0.0-4ubuntu1
http://bugs.debian.org/619564
http://bugs.debian.org/627027
http://bugs.debian.org/551734
http://bugs.debian.org/581441
[ Josselin Mouette ]
* bug-presubj: please document where to report rendering bugs.
* evince.mime: dropped. We have desktop files to handle MIME 
  associations, no need to maintain an alternate system by hand.
  Closes: #619564, #627027, #551734, #581441.

[ Rodrigo Moya ]
* Rebase from Debian and GNOME3 PPA (thanks to Rico Tzschichholz).
  Remaining Ubuntu changes:
* debian/apparmor-profile:
* debian/apparmor-profile.abstraction:
* debian/evince.apport:
* debian/evince-common.dirs:
* debian/evince-common.postinst:
* debian/evince-common.postrm:
  - Add apparmor profile
* debian/control:
  - Build-Depend on debhelper (>= 7.4.20ubuntu5), gnome-common,
    hardening-includes and liblaunchpad-integration-3.0-dev
  - Standards-Version is 3.9.1
  - Depend on apparmor
* debian/rules:
  - Include hardening.make
  - Add rule to install apparmor files
* debian/watch:
  - Watch unstable series
* debian/patches/01_lpi.patch:
  - Launchpad integration patch
* debian/patches/04_gold.patch:
  - Link against libz
* debian/patches/05_library-path.patch:
  - Fix library path for g-ir-scanner

Show diffs side-by-side

added added

removed removed

Lines of Context:
shell/ev-utils.c
225
225
 
226
226
        g_return_if_fail (widget != NULL);
227
227
 
228
 
        gtk_widget_size_request (GTK_WIDGET (menu), &req);
 
228
        gtk_widget_get_preferred_size (GTK_WIDGET (menu), &req, NULL);
229
229
 
230
230
        monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y);
231
231
        gtk_menu_set_monitor (menu, monitor_num);
251
251
        GtkAllocation allocation;
252
252
        GdkRectangle visible;
253
253
 
254
 
        gtk_widget_size_request (GTK_WIDGET (menu), &req);
 
254
        gtk_widget_get_preferred_size (GTK_WIDGET (menu), &req, NULL);
255
255
        gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
256
256
        gtk_widget_get_allocation (widget, &allocation);
257
257