Merge branch 'master' into datetime

Also make the calendar work when there are many all-day events shown. See

 http://people.freedesktop.org/~david/many-all-day-events.png

for details.

Signed-off-by: David Zeuthen <davidz@redhat.com>

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[2.91.6],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[2.91.5],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -68,8 +68,7 @@ GTK_MIN_VERSION=2.91.7
 GIO_MIN_VERSION=2.25.9
 LIBECAL_REQUIRED=1.6.0
 LIBEDATASERVER_REQUIRED=1.2.0
-LIBEDATASERVERUI2_REQUIRED=1.2.0
+LIBEDATASERVERUI_REQUIRED=1.2.0
-LIBEDATASERVERUI3_REQUIRED=2.91.6
 
 
 # Collect more than 20 libraries for a prize!
@@ -118,13 +117,7 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 2.90.0],
 	 AC_SUBST([HAVE_BLUETOOTH],[0])
 	 AC_MSG_RESULT([no])])
 
-# Default to libedataserverui-3.0, but allow falling back to 1.2
+PKG_CHECK_MODULES(LIBECAL, libecal-1.2 >= $LIBECAL_REQUIRED libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED libedataserverui-1.2 >= $LIBEDATASERVERUI_REQUIRED)
-PKG_CHECK_EXISTS(libedataserverui-3.0,
-                 [EDS_API=3.0
-                  LIBEDATASERVERUI_REQUIRED=$LIBEDATASERVERUI3_REQUIRED],
-                 [EDS_API=1.2
-                  LIBEDATASERVERUI_REQUIRED=$LIBEDATASERVERUI2_REQUIRED])
-PKG_CHECK_MODULES(LIBECAL, libecal-1.2 >= $LIBECAL_REQUIRED libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED libedataserverui-$EDS_API >= $LIBEDATASERVERUI_REQUIRED)
 AC_SUBST(LIBECAL_CFLAGS)
 AC_SUBST(LIBECAL_LIBS)
 

js/ui/altTab.js

@@ -15,7 +15,7 @@ const POPUP_APPICON_SIZE = 96;
 const POPUP_SCROLL_TIME = 0.10; // seconds
 const POPUP_FADE_TIME = 0.1; // seconds
 
-const APP_ICON_HOVER_TIMEOUT = 200; // milliseconds
+const APP_ICON_HOVER_TIMEOUT = 750; // milliseconds
 
 const DISABLE_HOVER_TIMEOUT = 500; // milliseconds
 

js/ui/boxpointer.js

@@ -27,7 +27,6 @@ BoxPointer.prototype = {
     _init: function(arrowSide, binProperties) {
         this._arrowSide = arrowSide;
         this._arrowOrigin = 0;
-        this._arrowCorner = null;
         this.actor = new St.Bin({ x_fill: true,
                                   y_fill: true });
         this._container = new Shell.GenericContainer();
@@ -213,140 +212,47 @@ BoxPointer.prototype = {
             cr.translate(rise, 0);
         }
 
-        let [x1, y1] = [halfBorder, halfBorder];
+        cr.moveTo(borderRadius, halfBorder);
-        let [x2, y2] = [boxWidth - halfBorder, boxHeight - halfBorder];
 
-        cr.moveTo(x1 + borderRadius, y1);
         if (this._arrowSide == St.Side.TOP) {
-            if (this._arrowCorner == St.Corner.TOPLEFT) {
+            cr.lineTo(this._arrowOrigin - halfBase, halfBorder);
-                cr.moveTo(x1, y1);
+            cr.lineTo(this._arrowOrigin, halfBorder - rise);
-                cr.lineTo(x1, y1 - rise);
+            cr.lineTo(this._arrowOrigin + halfBase, halfBorder);
-                cr.lineTo(x1 + halfBase, y1);
+        }
-                cr.lineTo(x2 - borderRadius, y1);
+        cr.lineTo(boxWidth - borderRadius, halfBorder);
-            } else if (this._arrowCorner == St.Corner.TOPRIGHT) {
-                cr.lineTo(x2 - halfBase, y1);
-                cr.lineTo(x2, y1 - rise);
-            } else if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
-                cr.lineTo(this._arrowOrigin, y1);
-                cr.lineTo(this._arrowOrigin, y1 - rise);
-                cr.lineTo(this._arrowOrigin + halfBase, y1);
-                cr.lineTo(x2 - borderRadius, y1);
-            } else if (this._arrowOrigin > (x2 - (borderRadius + halfBase))) {
-                cr.lineTo(this._arrowOrigin - halfBase, y1);
-                cr.lineTo(this._arrowOrigin, y1 - rise);
-                cr.lineTo(this._arrowOrigin, y1);
-                cr.lineTo(x2 - borderRadius, y1);
-            } else {
-                cr.lineTo(this._arrowOrigin - halfBase, y1);
-                cr.lineTo(this._arrowOrigin, y1 - rise);
-                cr.lineTo(this._arrowOrigin + halfBase, y1);
-                cr.lineTo(x2 - borderRadius, y1);
-            }
-        } else
-            cr.lineTo(x2 - borderRadius, y1);
 
-        // top-right corner
+        cr.arc(boxWidth - borderRadius - halfBorder, borderRadius + halfBorder, borderRadius,
-        if (this._arrowCorner != St.Corner.TOPRIGHT)
+               3*Math.PI/2, Math.PI*2);
-            cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
-                   3*Math.PI/2, Math.PI*2);
 
         if (this._arrowSide == St.Side.RIGHT) {
-            if (this._arrowCorner == St.Corner.TOPRIGHT) {
+            cr.lineTo(boxWidth - halfBorder, this._arrowOrigin - halfBase);
-                cr.lineTo(x2, y1);
+            cr.lineTo(boxWidth - halfBorder + rise, this._arrowOrigin);
-                cr.lineTo(x2 + rise, y1);
+            cr.lineTo(boxWidth - halfBorder, this._arrowOrigin + halfBase);
-                cr.lineTo(x2, y1 + halfBase);
+        }
-                cr.lineTo(x2, y2 - borderRadius);
+        cr.lineTo(boxWidth - halfBorder, boxHeight - borderRadius);
-            } else if (this._arrowCorner == St.Corner.BOTTOMRIGHT) {
-                cr.moveTo(x2, y2 - halfBase);
-                cr.lineTo(x2 + rise, y2);
-            } else if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
-                cr.lineTo(x2, this._arrowOrigin);
-                cr.lineTo(x2 + rise, this._arrowOrigin);
-                cr.lineTo(x2, this._arrowOrigin + halfBase);
-                cr.lineTo(x2, y2 - borderRadius);
-            } else if (this._arrowOrigin > (y2 - (borderRadius + halfBase))) {
-                cr.lineTo(x2, this._arrowOrigin - halfBase);
-                cr.lineTo(x2 + rise, this._arrowOrigin);
-                cr.lineTo(x2, this._arrowOrigin);
-                cr.lineTo(x2, y2 - borderRadius);
-            } else {
-                cr.lineTo(x2, this._arrowOrigin - halfBase);
-                cr.lineTo(x2 + rise, this._arrowOrigin);
-                cr.lineTo(x2, this._arrowOrigin + halfBase);
-                cr.lineTo(x2, y2 - borderRadius);
-            }
-        } else
-            cr.lineTo(x2, y2 - borderRadius);
 
-        // bottom-right corner
+        cr.arc(boxWidth - borderRadius - halfBorder, boxHeight - borderRadius - halfBorder, borderRadius,
-        if (this._arrowCorner != St.Corner.BOTTOMRIGHT)
+               0, Math.PI/2);
-            cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
-                   0, Math.PI/2);
 
         if (this._arrowSide == St.Side.BOTTOM) {
-            if (this._arrowCorner == St.Corner.BOTTOMLEFT) {
+            cr.lineTo(this._arrowOrigin + halfBase, boxHeight - halfBorder);
-                cr.lineTo(x1 + halfBase, y2);
+            cr.lineTo(this._arrowOrigin, boxHeight - halfBorder + rise);
-                cr.lineTo(x1, y2 + rise);
+            cr.lineTo(this._arrowOrigin - halfBase, boxHeight - halfBorder);
-            } else if (this._arrowCorner == St.Corner.BOTTOMRIGHT) {
+        }
-                cr.lineTo(x2, y2 + rise);
+        cr.lineTo(borderRadius, boxHeight - halfBorder);
-                cr.lineTo(x2 - halfBase, y2);
-                cr.lineTo(x1 + borderRadius, y2);
-            } else if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
-                cr.lineTo(this._arrowOrigin + halfBase, y2);
-                cr.lineTo(this._arrowOrigin, y2 + rise);
-                cr.lineTo(this._arrowOrigin, y2);
-                cr.lineTo(x1 + borderRadius, y2);
-            } else if (this._arrowOrigin > (x2 - (borderRadius + halfBase))) {
-                cr.lineTo(this._arrowOrigin, y2);
-                cr.lineTo(this._arrowOrigin, y2 + rise);
-                cr.lineTo(this._arrowOrigin - halfBase, y2);
-                cr.lineTo(x1 + borderRadius, y2);
-            } else {
-                cr.lineTo(this._arrowOrigin + halfBase, y2);
-                cr.lineTo(this._arrowOrigin, y2 + rise);
-                cr.lineTo(this._arrowOrigin - halfBase, y2);
-                cr.lineTo(x1 + borderRadius, y2);
-            }
-        } else
-            cr.lineTo(x1 + borderRadius, y2);
 
-        // bottom-left corner
+        cr.arc(borderRadius + halfBorder, boxHeight - borderRadius - halfBorder, borderRadius,
-        if (this._arrowCorner != St.Corner.BOTTOMLEFT)
+               Math.PI/2, Math.PI);
-            cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
-                   Math.PI/2, Math.PI);
 
         if (this._arrowSide == St.Side.LEFT) {
-            if (this._arrowCorner == St.Corner.TOPLEFT) {
+            cr.lineTo(halfBorder, this._arrowOrigin + halfBase);
-                cr.lineTo(x2, y1 + halfBase);
+            cr.lineTo(halfBorder - rise, this._arrowOrigin);
-                cr.lineTo(x1 - rise, y1);
+            cr.lineTo(halfBorder, this._arrowOrigin - halfBase);
-            } else if (this._arrowCorner == St.Corner.BOTTOMLEFT) {
+        }
-                cr.lineTo(x1 + rise, y2);
+        cr.lineTo(halfBorder, borderRadius);
-                cr.moveTo(x1, y2 - halfBase);
-            } else if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
-                cr.lineTo(x1, this._arrowOrigin + halfBase);
-                cr.lineTo(x1 - rise, this._arrowOrigin);
-                cr.lineTo(x1, this._arrowOrigin);
-                cr.lineTo(x1, y1 + borderRadius);
-            } else if (this._arrowOrigin > (y2 - (borderRadius + halfBase))) {
-                cr.lineTo(x1, this._arrowOrigin);
-                cr.lineTo(x1 - rise, this._arrowOrigin);
-                cr.lineTo(x1, this._arrowOrigin - halfBase);
-                cr.lineTo(x1, y1 + borderRadius);
-            } else {
-                cr.lineTo(x1, this._arrowOrigin + halfBase);
-                cr.lineTo(x1 - rise, this._arrowOrigin);
-                cr.lineTo(x1, this._arrowOrigin - halfBase);
-                cr.lineTo(x1, y1 + borderRadius);
-            }
-        } else
-            cr.lineTo(x1, y1 + borderRadius);
 
