← Back to branch summary

~mterry/ubuntu/natty/gnome-shell/wip

« back to all changes in this revision

Viewing changes to js/ui/genericDisplay.js

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2009-09-30 23:09:56 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090930230956-7id5gx82lazdyz62
Tags: 2.27.3-0ubuntu1
https://launchpad.net/bugs/413096
* New upstream version
* debian/control:
  - depends on python since it's used in the wrapper 
    (lp: #413096)
  - updated gir requirement

Show diffs side-by-side

added added

removed removed

Lines of Context:
js/ui/genericDisplay.js
88
88
                                       spacing: DEFAULT_PADDING });
89
89
        this._infoContent.append(this._infoText, Big.BoxPackFlags.EXPAND);
90
90
 
91
 
        let global = Shell.Global.get();
92
91
        let infoIconUri = "file://" + global.imagedir + "info.svg";
93
92
        let infoIcon = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER,
94
93
                                                                      infoIconUri,
502
501
        Mainloop.idle_add(Lang.bind(this,
503
502
                                    function() {
504
503
                                        let [child, x, y, mask] = Gdk.Screen.get_default().get_root_window().get_pointer();
505
 
                                        let global = Shell.Global.get();
506
504
                                        let actor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE,
507
505
                                                                                  x, y);
508
506
                                        if (actor != null) {
709
707
        if (resetDisplayControl) {
710
708
            this.displayControl.remove_all();
711
709
            let nPages = this._list.n_pages;
 
710
            // Don't show the page indicator if there is only one page.
 
711
            if (nPages == 1)
 
712
                return;
712
713
            let pageNumber = this._list.page;
713
714
            for (let i = 0; i < nPages; i++) {
714
715
                let pageControl = new Link.Link({ color: (i == pageNumber) ? DISPLAY_CONTROL_SELECTED_COLOR : ITEM_DISPLAY_DESCRIPTION_COLOR,