-        // top-left corner
+        cr.arc(borderRadius + halfBorder, borderRadius + halfBorder, borderRadius,
-        if (this._arrowCorner != St.Corner.TOPLEFT)
+               Math.PI, 3*Math.PI/2);
-            cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
-                   Math.PI, 3*Math.PI/2);
-        else
-            cr.lineTo(x1, y1);
 
         Clutter.cairo_set_source_color(cr, backgroundColor);
         cr.fillPreserve();
@@ -363,7 +269,7 @@ BoxPointer.prototype = {
         // Position correctly relative to the sourceActor
         let [sourceX, sourceY] = sourceActor.get_transformed_position();
         let [sourceWidth, sourceHeight] = sourceActor.get_transformed_size();
-        let [sourceCenterX, sourceCenterY] = [sourceX + (sourceWidth / 2), sourceY + (sourceHeight / 2)];
+
         let [minWidth, minHeight, natWidth, natHeight] = this.actor.get_preferred_size();
 
         // We also want to keep it onscreen, and separated from the
@@ -371,14 +277,10 @@ BoxPointer.prototype = {
         // separated from its sourceActor
         let primary = global.get_primary_monitor();
         let themeNode = this.actor.get_theme_node();
-        let halfBorder = themeNode.get_length('-arrow-border-width') / 2;
+        let arrowRise = themeNode.get_length('-arrow-rise');
-        let halfBase = themeNode.get_length('-arrow-base') / 2;
         let borderRadius = themeNode.get_length('-arrow-border-radius');
 
-        let margin = 2 * borderRadius + halfBorder;
-
         let resX, resY;
-        this._arrowCorner = null;
 
         switch (this._arrowSide) {
         case St.Side.TOP:
@@ -402,59 +304,40 @@ BoxPointer.prototype = {
         case St.Side.BOTTOM:
             switch (alignment) {
             case St.Align.START:
-                resX = sourceCenterX - (halfBase + borderRadius + halfBorder);
+                resX = sourceX - 2 * borderRadius;
                 break;
             case St.Align.MIDDLE:
-                resX = sourceCenterX - (natWidth / 2);
+                resX = sourceX - Math.floor((natWidth - sourceWidth) / 2);
                 break;
             case St.Align.END:
-                resX = sourceCenterX - natWidth + (halfBase + borderRadius + halfBorder);
+                resX = sourceX - (natWidth - sourceWidth) + 2 * borderRadius;
                 break;
             }
-            if (sourceCenterX < margin) {
-                // Not enough space to the top
-                this._arrowCorner = (this._arrowSide == St.Side.TOP) ? St.Corner.TOPLEFT : St.Corner.BOTTOMLEFT;
-                resX = 10;
-            } else if (sourceCenterX > (primary.width - margin)) {
-                // Not enough space to the botom
-                this._arrowCorner = (this._arrowSide == St.Side.TOP) ? St.Corner.TOPRIGHT : St.Corner.BOTTOMRIGHT;
-                resX = primary.width - (10 + natWidth);
-            }
 
-            resX = Math.max(resX, 10);
+            resX = Math.min(resX, primary.x + primary.width - natWidth - arrowRise - gap);
-            resX = Math.min(resX, primary.width - (10 + natWidth));
+            resX = Math.max(resX, primary.x);
 
-            this.setArrowOrigin(sourceCenterX - resX);
+            this.setArrowOrigin((sourceX - resX) + Math.floor(sourceWidth / 2));
             break;
 
         case St.Side.LEFT:
         case St.Side.RIGHT:
             switch (alignment) {
             case St.Align.START:
-                resY = sourceCenterY - (halfBase + borderRadius + halfBorder);
+                resY = sourceY - 2 * borderRadius;
                 break;
             case St.Align.MIDDLE:
-                resY = sourceCenterY - (natHeight / 2);
+                resY = sourceY - Math.floor((natHeight - sourceHeight) / 2);
                 break;
             case St.Align.END:
-                resY = sourceCenterY - natHeight + (halfBase + borderRadius + halfBorder);
+                resY = sourceY - (natHeight - sourceHeight) + 2 * borderRadius;
                 break;
             }
-            if (sourceCenterY < margin) {
-                // Not enough space to the left
-                this._arrowCorner = (this._arrowSide == St.Side.LEFT) ? St.Corner.TOPLEFT : St.Corner.TORIGHT;
-                resY = 10;
-            }
-            else if (sourceCenterY > (primary.height - margin)) {
-                // Not enough space to the right
-                this._arrowCorner = (this._arrowSide == St.Side.LEFT) ? St.Corner.BOTTOMLEFT : St.Corner.BOTTOMRIGHT;
-                resY = primary.height - (10 + natHeight);
-            }
 
-            resY = Math.max(resY, 10);
+            resY = Math.min(resY, primary.y + primary.height - natHeight - arrowRise - gap);
-            resY = Math.min(resY, primary.height - (10 + natHeight));
+            resY = Math.max(resY, primary.y);
 
-            this.setArrowOrigin(sourceCenterY - resY);
+            this.setArrowOrigin((sourceY - resY) + Math.floor(sourceHeight / 2));
             break;
         }
 

js/ui/calendar.js

@@ -488,45 +488,23 @@ Calendar.prototype = {
 
     _onPrevMonthButtonClicked: function() {
         let newDate = new Date(this._selectedDate);
-        let oldMonth = newDate.getMonth();
+        if (newDate.getMonth() == 0) {
-        if (oldMonth == 0) {
             newDate.setMonth(11);
             newDate.setFullYear(newDate.getFullYear() - 1);
-            if (newDate.getMonth() != 11) {
+        } else {
-                let day = 32 - new Date(newDate.getFullYear() - 1, 11, 32).getDate();
+            newDate.setMonth(newDate.getMonth() - 1);
-                newDate = new Date(newDate.getFullYear() - 1, 11, day);
-            }
         }
-        else {
-            newDate.setMonth(oldMonth - 1);
-            if (newDate.getMonth() != oldMonth - 1) {
-                let day = 32 - new Date(newDate.getFullYear(), oldMonth - 1, 32).getDate();
-                newDate = new Date(newDate.getFullYear(), oldMonth - 1, day);
-            }
-        }
-
         this.setDate(newDate);
    },
 
-   _onNextMonthButtonClicked: function() {
+    _onNextMonthButtonClicked: function() {
         let newDate = new Date(this._selectedDate);
-        let oldMonth = newDate.getMonth();
+        if (newDate.getMonth() == 11) {
-        if (oldMonth == 11) {
             newDate.setMonth(0);
             newDate.setFullYear(newDate.getFullYear() + 1);
-            if (newDate.getMonth() != 0) {
+        } else {
-                let day = 32 - new Date(newDate.getFullYear() + 1, 0, 32).getDate();
+            newDate.setMonth(newDate.getMonth() + 1);
-                newDate = new Date(newDate.getFullYear() + 1, 0, day);
-            }
         }
-        else {
-            newDate.setMonth(oldMonth + 1);
-            if (newDate.getMonth() != oldMonth + 1) {
-                let day = 32 - new Date(newDate.getFullYear(), oldMonth + 1, 32).getDate();
-                newDate = new Date(newDate.getFullYear(), oldMonth + 1, day);
-            }
-        }
-
         this.setDate(newDate);
     },
 
@@ -578,7 +556,7 @@ Calendar.prototype = {
             // Hack used in lieu of border-collapse - see gnome-shell.css
             if (row == 2)
                 styleClass = 'calendar-day-top ' + styleClass;
-            if (iter.getDay() == this._weekStart)
+            if (iter.getDay() == 0)
                 styleClass = 'calendar-day-left ' + styleClass;
 
             if (_sameDay(now, iter))
@@ -633,18 +611,6 @@ EventsList.prototype = {
         this._eventSource.connect('changed', Lang.bind(this, this._update));
         this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
         this._desktopSettings.connect('changed', Lang.bind(this, this._update));
-        let weekStartString = Gettext_gtk30.gettext('calendar:week_start:0');
-        if (weekStartString.indexOf('calendar:week_start:') == 0) {
-            this._weekStart = parseInt(weekStartString.substring(20));
-        }
-
-        if (isNaN(this._weekStart) ||
-                  this._weekStart < 0 ||
-                  this._weekStart > 6) {
-            log('Translation of "calendar:week_start:0" in GTK+ is not correct');
-            this._weekStart = 0;
-        }
-
         this._update();
     },
 
@@ -726,21 +692,19 @@ EventsList.prototype = {
         let tomorrowEnd = new Date(dayEnd.getTime() + 86400 * 1000);
         this._addPeriod(_("Tomorrow"), tomorrowBegin, tomorrowEnd, false, true);
 
-        if (dayEnd.getDay() <= 4 + this._weekStart) {
+        if (dayEnd.getDay() <= 4) {
-            /* If now is within the first 5 days we show "This week" and
+            /* if now is Sunday through Thursday show "This week" and include events up until
-             * include events up until and including Saturday/Sunday
+             * and including Saturday
-             * (depending on whether a week starts on Sunday/Monday).
              */
             let thisWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
-            let thisWeekEnd = new Date(dayEnd.getTime() + (6 + this._weekStart - dayEnd.getDay()) * 86400 * 1000);
+            let thisWeekEnd = new Date(dayEnd.getTime() + (6 - dayEnd.getDay()) * 86400 * 1000);
             this._addPeriod(_("This week"), thisWeekBegin, thisWeekEnd, true, false);
         } else {
-            /* otherwise it's one of the two last days of the week ... show
+            /* otherwise it's a Friday or Saturday... show "Next week" and include events up
-             * "Next week" and include events up until and including *next*
+             * until and including *next* Saturday
-             * Saturday/Sunday
              */
             let nextWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
-            let nextWeekEnd = new Date(dayEnd.getTime() + (13 + this._weekStart - dayEnd.getDay()) * 86400 * 1000);
+            let nextWeekEnd = new Date(dayEnd.getTime() + (13 - dayEnd.getDay()) * 86400 * 1000);
             this._addPeriod(_("Next week"), nextWeekBegin, nextWeekEnd, true, false);
         }
     },

js/ui/dateMenu.js

@@ -100,7 +100,7 @@ DateMenuButton.prototype = {
         hbox.add(item);
 
         // Fill up the second column
-
+        //
         vbox = new St.BoxLayout({vertical: true});
         hbox.add(vbox);
 

js/ui/main.js

@@ -67,8 +67,6 @@ let xdndHandler = null;
 let statusIconDispatcher = null;
 let _errorLogStack = [];
 let _startDate;
-let _defaultCssStylesheet = null;
-let _cssStylesheet = null;
 
 let background = null;
 
@@ -113,7 +111,6 @@ function start() {
     global.stage.color = DEFAULT_BACKGROUND_COLOR;
     global.stage.no_clear_hint = true;
 
-    _defaultCssStylesheet = global.datadir + '/theme/gnome-shell.css';
     loadTheme();
 
     let shellwm = global.window_manager;
@@ -207,44 +204,15 @@ function start() {
     }
 }
 
-/**
- * getThemeStylesheet:
- *
- * Get the theme CSS file that the shell will load
- *
- * Returns: A file path that contains the theme CSS,
- *          null if using the default
- */
-function getThemeStylesheet()
-{
-    return _cssStylesheet;
-}
-
-/**
- * setThemeStylesheet:
- * @cssStylesheet: A file path that contains the theme CSS,
- *                  set it to null to use the default
- *
- * Set the theme CSS file that the shell will load
- */
-function setThemeStylesheet(cssStylesheet)
-{
-    _cssStylesheet = cssStylesheet;
-}
-
 /**
  * loadTheme:
  *
- * Reloads the theme CSS file
+ * Reloads the theme CSS file from the default theme.
  */
 function loadTheme() {
     let themeContext = St.ThemeContext.get_for_stage (global.stage);
-
+    let stylesheetPath = global.datadir + '/theme/gnome-shell.css';
-    let cssStylesheet = _defaultCssStylesheet;
+    let theme = new St.Theme ({ application_stylesheet: stylesheetPath });
-    if (_cssStylesheet != null)
-        cssStylesheet = _cssStylesheet;
-
-    let theme = new St.Theme ({ application_stylesheet: cssStylesheet });
     themeContext.set_theme (theme);
 }
 

js/ui/messageTray.js

@@ -254,7 +254,6 @@ Notification.prototype = {
         // 'transient' is a reserved keyword in JS, so we have to use an alternate variable name
         this.isTransient = false;
         this.expanded = false;
-        this._destroyed = false;
         this._useActionIcons = false;
         this._customContent = false;
         this._bannerBodyText = null;
@@ -275,11 +274,7 @@ Notification.prototype = {
         this._capturedEventId = 0;
         this._keyPressId = 0;
 
-        source.connect('destroy', Lang.bind(this,
+        source.connect('destroy', Lang.bind(this, this.destroy));
-            // Avoid passing 'source' as an argument to this.destroy()
-            function () {
-                this.destroy();
-            }));
 
         this.actor = new St.Table({ name: 'notification',
                                     reactive: true });
@@ -772,9 +767,6 @@ Notification.prototype = {
     },
 
     destroy: function(reason) {
-        if (this._destroyed)
-            return;
-        this._destroyed = true;
         if (!reason)
             reason = NotificationDestroyedReason.DISMISSED;
         this.emit('destroy', reason);

js/ui/panel.js

@@ -44,6 +44,10 @@ const STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION = {
 if (Config.HAVE_BLUETOOTH)
     STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
 
+const STANDARD_TRAY_INDICATOR_FACTORIES = [
+    imports.ui.status.keyboard.ModifierIndicatorFactory
+];
+
 // in org.gnome.desktop.interface
 const CLOCK_FORMAT_KEY        = 'clock-format';
 
@@ -695,13 +699,16 @@ Panel.prototype = {
 
         /* right */
 
-        // System status applets live in statusBox, while legacy tray icons
+        // On-off indicators (for keyboard leds and accessx) are in indicatorBox
+        // System status applets live in statusBox, and legacy tray icons
         // live in trayBox
         // The trayBox is hidden when there are no tray icons.
+        this._indicatorBox = new St.BoxLayout({ name: 'indicatorBox' });
         this._trayBox = new St.BoxLayout({ name: 'legacyTray' });
         this._statusBox = new St.BoxLayout({ name: 'statusTray' });
 
         this._trayBox.hide();
+        this._rightBox.add(this._indicatorBox);
         this._rightBox.add(this._trayBox);
         this._rightBox.add(this._statusBox);
 
@@ -753,6 +760,13 @@ Panel.prototype = {
     },
 
     startStatusArea: function() {
+        for (let i = 0; i < STANDARD_TRAY_INDICATOR_FACTORIES.length; i++) {
+            let factory = new STANDARD_TRAY_INDICATOR_FACTORIES[i];
+            let indicators = factory.getIndicators();
+            for (let j = 0; j < indicators.length; j++)
+                this._indicatorBox.add(indicators[j]);
+        }
+
         for (let i = 0; i < STANDARD_TRAY_ICON_ORDER.length; i++) {
             let role = STANDARD_TRAY_ICON_ORDER[i];
             let constructor = STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION[role];

js/ui/status/keyboard.js

@@ -204,3 +204,52 @@ XKBIndicator.prototype = {
             this._labelActors[i].allocate_align_fill(box, 0.5, 0, false, false, flags);
     }
 };
+
+function ModifierIndicatorFactory() {
+    this._init.call(this);
+}
+
+ModifierIndicatorFactory.prototype = {
+    _init: function() {
+        this._settings = new Gio.Settings({ schema: INDICATOR_SCHEMA });
+        this._settings.connect('changed::show-keyboard-leds-indicator', Lang.bind(this, this._changed));
+
+        this._config = Gkbd.Configuration.get();
+        this._config.connect('indicators-changed', Lang.bind(this, this._changed));
+
+        this._scrollLock = new St.Icon({ icon_name: 'kbdled-scroll-lock', icon_type: St.IconType.SYMBOLIC, style_class: 'system-status-icon' });
+        this._numLock = new St.Icon({ icon_name: 'kbdled-num-lock', icon_type: St.IconType.SYMBOLIC, style_class: 'system-status-icon' });
+        this._capsLock = new St.Icon({ icon_name: 'kbdled-caps-lock', icon_type: St.IconType.SYMBOLIC, style_class: 'system-status-icon' });
+
+        this._changed();
+    },
+
+    getIndicators: function() {
+        return [this._scrollLock, this._numLock, this._capsLock];
+    },
+
+    _changed: function() {
+        let enable = this._settings.get_boolean('show-keyboard-leds-indicator');
+
+        if (enable) {
+            if (this._config.get_scroll_lock_state())
+                this._scrollLock.show();
+            else
+                this._scrollLock.hide();
+
+            if (this._config.get_num_lock_state())
+                this._numLock.show();
+            else
+                this._numLock.hide();
+
+            if (this._config.get_caps_lock_state())
+                this._capsLock.show();
+            else
+                this._capsLock.hide();
+        } else {
+            this._scrollLock.hide();
+            this._numLock.hide();
+            this._capsLock.hide();
+        }
+    }
+};

po/et.po

@@ -13,14 +13,14 @@ msgstr ""
 "Project-Id-Version: gnome-shell MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&component=general\n"
-"POT-Creation-Date: 2011-01-29 18:34+0000\n"
+"POT-Creation-Date: 2011-01-21 18:46+0000\n"
-"PO-Revision-Date: 2011-02-01 13:51+0300\n"
+"PO-Revision-Date: 2011-01-24 08:04+0200\n"
-"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
+"Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
-"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Estonian\n"
 "X-Poedit-Country: Estonia\n"
@@ -242,9 +242,6 @@ msgstr ""
 msgid "Width of the vertical and horizontal lines that make up the crosshairs."
 msgstr "Niitristi moodustavate püst- ja rõhtjoone laius"
 
-msgid "Command not found"
-msgstr ""
-
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
 msgid "Could not parse command:"
@@ -312,17 +309,17 @@ msgid "Logging out of the system."
 msgstr "Süsteemist väljalogimine"
 
 msgid "Shut Down"
-msgstr "Lülita välja"
+msgstr "Seiska"
 
 msgid "Click Shut Down to quit these applications and shut down the system."
 msgstr ""
 
 #, c-format
 msgid "The system will shut down automatically in %d seconds."
-msgstr "%d sekundi pärast lülitub süsteem automaatselt välja."
+msgstr "Süsteem seisatakse automaatselt %d sekundi pärast."
 
 msgid "Shutting down the system."
-msgstr "Süsteemi väljalülitamine."
+msgstr "Süsteemi seiskamine."
 
 msgid "Restart"
 msgstr "Taaskäivita"

po/gl.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-01 02:40+0100\n"
+"POT-Creation-Date: 2011-01-27 03:33+0100\n"
-"PO-Revision-Date: 2011-02-01 02:44+0100\n"
+"PO-Revision-Date: 2011-01-26 21:02+0100\n"
 "Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
 "Language-Team: Galician <gnome-gl-list@gnome.org>\n"
 "Language: gl\n"
@@ -79,8 +79,8 @@ msgstr "Se é verdadeiro, móstrase a data da semana ISO no calendario."
 msgid "List of desktop file IDs for favorite applications"
 msgstr "Mostra os ID de ficheiros desktop para os aplicativos preferidos"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:12
+#: ../data/org.gnome.shell.gschema.xml.in.h:11
-#, no-c-format
+#, fuzzy
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
 "used for gst-launch. The pipeline should have an unconnected sink pad where "
@@ -89,35 +89,31 @@ msgid ""
 "pipeline can also take care of its own output - this might be used to send "
 "the output to an icecast server via shout2send or similar. When unset or set "
 "to an empty value, the default pipeline will be used. This is currently "
-"'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux' and "
+"'videorate ! theoraenc ! oggmux' and records to Ogg Theora."
-"records to WEBM using the VP8 codec. %T is used as a placeholder for a guess "
-"at the optimal thread count on the system."
 msgstr ""
 "Estabelece a tubería GStreamer usada para codificar gravacións. Segue a "
 "sintaxe usada para gst-launch. A tubería debería ter un sumideiro («sink») "
-"de ensamblaxe/desensamblaxe onde o vídeo gravado se grava. Xeralmente terá "
+"de ensamblaxe/desensamblaxe onde o vídeo que se está gravando grávase. "
-"unha orixe de ensamblado/desensamblado; a saída dese punto escribirase no "
+"Xeralmente terá unha orixe de ensamblado/desensamblado; a saída dese punto "
-"ficheiro de saída. Porén, a tubería tamén pode tomar parte na súa propia "
+"escribirase no ficheiro de saída. Porén, a tubería tamén pode tomar parte na "
-"saída; isto pódese usar para enviar a saída a un servidor «icecast» a través "
+"súa propia saída; isto pódese usar para enviar a saída a un servidor "
-"de shout2send ou similar. Cando non está estabelecido ou está a un valor "
+"«icecast» a través de shout2send ou similar. Cando non está estabelecido ou "
-"baleiro, usarase a tubería predeterminada. Actualmente é «! vp8enc "
+"está a un valor baleiro, usarase a tubería predeterminada. Actualmente é "
-"quality=10 speed=2 threads=%T ! queue ! webmmux'» e grava en WEBM usando o "
+"«videorate ! theoraenc ! oggmux» e grava en Ogg Theora."
-"códec VP8. Úsase %T como suposición para o número de fillos óptimos no "
-"sistema."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.h:12
 msgid "Show date in clock"
 msgstr "Mostrar a data no reloxo"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:13
 msgid "Show the week date in the calendar"
 msgstr "Mostrar a data da semana no calendario"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
 msgid "Show time with seconds"
 msgstr "Mostrar a hora con segundos"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
@@ -125,7 +121,7 @@ msgstr ""
 "Os aplicativos que corresponden a estes identificadores mostraranse na área "
 "de preferidos."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@@ -135,7 +131,7 @@ msgstr ""
 "baseado na data actual e usa esta extensión. Debería cambiar ao grabar nun "
 "formato de contedor diferente."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -143,11 +139,11 @@ msgstr ""
 "A taxa de marcos do screencast resultante grabado polo grabador de "
 "screencasts de GNOME Shell en marcos-por-segundo."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "A tubería de gstreamer usada para codificar o screencast"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid ""
 "The shell normally monitors active applications in order to present the most "
 "used ones (e.g. in launchers). While this data will be kept private, you may "
@@ -159,15 +155,15 @@ msgstr ""
 "privados, vostede pode desactivar isto por motivos de privacidade. Teña en "
 "conta que facendo isto non eliminará os datos gardados."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid "Uuids of extensions to disable"
 msgstr "Os Uuid das extensións a desactivar"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "Whether to collect stats about applications usage"
 msgstr "Indica se recoller estatísticas sobre o uso dos aplicativos"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "disabled OpenSearch providers"
 msgstr "fornecedores de OpenSearch desactivados"
 
@@ -325,47 +321,43 @@ msgstr ""
 msgid "Width of the vertical and horizontal lines that make up the crosshairs."
 msgstr "Anchura das liñas verticais e horizontais que contén o punto de mira."
 
-#: ../js/misc/util.js:86
-msgid "Command not found"
-msgstr "Orde non atopada"
-
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:113
+#: ../js/misc/util.js:108
 msgid "Could not parse command:"
 msgstr "Non foi posíbel analizar a orde:"
 
-#: ../js/misc/util.js:135
+#: ../js/misc/util.js:130
 msgid "No such application"
 msgstr "Non existe o aplicativo"
 
-#: ../js/misc/util.js:148
+#: ../js/misc/util.js:143 ../js/ui/runDialog.js:351
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Produciuse un fallo na execución de «%s»:"
 
 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:164
+#: ../js/ui/appDisplay.js:155
 msgid "All"
 msgstr "Todos"
 
-#: ../js/ui/appDisplay.js:245
+#: ../js/ui/appDisplay.js:236
 msgid "APPLICATIONS"
 msgstr "APLICATIVOS"
 
-#: ../js/ui/appDisplay.js:275
+#: ../js/ui/appDisplay.js:266
 msgid "PREFERENCES"
 msgstr "PREFERENCIAS"
 
-#: ../js/ui/appDisplay.js:572
+#: ../js/ui/appDisplay.js:563
 msgid "New Window"
 msgstr "Xanela nova"
 
-#: ../js/ui/appDisplay.js:576
+#: ../js/ui/appDisplay.js:567
 msgid "Remove from Favorites"
 msgstr "Eliminar dos favoritos"
 
-#: ../js/ui/appDisplay.js:577
+#: ../js/ui/appDisplay.js:568
 msgid "Add to Favorites"
 msgstr "Engadir aos favoritos"
 
@@ -490,31 +482,71 @@ msgstr "Ver fonte"
 msgid "Web Page"
 msgstr "Páxina web"
 
-#: ../js/ui/messageTray.js:1786
+#: ../js/ui/messageTray.js:1765
 msgid "System Information"
 msgstr "Información do sistema"
 
-#: ../js/ui/overview.js:88
+#: ../js/ui/overview.js:75
 msgid "Undo"
 msgstr "Desfacer"
 
-#: ../js/ui/overview.js:159
+#: ../js/ui/overview.js:140
 msgid "Windows"
 msgstr "Xanelas"
 
-#: ../js/ui/overview.js:162
+#: ../js/ui/overview.js:143
 msgid "Applications"
 msgstr "Aplicativos"
 
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:480
+#: ../js/ui/panel.js:479
 #, c-format
 msgid "Quit %s"
 msgstr "Saír de %s"
 
+#. Translators: This is the time format with date used
+#. in 24-hour mode.
+#: ../js/ui/panel.js:564
+msgid "%a %b %e, %R:%S"
+msgstr "%a %e de %b, %R:%S"
+
+#: ../js/ui/panel.js:565
+msgid "%a %b %e, %R"
+msgstr "%a %e de %b, %R"
+
+#. Translators: This is the time format without date used
+#. in 24-hour mode.
+#: ../js/ui/panel.js:569
+msgid "%a %R:%S"
+msgstr "%a %R:%S"
+
+#: ../js/ui/panel.js:570
+msgid "%a %R"
+msgstr "%a %R"
+
+#. Translators: This is a time format with date used
+#. for AM/PM.
+#: ../js/ui/panel.js:577
+msgid "%a %b %e, %l:%M:%S %p"
+msgstr "%a %e de %b, %H:%M:%S"
+
+#: ../js/ui/panel.js:578
+msgid "%a %b %e, %l:%M %p"
+msgstr "%a %e de %b, %H:%M"
+
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#: ../js/ui/panel.js:582
+msgid "%a %l:%M:%S %p"
+msgstr "%a %H:%M:%S"
+
+#: ../js/ui/panel.js:583
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
+
 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:614
+#: ../js/ui/panel.js:728
 msgid "Activities"
 msgstr "Actividades"
 
@@ -669,7 +701,7 @@ msgstr "Produciuse un erro ao explorar o dispositivo"
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "O dispositivo solicitado non pode explorarse, o erro foi «%s»"
 
-#: ../js/ui/status/bluetooth.js:251
+#: ../js/ui/status/bluetooth.js:251 ../js/ui/status/keyboard.js:78
 msgid "Keyboard Settings"
 msgstr "Configuracións do teclado"
 
@@ -744,10 +776,6 @@ msgstr "Introduza o PIN mencionado no dispositivo."
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../js/ui/status/keyboard.js:78
-msgid "Localization Settings"
-msgstr "Configuracións do son"
-
 #: ../js/ui/status/power.js:85
 msgid "Power Settings"
 msgstr "Configuracións de enerxía"
@@ -882,14 +910,14 @@ msgstr "%s rematou de iniarse"
 msgid "'%s' is ready"
 msgstr "«%s» está preparado"
 
-#: ../js/ui/workspacesView.js:243
+#: ../js/ui/workspacesView.js:244
 msgid ""
 "Can't add a new workspace because maximum workspaces limit has been reached."
 msgstr ""
 "Non é posíbel engadir unha área de traballo nova porque chegouse ao límite "
 "de áreas de traballo."
 
-#: ../js/ui/workspacesView.js:259
+#: ../js/ui/workspacesView.js:260
 msgid "Can't remove the first workspace."
 msgstr "Non é posíbel quitar a primeira área de traballo."
 
@@ -915,32 +943,32 @@ msgstr[1] "%u entradas"
 msgid "System Sounds"
 msgstr "Sons do sistema"
 
-#: ../src/shell-global.c:1365
+#: ../src/shell-global.c:1366
 msgid "Less than a minute ago"
 msgstr "Hai menos dun minuto"
 
-#: ../src/shell-global.c:1369
+#: ../src/shell-global.c:1370
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "hai %d minuto"
 msgstr[1] "hai %d minutos"
 
-#: ../src/shell-global.c:1374
+#: ../src/shell-global.c:1375
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "hai %d hora"
 msgstr[1] "hai %d horas"
 
-#: ../src/shell-global.c:1379
+#: ../src/shell-global.c:1380
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "hai %d día"
 msgstr[1] "hai %d días"
 
-#: ../src/shell-global.c:1384
+#: ../src/shell-global.c:1385
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -971,29 +999,9 @@ msgstr "Buscar"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
 
-#~ msgid "%a %b %e, %R:%S"
+#~| msgid "Sound Settings"
-#~ msgstr "%a %e de %b, %R:%S"
+#~ msgid "Localization Settings"
-
+#~ msgstr "Configuracións do son"
-#~ msgid "%a %b %e, %R"
-#~ msgstr "%a %e de %b, %R"
-
-#~ msgid "%a %R:%S"
-#~ msgstr "%a %R:%S"
-
-#~ msgid "%a %R"
-#~ msgstr "%a %R"
-
-#~ msgid "%a %b %e, %l:%M:%S %p"
-#~ msgstr "%a %e de %b, %H:%M:%S"
-
-#~ msgid "%a %b %e, %l:%M %p"
-#~ msgstr "%a %e de %b, %H:%M"
-
-#~ msgid "%a %l:%M:%S %p"
-#~ msgstr "%a %H:%M:%S"
-
-#~ msgid "%a %l:%M %p"
-#~ msgstr "%a %l:%M %p"
 
 #~ msgid "Clock"
 #~ msgstr "Reloxo"

po/he.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 23:03+0200\n"
+"POT-Creation-Date: 2011-01-23 02:42+0200\n"
-"PO-Revision-Date: 2011-01-30 23:03+0200\n"
+"PO-Revision-Date: 2011-01-23 02:43+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -319,47 +319,43 @@ msgid "Width of the vertical and horizontal lines that make up the crosshairs."
 msgstr ""
 "Width of the vertical and horizontal lines that make up the crosshairs."
 
-#: ../js/misc/util.js:86
-msgid "Command not found"
-msgstr "הפקודה לא נמצאה"
-
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:113
+#: ../js/misc/util.js:108
 msgid "Could not parse command:"
 msgstr "לא ניתן לפענח את הפקודה:"
 
-#: ../js/misc/util.js:135
+#: ../js/misc/util.js:130
 msgid "No such application"
 msgstr "אין כזה יישום"
 
-#: ../js/misc/util.js:148
+#: ../js/misc/util.js:143 ../js/ui/runDialog.js:351
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "ההרצה של '%s' נכשלה:"
 
 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:164
+#: ../js/ui/appDisplay.js:155
 msgid "All"
 msgstr "הכול"
 
-#: ../js/ui/appDisplay.js:245
+#: ../js/ui/appDisplay.js:236
 msgid "APPLICATIONS"
 msgstr "יישומים"
 
-#: ../js/ui/appDisplay.js:275
+#: ../js/ui/appDisplay.js:266
 msgid "PREFERENCES"
 msgstr "העדפות"
 
-#: ../js/ui/appDisplay.js:572
+#: ../js/ui/appDisplay.js:563
 msgid "New Window"
 msgstr "חלון חדש"
 
-#: ../js/ui/appDisplay.js:576
+#: ../js/ui/appDisplay.js:567
 msgid "Remove from Favorites"
 msgstr "הסרה מהמועדפים"
 
-#: ../js/ui/appDisplay.js:577
+#: ../js/ui/appDisplay.js:568
 msgid "Add to Favorites"
 msgstr "הוספה למועדפים"
 
@@ -480,71 +476,71 @@ msgstr "צפייה במקור"
 msgid "Web Page"
 msgstr "דף אינטרנט"
 
-#: ../js/ui/messageTray.js:1778
+#: ../js/ui/messageTray.js:1765
 msgid "System Information"
 msgstr "פרטי המערכת"
 
-#: ../js/ui/overview.js:88
+#: ../js/ui/overview.js:75
 msgid "Undo"
 msgstr "ביטול"
 
-#: ../js/ui/overview.js:159
+#: ../js/ui/overview.js:140
 msgid "Windows"
 msgstr "חלונות"
 
-#: ../js/ui/overview.js:162
+#: ../js/ui/overview.js:143
 msgid "Applications"
 msgstr "יישומים"
 
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:479
+#: ../js/ui/panel.js:483
 #, c-format
 msgid "Quit %s"
 msgstr "יציאה מ־%s"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:564
+#: ../js/ui/panel.js:568
 msgid "%a %b %e, %R:%S"
 msgstr "%a %b %e, %R:%S"
 
-#: ../js/ui/panel.js:565
+#: ../js/ui/panel.js:569
 msgid "%a %b %e, %R"
 msgstr "%a %b %e, %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:569
+#: ../js/ui/panel.js:573
 msgid "%a %R:%S"
 msgstr "%a %R:%S"
 
-#: ../js/ui/panel.js:570
+#: ../js/ui/panel.js:574
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/panel.js:577
+#: ../js/ui/panel.js:581
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%a %b %e, %l:%M:%S %p"
 
-#: ../js/ui/panel.js:578
+#: ../js/ui/panel.js:582
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a %b %e, %l:%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/panel.js:582
+#: ../js/ui/panel.js:586
 msgid "%a %l:%M:%S %p"
 msgstr "%a %l:%M:%S %p"
 
-#: ../js/ui/panel.js:583
+#: ../js/ui/panel.js:587
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:728
+#: ../js/ui/panel.js:732
 msgid "Activities"
 msgstr "פעילויות"
 
@@ -916,12 +912,12 @@ msgstr "%s סיים את תהליך ההתחלה"
 msgid "'%s' is ready"
 msgstr "'%s' מוכן"
 
-#: ../js/ui/workspacesView.js:243
+#: ../js/ui/workspacesView.js:244
 msgid ""
 "Can't add a new workspace because maximum workspaces limit has been reached."
 msgstr "לא ניתן להוסיף מרחבי עבודה כיוון שהם ממלאים את המכסה המרבית."
 
-#: ../js/ui/workspacesView.js:259
+#: ../js/ui/workspacesView.js:260
 msgid "Can't remove the first workspace."
 msgstr "לא ניתן להסיר את מרחב העבודה הראשון."
 
@@ -949,11 +945,11 @@ msgstr[2] "2 קלטים"
 msgid "System Sounds"
 msgstr "צלילי מערכת"
 
-#: ../src/shell-global.c:1365
+#: ../src/shell-global.c:1366
 msgid "Less than a minute ago"
 msgstr "לפני פחות מדקה"
 
-#: ../src/shell-global.c:1369
+#: ../src/shell-global.c:1370
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -961,7 +957,7 @@ msgstr[0] "לפני דקה"
 msgstr[1] "לפני %d דקות"
 msgstr[2] "לפני 2 דקות"
 
-#: ../src/shell-global.c:1374
+#: ../src/shell-global.c:1375
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -969,7 +965,7 @@ msgstr[0] "לפני שעה"
 msgstr[1] "לפני %d שעות"
 msgstr[2] "לפני שעתיים"
 
-#: ../src/shell-global.c:1379
+#: ../src/shell-global.c:1380
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -977,7 +973,7 @@ msgstr[0] "לפני יום"
 msgstr[1] "לפני %d ימים"
 msgstr[2] "לפני יומיים"
 
-#: ../src/shell-global.c:1384
+#: ../src/shell-global.c:1385
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"

po/it.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 16:06+0100\n"
+"POT-Creation-Date: 2011-01-21 01:16+0100\n"
-"PO-Revision-Date: 2011-01-29 16:06+0100\n"
+"PO-Revision-Date: 2011-01-15 01:19+0100\n"
 "Last-Translator: Luca Ferretti <lferrett@gnome.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -76,8 +76,7 @@ msgstr "Se VERO, mostra il giorno della settimana ISO nel calendario."
 msgid "List of desktop file IDs for favorite applications"
 msgstr "Elenco di ID di file desktop per le applicazioni preferite"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:12
+#: ../data/org.gnome.shell.gschema.xml.in.h:11
-#, fuzzy, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
 "used for gst-launch. The pipeline should have an unconnected sink pad where "
@@ -86,9 +85,7 @@ msgid ""
 "pipeline can also take care of its own output - this might be used to send "
 "the output to an icecast server via shout2send or similar. When unset or set "
 "to an empty value, the default pipeline will be used. This is currently "
-"'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux' and "
+"'videorate ! theoraenc ! oggmux' and records to Ogg Theora."
-"records to WEBM using the VP8 codec. %T is used as a placeholder for a guess "
-"at the optimal thread count on the system."
 msgstr ""
 "Imposta la pipeline di GStreamer utilizzata per codificare le registrazioni, "
 "seguendo la sintassi di gst-launch. La pipeline dovrebbe disporre di un sink "
@@ -100,19 +97,19 @@ msgstr ""
 "alcun valore, viene usata la pipeline predefinita il cui valore è "
 "\"videorate ! theoraenc ! oggmux\" e che registra nel formato Ogg Theora."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.h:12
 msgid "Show date in clock"
 msgstr "Mostra la data nell'orologio"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:13
 msgid "Show the week date in the calendar"
 msgstr "Mostra il giorno della settimana nel calendario"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
 msgid "Show time with seconds"
 msgstr "Mostra l'ora con i secondi"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
@@ -120,7 +117,7 @@ msgstr ""
 "Le applicazioni che corrispondono a questi identificatori vengono "
 "visualizzate nell'area dei preferiti."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@@ -130,7 +127,7 @@ msgstr ""
 "data corrente e utilizza questa estensione. Dovrebbe essere modificato "
 "quando si registra utilizzando un diverso formato contenitore."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -138,12 +135,12 @@ msgstr ""
 "Il framerate in fotogrammi al secondo dello screencast registrato attraverso "
 "il registratore della GNOME Shell."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "La pipeline di gstreamer utilizzata per codificare lo screencast"
 
 # (ndt) quel "in launchers" non mi convince...
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid ""
 "The shell normally monitors active applications in order to present the most "
 "used ones (e.g. in launchers). While this data will be kept private, you may "
@@ -155,16 +152,16 @@ msgstr ""
 "disabilitare questa funzionalità per motivi di privacy. I dati già salvati "
 "non verranno comunque rimossi."
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid "Uuids of extensions to disable"
 msgstr "UUID delle estensioni da disabilitare"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "Whether to collect stats about applications usage"
 msgstr ""
 "Indica se raccogliere statistiche riguardo l'utilizzo delle applicazioni"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "disabled OpenSearch providers"
 msgstr ""
 
@@ -293,47 +290,43 @@ msgstr ""
 msgid "Width of the vertical and horizontal lines that make up the crosshairs."
 msgstr ""
 
-#: ../js/misc/util.js:86
-msgid "Command not found"
-msgstr ""
-
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:113
+#: ../js/misc/util.js:108
 msgid "Could not parse command:"
 msgstr "Impossibile analizzare il comando:"
 
-#: ../js/misc/util.js:135
+#: ../js/misc/util.js:130
 msgid "No such application"
 msgstr "Applicazione inesistente"
 
-#: ../js/misc/util.js:148
+#: ../js/misc/util.js:143 ../js/ui/runDialog.js:351
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Esecuzione di «%s» non riuscita:"
 
 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:164
+#: ../js/ui/appDisplay.js:155
 msgid "All"
 msgstr "Tutte"
 
-#: ../js/ui/appDisplay.js:245
+#: ../js/ui/appDisplay.js:236
 msgid "APPLICATIONS"
 msgstr "APPLICAZIONI"
 
-#: ../js/ui/appDisplay.js:275
+#: ../js/ui/appDisplay.js:266
 msgid "PREFERENCES"
 msgstr "PREFERENZE"
 
-#: ../js/ui/appDisplay.js:572
+#: ../js/ui/appDisplay.js:563
 msgid "New Window"
 msgstr "Nuova finestra"
 
-#: ../js/ui/appDisplay.js:576
+#: ../js/ui/appDisplay.js:567
 msgid "Remove from Favorites"
 msgstr "Rimuovi dai preferiti"
 
-#: ../js/ui/appDisplay.js:577
+#: ../js/ui/appDisplay.js:568
 msgid "Add to Favorites"
 msgstr "Aggiungi ai preferiti"
 
@@ -466,72 +459,72 @@ msgstr "Visualizza sorgente"
 msgid "Web Page"
 msgstr "Pagina web"
 
-#: ../js/ui/messageTray.js:1778
+#: ../js/ui/messageTray.js:1765
 msgid "System Information"
 msgstr "Informazione di sistema"
 
-#: ../js/ui/overview.js:88
+#: ../js/ui/overview.js:75
 msgid "Undo"
 msgstr "Annulla"
 
-#: ../js/ui/overview.js:159
+#: ../js/ui/overview.js:140
 msgid "Windows"
 msgstr "Finestre"
 
-#: ../js/ui/overview.js:162
+#: ../js/ui/overview.js:143
 msgid "Applications"
 msgstr "Applicazioni"
 
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:483
+#: ../js/ui/panel.js:479
 #, c-format
 msgid "Quit %s"
 msgstr "Chiudi %s"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:568
+#: ../js/ui/panel.js:564
 msgid "%a %b %e, %R:%S"
 msgstr "%a %e %b, %k.%M.%S"
 
 # (ndt) proviamo col k, se non funge, sappiamo il perché...
-#: ../js/ui/panel.js:569
+#: ../js/ui/panel.js:565
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %k.%M"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:573
+#: ../js/ui/panel.js:569
 msgid "%a %R:%S"
 msgstr "%a %k.%M.%S"
 
-#: ../js/ui/panel.js:574
+#: ../js/ui/panel.js:570
 msgid "%a %R"
 msgstr "%a %k.%M"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/panel.js:581
+#: ../js/ui/panel.js:577
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%a %e %b, %l.%M.%S %P"
 
-#: ../js/ui/panel.js:582
+#: ../js/ui/panel.js:578
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a %e %b, %l.%M %P"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/panel.js:586
+#: ../js/ui/panel.js:582
 msgid "%a %l:%M:%S %p"
 msgstr "%a %l.%M.%S %P"
 
-#: ../js/ui/panel.js:587
+#: ../js/ui/panel.js:583
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %P"
 
 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:732
+#: ../js/ui/panel.js:728
 msgid "Activities"
 msgstr "Attività"
 
@@ -560,7 +553,7 @@ msgstr "RISORSE E DISPOSITIVI"
 #. simply result in invisible toggle switches.
 #: ../js/ui/popupMenu.js:33
 msgid "toggle-switch-us"
-msgstr "toggle-switch-us"
+msgstr "toggle-switch-intl"
 
 #: ../js/ui/runDialog.js:209
 msgid "Please enter a command:"
@@ -690,7 +683,7 @@ msgstr "Errore nell'esplorare il dispositivo"
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "Non è possibile esplorare il dispositivo richiesto, l'errore è «%s»"
 
-#: ../js/ui/status/bluetooth.js:251
+#: ../js/ui/status/bluetooth.js:251 ../js/ui/status/keyboard.js:78
 msgid "Keyboard Settings"
 msgstr "Impostazioni tastiera"
 
@@ -765,10 +758,6 @@ msgstr "Inserire il PIN indicato sul dispositivo."
 msgid "OK"
 msgstr "OK"
 
-#: ../js/ui/status/keyboard.js:78
-msgid "Localization Settings"
-msgstr "Impostazioni localizzazione"
-
 #: ../js/ui/status/power.js:85
 msgid "Power Settings"
 msgstr "Impostazioni alimentazione"
@@ -907,14 +896,14 @@ msgid "'%s' is ready"
 msgstr "«%s» è pronto"
 
 # (ndt) un po' liberetta...
-#: ../js/ui/workspacesView.js:243
+#: ../js/ui/workspacesView.js:244
 msgid ""
 "Can't add a new workspace because maximum workspaces limit has been reached."
 msgstr ""
 "Impossibile aggiungere un nuovo spazio di lavoro: raggiunto il limite "
 "massimo consentito."
 
-#: ../js/ui/workspacesView.js:259
+#: ../js/ui/workspacesView.js:260
 msgid "Can't remove the first workspace."
 msgstr "Impossibile rimuovere il primo spazio di lavoro."
 
@@ -940,32 +929,32 @@ msgstr[1] "%u ingressi"
 msgid "System Sounds"
 msgstr "Audio di sistema"
 
-#: ../src/shell-global.c:1365
+#: ../src/shell-global.c:1366
 msgid "Less than a minute ago"
 msgstr "Meno di un minuto fa"
 
-#: ../src/shell-global.c:1369
+#: ../src/shell-global.c:1370
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuto fa"
 msgstr[1] "%d minuti fa"
 
-#: ../src/shell-global.c:1374
+#: ../src/shell-global.c:1375
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ora fa"
 msgstr[1] "%d ore fa"
 
-#: ../src/shell-global.c:1379
+#: ../src/shell-global.c:1380
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d giorno fa"
 msgstr[1] "%d giorni fa"
 
-#: ../src/shell-global.c:1384
+#: ../src/shell-global.c:1385
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"

po/pa.po

@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=gnome-shell&component=general\n"
-"POT-Creation-Date: 2011-01-27 20:47+0000\n"
+"POT-Creation-Date: 2011-01-15 00:23+0000\n"
-"PO-Revision-Date: 2011-01-29 07:39+0530\n"
+"PO-Revision-Date: 2011-01-16 11:07+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
@@ -74,8 +74,7 @@ msgstr "ਜੇ ਚੋਣ ਕੀਤੀ ਤਾਂ ਕੈਲੰਡਰ ਵਿੱਚ
 msgid "List of desktop file IDs for favorite applications"
 msgstr "ਪਸੰਦੀਦਾ ਐਪਲੀਕੇਸ਼ਨ ਲਈ ਡੈਸਕਟਾਪ ਫਾਇਲ ID ਦੀ ਲਿਸਟ ਹੈ"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:12
+#: ../data/org.gnome.shell.gschema.xml.in.h:11
-#, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
 "used for gst-launch. The pipeline should have an unconnected sink pad where "
@@ -84,31 +83,29 @@ msgid ""
 "pipeline can also take care of its own output - this might be used to send "
 "the output to an icecast server via shout2send or similar. When unset or set "
 "to an empty value, the default pipeline will be used. This is currently "
-"'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux' and "
+"'videorate ! theoraenc ! oggmux' and records to Ogg Theora."
-"records to WEBM using the VP8 codec. %T is used as a placeholder for a guess "
-"at the optimal thread count on the system."
 msgstr ""
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.h:12
 msgid "Show date in clock"
 msgstr "ਘੜੀ ਵਿੱਚ ਮਿਤੀ ਵੇਖੋ"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:13
 msgid "Show the week date in the calendar"
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਹਫ਼ਤਾ ਮਿਤੀ ਵੇਖੋ"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
 msgid "Show time with seconds"
 msgstr "ਸਮਾਂ ਵਿੱਚ ਸਕਿੰਟ ਵੇਖੋ"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
 msgstr ""
 "ਇਹਨਾਂ ਐਂਡਟਟੀਫਾਇਰ ਨਾਲ ਸਬੰਧਿਤ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਪਸੰਦੀਦਾ ਖੇਤਰ 'ਚ ਵੇਖਾਇਆ ਜਾਵੇਗਾ।"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@@ -120,7 +117,7 @@ msgstr ""
 "ਰਿਕਾਰਡ ਕੀਤਾ "
 "ਜਾਵੇਗਾ।"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -129,11 +126,11 @@ msgstr ""
 "ਫਰੇਮ ਪ੍ਰਤੀ "
 "ਸਕਿੰਟ 'ਚ ਹੈ।"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "ਸਕਰੀਨਕਾਸਟ ਇੰਕੋਡ ਕਰਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਜੀਸਟਰੀਮਰ ਪਾਇਪਲਾਇਨ"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid ""
 "The shell normally monitors active applications in order to present the most "
 "used ones (e.g. in launchers). While this data will be kept private, you may "
@@ -148,18 +145,14 @@ msgstr ""
 "ਕਰਨ ਨਾਲ ਪਹਿਲਾਂ "
 "ਸੰਭਾਲਿਆ ਗਿਆ ਡਾਟਾ ਹਟਾਇਆ ਨਹੀਂ ਜਾਵੇਗਾ।"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid "Uuids of extensions to disable"
 msgstr "ਇਕਟੈਨਸ਼ਨ ਦੀ Uuids ਬੰਦ ਹੈ"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "Whether to collect stats about applications usage"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਰਤੋਂ ਬਾਰੇ ਅੰਕੜੇ ਇੱਕਠੇ ਕਰਨੇ ਹਨ"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:23
-msgid "disabled OpenSearch providers"
-msgstr "ਓਪਨਸਰਚ ਉਪਲੱਬਧ ਕਰਵਾਉਣ ਵਾਲੇ ਬੰਦ ਹਨ"
-
 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:1
 msgid "Clip the crosshairs at the center"
 msgstr "ਸੈਂਟਰ ਉੱਤੇ ਕਰਾਂਸਹੇਅਰ ਕਲਿੱਪ ਕਰੋ"
@@ -297,47 +290,45 @@ msgstr ""
 msgid "Width of the vertical and horizontal lines that make up the crosshairs."
 msgstr "ਵਰਟੀਕਲ ਤੇ ਹਰੀਜੱਟਲ ਲਾਈਨਾਂ ਦੀ ਚੌੜਾਈ, ਜੋ ਕਿ ਕਰਾਂਸਹੇਅਰ ਬਣਾਉਂਦੀਆਂ ਹਨ"
 
-#: ../js/misc/util.js:86
-msgid "Command not found"
-msgstr "ਕਮਾਂਡ ਨਹੀਂ ਲੱਭੀ"
-
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:113
+#: ../js/misc/util.js:108
+#| msgid "Please enter a command:"
 msgid "Could not parse command:"
 msgstr "ਕਮਾਂਡ ਪਾਰਸ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ:"
 
-#: ../js/misc/util.js:135
+#: ../js/misc/util.js:130
+#| msgid "Applications"
 msgid "No such application"
 msgstr "ਇੰਞ ਦੀ ਕੋਈ ਐਪਲੀਕੇਸ਼ਨ ਨਹੀਂ ਹੈ"
 
-#: ../js/misc/util.js:148
+#: ../js/misc/util.js:143 ../js/ui/runDialog.js:364
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "'%s' ਚਲਾਉਣ ਲਈ ਫੇਲ੍ਹ:"
 
 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:164
+#: ../js/ui/appDisplay.js:155
 msgid "All"
 msgstr "ਸਭ"
 
-#: ../js/ui/appDisplay.js:245
+#: ../js/ui/appDisplay.js:236
 msgid "APPLICATIONS"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ"
 
-#: ../js/ui/appDisplay.js:275
+#: ../js/ui/appDisplay.js:266
 msgid "PREFERENCES"
 msgstr "ਪਸੰਦ"
 
-#: ../js/ui/appDisplay.js:572
+#: ../js/ui/appDisplay.js:563
 msgid "New Window"
 msgstr "ਨਵੀਂ ਵਿੰਡੋ"
 
-#: ../js/ui/appDisplay.js:576
+#: ../js/ui/appDisplay.js:567
 msgid "Remove from Favorites"
 msgstr "ਪਸੰਦ ਵਿੱਚੋਂ ਹਟਾਓ"
 
-#: ../js/ui/appDisplay.js:577
+#: ../js/ui/appDisplay.js:568
 msgid "Add to Favorites"
 msgstr "ਪਸੰਦ 'ਚ ਸ਼ਾਮਲ ਕਰੋ"
 
@@ -361,10 +352,12 @@ msgstr "ਤਾਜ਼ਾ ਆਈਟਮਾਂ"
 
 #: ../js/ui/endSessionDialog.js:63
 #, c-format
+#| msgid "Log Out..."
 msgid "Log Out %s"
 msgstr "%s ਲਾਗਆਉਟ"
 
 #: ../js/ui/endSessionDialog.js:64 ../js/ui/endSessionDialog.js:69
+#| msgid "Log Out..."
 msgid "Log Out"
 msgstr "ਲਾਗਆਉਟ"
 
@@ -388,6 +381,7 @@ msgid "Logging out of the system."
 msgstr "ਸਿਸਟਮ ਲਾਗ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
 
 #: ../js/ui/endSessionDialog.js:74 ../js/ui/endSessionDialog.js:78
+#| msgid "Shut Down..."
 msgid "Shut Down"
 msgstr "ਬੰਦ ਕਰੋ"
 
@@ -405,6 +399,7 @@ msgid "Shutting down the system."
 msgstr "ਸਿਸਟਮ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
 
 #: ../js/ui/endSessionDialog.js:84 ../js/ui/endSessionDialog.js:88
+#| msgid "Restart..."
 msgid "Restart"
 msgstr "ਮੁੜ-ਚਾਲੂ ਕਰੋ"
 
@@ -426,7 +421,7 @@ msgstr "ਸਿਸਟਮ ਮੁੜ-ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ
 msgid "Confirm"
 msgstr "ਪੁਸ਼ਟੀ"
 
-#: ../js/ui/endSessionDialog.js:400 ../js/ui/status/bluetooth.js:470
+#: ../js/ui/endSessionDialog.js:400 ../js/ui/status/bluetooth.js:469
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
@@ -460,88 +455,89 @@ msgstr "ਸਰੋਤ ਵੇਖੋ"
 msgid "Web Page"
 msgstr "ਵੈੱਬ ਪੇਜ਼"
 
-#: ../js/ui/messageTray.js:1765
+#: ../js/ui/messageTray.js:1748
+#| msgid "Account Information..."
 msgid "System Information"
 msgstr "ਸਿਸਟਮ ਜਾਣਕਾਰੀ"
 
-#: ../js/ui/overview.js:88
+#: ../js/ui/overview.js:75
 msgid "Undo"
 msgstr "ਵਾਪਸ"
 
-#: ../js/ui/overview.js:159
+#: ../js/ui/overview.js:140
 msgid "Windows"
 msgstr "ਵਿੰਡੋ"
 
-#: ../js/ui/overview.js:162
+#: ../js/ui/overview.js:143
 msgid "Applications"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ"
 
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:483
+#: ../js/ui/panel.js:479
 #, c-format
 msgid "Quit %s"
 msgstr "%s ਬੰਦ ਕਰੋ"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:568
+#: ../js/ui/panel.js:564
 msgid "%a %b %e, %R:%S"
 msgstr "%a, %e %b %R:%S"
 
-#: ../js/ui/panel.js:569
+#: ../js/ui/panel.js:565
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:573
+#: ../js/ui/panel.js:569
 msgid "%a %R:%S"
 msgstr "%a %R:%S"
 
-#: ../js/ui/panel.js:574
+#: ../js/ui/panel.js:570
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/panel.js:581
+#: ../js/ui/panel.js:577
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%a %e %b, %l:%M:%S %p"
 
-#: ../js/ui/panel.js:582
+#: ../js/ui/panel.js:578
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a %e %b, %l:%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/panel.js:586
+#: ../js/ui/panel.js:582
 msgid "%a %l:%M:%S %p"
 msgstr "%a %l:%M:%S %p"
 
-#: ../js/ui/panel.js:587
+#: ../js/ui/panel.js:583
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:732
+#: ../js/ui/panel.js:728
 msgid "Activities"
 msgstr "ਸਰਗਰਮੀਆਂ"
 
-#: ../js/ui/placeDisplay.js:106
+#: ../js/ui/placeDisplay.js:112
 #, c-format
 msgid "Failed to unmount '%s'"
 msgstr "'%s' ਅਣ-ਮਾਊਂਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
-#: ../js/ui/placeDisplay.js:109
+#: ../js/ui/placeDisplay.js:115
 msgid "Retry"
 msgstr "ਮੁੜ-ਕੋਸ਼ਿਸ਼"
 
-#: ../js/ui/placeDisplay.js:150
+#: ../js/ui/placeDisplay.js:160
 msgid "Connect to..."
 msgstr "...ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ"
 
-#: ../js/ui/placeDisplay.js:386
+#: ../js/ui/placeDisplay.js:559
 msgid "PLACES & DEVICES"
 msgstr "ਥਾਵਾਂ ਤੇ ਜੰਤਰ"
 
@@ -554,7 +550,7 @@ msgstr "ਥਾਵਾਂ ਤੇ ਜੰਤਰ"
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"
 
-#: ../js/ui/runDialog.js:209
+#: ../js/ui/runDialog.js:222
 msgid "Please enter a command:"
 msgstr "ਕਮਾਂਡ ਦਿਓ ਜੀ:"
 
@@ -638,7 +634,7 @@ msgstr "ਵੱਧ ਕਨਟਰਾਸਟ"
 msgid "Large Text"
 msgstr "ਵੱਡੇ ਅੱਖਰ"
 
-#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:241
+#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:240
 msgid "Bluetooth"
 msgstr "ਬਲਿਊਟੁੱਥ"
 
@@ -654,111 +650,106 @@ msgstr "...ਜੰਤਰ ਨੂੰ ਫਾਇਲਾਂ ਭੇਜੋ"
 msgid "Setup a New Device..."
 msgstr "...ਨਵਾਂ ਜੰਤਰ ਸੈਟਅੱਪ"
 
-#: ../js/ui/status/bluetooth.js:95
+#: ../js/ui/status/bluetooth.js:94
 msgid "Bluetooth Settings"
 msgstr "ਬਲਿਊਟੁੱਥ ਸੈਟਿੰਗ"
 
-#: ../js/ui/status/bluetooth.js:192
+#: ../js/ui/status/bluetooth.js:191
 msgid "Connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ"
 
-#: ../js/ui/status/bluetooth.js:228
+#: ../js/ui/status/bluetooth.js:227
 msgid "Send Files..."
 msgstr "...ਫਾਇਲਾਂ ਭੇਜੋ"
 
-#: ../js/ui/status/bluetooth.js:233
+#: ../js/ui/status/bluetooth.js:232
 msgid "Browse Files..."
 msgstr "...ਫਾਇਲਾਂ ਦੀ ਝਲਕ"
 
-#: ../js/ui/status/bluetooth.js:242
+#: ../js/ui/status/bluetooth.js:241
 msgid "Error browsing device"
 msgstr "ਜੰਤਰ ਬਰਾਊਜ਼ ਕਰਨ ਲਈ ਗਲਤੀ"
 
-#: ../js/ui/status/bluetooth.js:243
+#: ../js/ui/status/bluetooth.js:242
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "ਮੰਗ ਕੀਤੇ ਗਏ ਜੰਤਰ ਨੂੰ ਬਰਾਊਜ਼ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ, ਗਲਤੀ ਸੀ '%s'"
 
-#: ../js/ui/status/bluetooth.js:251
+#: ../js/ui/status/bluetooth.js:250 ../js/ui/status/keyboard.js:78
 msgid "Keyboard Settings"
 msgstr "ਕੀਬੋਰਡ ਸੈਟਿੰਗ"
 
-#: ../js/ui/status/bluetooth.js:256
+#: ../js/ui/status/bluetooth.js:255
 msgid "Mouse Settings"
 msgstr "ਮਾਊਸ ਸੈਟਿੰਗ"
 
-#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:63
+#: ../js/ui/status/bluetooth.js:262 ../js/ui/status/volume.js:63
 msgid "Sound Settings"
 msgstr "ਸਾਊਂਡ ਸੈਟਿੰਗ"
 
-#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371
+#: ../js/ui/status/bluetooth.js:336 ../js/ui/status/bluetooth.js:370
-#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444
+#: ../js/ui/status/bluetooth.js:410 ../js/ui/status/bluetooth.js:443
 msgid "Bluetooth Agent"
 msgstr "ਬਲਿਊਟੁੱਥ ਏਜੰਟ"
 
-#: ../js/ui/status/bluetooth.js:372
+#: ../js/ui/status/bluetooth.js:371
 #, c-format
 msgid "Authorization request from %s"
 msgstr "'%s' ਤੋਂ ਪਰਮਾਣਕਿਤਾ ਮੰਗ"
 
-#: ../js/ui/status/bluetooth.js:378
+#: ../js/ui/status/bluetooth.js:377
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "ਜੰਤਰ %s ਸਰਵਿਸ '%s' ਨੂੰ ਵਰਤਣੀ ਚਾਹੁੰਦਾ ਹੈ।"
 
-#: ../js/ui/status/bluetooth.js:380
+#: ../js/ui/status/bluetooth.js:379
 msgid "Always grant access"
 msgstr "ਹਮੇਸ਼ਾ ਪਹੁੰਚ ਮਨਜ਼ੂਰ"
 
-#: ../js/ui/status/bluetooth.js:381
+#: ../js/ui/status/bluetooth.js:380
 msgid "Grant this time only"
 msgstr "ਕੇਵਲ ਇਸ ਸਮੇਂ ਹੀ ਮਨਜ਼ੂਰ"
 
-#: ../js/ui/status/bluetooth.js:382
+#: ../js/ui/status/bluetooth.js:381
 msgid "Reject"
 msgstr "ਨਾ-ਮਨਜ਼ੂਰ"
 
-#: ../js/ui/status/bluetooth.js:412
+#: ../js/ui/status/bluetooth.js:411
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "%s ਲਈ ਪੇਅਰ ਕਰਨ ਦੀ ਪੁਸ਼ਟੀ"
 
-#: ../js/ui/status/bluetooth.js:418 ../js/ui/status/bluetooth.js:452
+#: ../js/ui/status/bluetooth.js:417 ../js/ui/status/bluetooth.js:451
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "ਜੰਤਰ %s ਇਸ ਕੰਪਿਊਟਰ ਨਾਲ ਪੇਅਰ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ"
 
-#: ../js/ui/status/bluetooth.js:419
+#: ../js/ui/status/bluetooth.js:418
 #, c-format
 msgid "Please confirm whether the PIN '%s' matches the one on the device."
 msgstr "ਪੁਸ਼ਟੀ ਕਰੋ ਜੀ ਕਿ ਪਿੰਨ '%s' ਜੰਤਰ ਉੱਤੇ ਮੌਜੂਦ ਪਿੰਨ ਨਾਲ ਮਿਲਦਾ ਹੈ।"
 
-#: ../js/ui/status/bluetooth.js:421
+#: ../js/ui/status/bluetooth.js:420
 msgid "Matches"
 msgstr "ਮਿਲਦਾ ਹੈ"
 
-#: ../js/ui/status/bluetooth.js:422
+#: ../js/ui/status/bluetooth.js:421
 msgid "Does not match"
 msgstr "ਮਿਲਦਾ ਨਹੀਂ ਹੈ"
 
-#: ../js/ui/status/bluetooth.js:445
+#: ../js/ui/status/bluetooth.js:444
 #, c-format
 msgid "Pairing request for %s"
 msgstr "%s ਲਈ ਪੇਅਰ ਕਰਨ ਦੀ ਮੰਗ"
 
-#: ../js/ui/status/bluetooth.js:453
+#: ../js/ui/status/bluetooth.js:452
 msgid "Please enter the PIN mentioned on the device."
 msgstr "ਜੰਤਰ ਉੱਤੇ ਦਿੱਤਾ ਗਿਆ ਪਿੰਨ ਦਿਉ ਜੀ।"
 
-#: ../js/ui/status/bluetooth.js:469
+#: ../js/ui/status/bluetooth.js:468
 msgid "OK"
 msgstr "ਠੀਕ ਹੈ"
 
-#: ../js/ui/status/keyboard.js:78
-#| msgid "Sound Settings"
-msgid "Localization Settings"
-msgstr "ਲੋਕਲਾਈਜ਼ੇਸ਼ਨ ਸੈਟਿੰਗ"
-
 #: ../js/ui/status/power.js:85
 msgid "Power Settings"
 msgstr "ਪਾਵਰ ਸੈਟਿੰਗ"
@@ -893,14 +884,14 @@ msgstr "%s ਸ਼ੁਰੂ ਹੋਣਾ ਖਤਮ ਹੋਇਆ"
 msgid "'%s' is ready"
 msgstr "'%s' ਤਿਆਰ ਹੈ"
 
-#: ../js/ui/workspacesView.js:243
+#: ../js/ui/workspacesView.js:244
 msgid ""
 "Can't add a new workspace because maximum workspaces limit has been reached."
 msgstr ""
 "ਨਵਾਂ ਵਰਕਸਪੇਸ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਵਰਕਸਪੇਸਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ ਪੂਰੀ ਹੋ "
 "ਚੁੱਕੀ ਹੈ।"
 
-#: ../js/ui/workspacesView.js:259
+#: ../js/ui/workspacesView.js:260
 msgid "Can't remove the first workspace."
 msgstr "ਪਹਿਲਾਂ ਵਰਕਸਪੇਸ ਨਹੀਂ ਹਟਾਇਆ ਜਾ ਸਕਦਾ।"
 
@@ -926,32 +917,32 @@ msgstr[1] "%u ਇੰਪੁੱਟ"
 msgid "System Sounds"
 msgstr "ਸਿਸਟਮ ਸਾਊਂਡ"
 
-#: ../src/shell-global.c:1365
+#: ../src/shell-global.c:1233
 msgid "Less than a minute ago"
 msgstr "ਇੱਕ ਮਿੰਟ ਤੋਂ ਘੱਟ ਚਿਰ ਪਹਿਲਾਂ"
 
-#: ../src/shell-global.c:1369
+#: ../src/shell-global.c:1237
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 
-#: ../src/shell-global.c:1374
+#: ../src/shell-global.c:1242
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ਘੰਟਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਘੰਟੇ ਪਹਿਲਾਂ"
 
-#: ../src/shell-global.c:1379
+#: ../src/shell-global.c:1247
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ਦਿਨ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ"
 
-#: ../src/shell-global.c:1384
+#: ../src/shell-global.c:1252
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"

src/shell-evolution-event-source.c

@@ -99,7 +99,7 @@ shell_evolution_event_source_request_range (ShellEvolutionEventSource *source,
                                             gint64                     msec_begin,
                                             gint64                     msec_end)
 {
-  GDateTime *middle_utc, *middle;
+  GDateTime *middle;
 
   /* The CalendarClient type is a convenience wrapper on top of
    * Evolution Data Server. It is based on the assumption that only
@@ -112,10 +112,7 @@ shell_evolution_event_source_request_range (ShellEvolutionEventSource *source,
    * days before and after) it works out just fine.
    */
 
-  middle_utc = g_date_time_new_from_unix_utc ((msec_begin + msec_end) / 2 / 1000);
+  middle = g_date_time_new_from_unix_utc ((msec_begin + msec_end) / 2 / 1000);
-  /* CalendarClient uses localtime rather than UTC */
-  middle = g_date_time_to_local (middle_utc);
-  g_date_time_unref (middle_utc);
   g_date_time_get_ymd (middle, &source->req_year, &source->req_mon, NULL);
   g_date_time_unref (middle);
   calendar_client_select_month (source->client, source->req_mon - 1, source->req_year);
@@ -155,22 +152,15 @@ shell_evolution_event_source_get_events  (ShellEvolutionEventSource *source,
 {
   GList *result;
   GDateTime *cur_date;
-  GDateTime *begin_date_utc, *begin_date;
+  GDateTime *begin_date;
-  GDateTime *end_date_utc, *end_date;
+  GDateTime *end_date;
 
   g_return_val_if_fail (msec_begin <= msec_end, NULL);
 
   result = NULL;
 
-  begin_date_utc = g_date_time_new_from_unix_utc (msec_begin / 1000);
+  begin_date = g_date_time_new_from_unix_utc (msec_begin / 1000);
-  end_date_utc = g_date_time_new_from_unix_utc (msec_end / 1000);
+  end_date = g_date_time_new_from_unix_utc (msec_end / 1000);
-
-  /* CalendarClient uses localtime rather than UTC */
-  begin_date = g_date_time_to_local (begin_date_utc);
-  end_date = g_date_time_to_local (end_date_utc);
-  g_date_time_unref (begin_date_utc);
-  g_date_time_unref (end_date_utc);
-
   cur_date = g_date_time_ref (begin_date);
   do
     {

src/tray/na-tray-child.h

@@ -24,7 +24,6 @@
 #define __NA_TRAY_CHILD_H__
 
 #include <gtk/gtk.h>
-#include <gtk/gtkx.h>
 #include <gdk/gdkx.h>
 
 G_BEGIN_DECLS

src/tray/na-tray-manager.c

@@ -315,13 +315,19 @@ pending_message_free (PendingMessage *message)
   g_free (message);
 }
 
-static void
+static GdkFilterReturn
-na_tray_manager_handle_message_data (NaTrayManager       *manager,
+na_tray_manager_handle_client_message_message_data (GdkXEvent *xev,
-				     XClientMessageEvent *xevent)
+                                                    GdkEvent  *event,
+                                                    gpointer   data)
 {
-  GList *p;
+  XClientMessageEvent *xevent;
-  int    len;
+  NaTrayManager       *manager;
+  GList               *p;
+  int                  len;
   
+  xevent  = (XClientMessageEvent *) xev;
+  manager = data;
+
   /* Try to see if we can find the pending message in the list */
   for (p = manager->messages; p; p = p->next)
     {
@@ -355,6 +361,8 @@ na_tray_manager_handle_message_data (NaTrayManager       *manager,
           break;
 	}
     }
+
+  return GDK_FILTER_REMOVE;
 }
 
 static void
@@ -374,17 +382,13 @@ na_tray_manager_handle_begin_message (NaTrayManager       *manager,
   if (!socket)
     return;
 
-  timeout = xevent->data.l[2];
-  len     = xevent->data.l[3];
-  id      = xevent->data.l[4];
-
   /* Check if the same message is already in the queue and remove it if so */
   for (p = manager->messages; p; p = p->next)
     {
       PendingMessage *pmsg = p->data;
 
       if (xevent->window == pmsg->window &&
-	  id == pmsg->id)
+	  xevent->data.l[4] == pmsg->id)
 	{
 	  /* Hmm, we found it, now remove it */
 	  pending_message_free (pmsg);
@@ -394,6 +398,10 @@ na_tray_manager_handle_begin_message (NaTrayManager       *manager,
 	}
     }
 
+  timeout = xevent->data.l[2];
+  len     = xevent->data.l[3];
+  id      = xevent->data.l[4];
+
   if (len == 0)
     {
       g_signal_emit (manager, manager_signals[MESSAGE_SENT], 0,
@@ -420,9 +428,6 @@ na_tray_manager_handle_cancel_message (NaTrayManager       *manager,
 {
   GList     *p;
   GtkSocket *socket;
-  long       id;
-
-  id = xevent->data.l[2];
   
   /* Check if the message is in the queue and remove it if so */
   for (p = manager->messages; p; p = p->next)
@@ -430,7 +435,7 @@ na_tray_manager_handle_cancel_message (NaTrayManager       *manager,
       PendingMessage *msg = p->data;
 
       if (xevent->window == msg->window &&
-	  id == msg->id)
+	  xevent->data.l[4] == msg->id)
 	{
 	  pending_message_free (msg);
 	  manager->messages = g_list_remove_link (manager->messages, p);
@@ -449,6 +454,39 @@ na_tray_manager_handle_cancel_message (NaTrayManager       *manager,
     }
 }
 
+static GdkFilterReturn
+na_tray_manager_handle_client_message_opcode (GdkXEvent *xev,
+                                              GdkEvent  *event,
+                                              gpointer   data)
+{
+  XClientMessageEvent *xevent;
+  NaTrayManager       *manager;
+
+  xevent  = (XClientMessageEvent *) xev;
+  manager = data;
+
+  switch (xevent->data.l[1])
+    {
+    case SYSTEM_TRAY_REQUEST_DOCK:
+      /* Ignore this one since we don't know on which window this was received
+       * and so we can't know for which screen this is. It will be handled
+       * in na_tray_manager_window_filter() since we also receive it there */
+      break;
+
+    case SYSTEM_TRAY_BEGIN_MESSAGE:
+      na_tray_manager_handle_begin_message (manager, xevent);
+      return GDK_FILTER_REMOVE;
+
+    case SYSTEM_TRAY_CANCEL_MESSAGE:
+      na_tray_manager_handle_cancel_message (manager, xevent);
+      return GDK_FILTER_REMOVE;
+    default:
+      break;
+    }
+
+  return GDK_FILTER_CONTINUE;
+}
+
 static GdkFilterReturn
 na_tray_manager_window_filter (GdkXEvent *xev,
                                GdkEvent  *event,
@@ -459,7 +497,8 @@ na_tray_manager_window_filter (GdkXEvent *xev,
 
   if (xevent->type == ClientMessage)
     {
-      /* _NET_SYSTEM_TRAY_OPCODE: SYSTEM_TRAY_REQUEST_DOCK */
+      /* We handle this client message here. See comment in
+       * na_tray_manager_handle_client_message_opcode() for details */
       if (xevent->xclient.message_type == manager->opcode_atom &&
           xevent->xclient.data.l[1]    == SYSTEM_TRAY_REQUEST_DOCK)
 	{
@@ -467,29 +506,6 @@ na_tray_manager_window_filter (GdkXEvent *xev,
                                                (XClientMessageEvent *) xevent);
           return GDK_FILTER_REMOVE;
 	}
-      /* _NET_SYSTEM_TRAY_OPCODE: SYSTEM_TRAY_BEGIN_MESSAGE */
-      else if (xevent->xclient.message_type == manager->opcode_atom &&
-               xevent->xclient.data.l[1]    == SYSTEM_TRAY_BEGIN_MESSAGE)
-        {
-          na_tray_manager_handle_begin_message (manager,
-                                                (XClientMessageEvent *) event);
-          return GDK_FILTER_REMOVE;
-        }
-      /* _NET_SYSTEM_TRAY_OPCODE: SYSTEM_TRAY_CANCEL_MESSAGE */
-      else if (xevent->xclient.message_type == manager->opcode_atom &&
-               xevent->xclient.data.l[1]    == SYSTEM_TRAY_CANCEL_MESSAGE)
-        {
-          na_tray_manager_handle_cancel_message (manager,
-                                                 (XClientMessageEvent *) event);
-          return GDK_FILTER_REMOVE;
-        }
-      /* _NET_SYSTEM_TRAY_MESSAGE_DATA */
-      else if (xevent->xclient.message_type == manager->message_data_atom)
-        {
-          na_tray_manager_handle_message_data (manager,
-                                               (XClientMessageEvent *) event);
-          return GDK_FILTER_REMOVE;
-        }
     }
   else if (xevent->type == SelectionClear)
     {
@@ -547,6 +563,9 @@ na_tray_manager_unmanage (NaTrayManager *manager)
                                            TRUE);
     }
 
+  //FIXME: we should also use gdk_remove_client_message_filter when it's
+  //available
+  // See bug #351254
   gdk_window_remove_filter (window,
                             na_tray_manager_window_filter, manager);  
 
@@ -717,8 +736,6 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
 
       message_data_atom = gdk_atom_intern ("_NET_SYSTEM_TRAY_MESSAGE_DATA",
                                            FALSE);
-      manager->message_data_atom = gdk_x11_atom_to_xatom_for_display (display,
-                                                                      message_data_atom);
 
       /* Add a window filter */
 #if 0
@@ -727,8 +744,17 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
                         G_CALLBACK (na_tray_manager_selection_clear_event),
                         manager);
 #endif
+      /* This is for SYSTEM_TRAY_REQUEST_DOCK and SelectionClear */
       gdk_window_add_filter (window,
                              na_tray_manager_window_filter, manager);
+      /* This is for SYSTEM_TRAY_BEGIN_MESSAGE and SYSTEM_TRAY_CANCEL_MESSAGE */
+      gdk_display_add_client_message_filter (display, opcode_atom,
+                                             na_tray_manager_handle_client_message_opcode,
+                                             manager);
+      /* This is for _NET_SYSTEM_TRAY_MESSAGE_DATA */
+      gdk_display_add_client_message_filter (display, message_data_atom,
+                                             na_tray_manager_handle_client_message_message_data,
+                                             manager);
       return TRUE;
     }
   else

src/tray/na-tray-manager.h

@@ -50,7 +50,6 @@ struct _NaTrayManager
 #ifdef GDK_WINDOWING_X11
   GdkAtom selection_atom;
   Atom    opcode_atom;
-  Atom    message_data_atom;
 #endif
   
   GtkWidget *invisible;

tools/build/gnome-shell-build-setup.sh

@@ -62,8 +62,7 @@ fi
 # libxklavier, libxml2, ORBit2, pam, python, readline,
 # spidermonkey ({mozilla,firefox,xulrunner}-js), startup-notification,
 # xdamage, icon-naming-utils, upower, libtool-ltdl, libvorbis,
-# libgcrypt, libtasn1, libgnome-keyring, libgtop, cups,
+# libgcrypt, libtasn1, libgnome-keyring, libgtop, cups
-# evolution-data-server
 #
 # Non-devel packages needed by gnome-shell and its deps:
 # glxinfo, gstreamer-plugins-base, gstreamer-plugins-good,

tools/build/gnome-shell.modules

@@ -88,10 +88,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gtk-theme-engine-clearlooks">
+    <branch repo="git.gnome.org" module="gtk-theme-engine-clearlooks"/>
+    <dependencies>
+      <dep package="gtk3"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-themes-standard">
     <branch repo="git.gnome.org" module="gnome-themes-standard"/>
     <dependencies>
-      <dep package="gtk3"/>
+      <dep package="gtk-theme-engine-clearlooks"/>
     </dependencies>
   </autotools>