Merge branch 'master' into datetime

data/theme/gnome-shell.css

@@ -17,6 +17,10 @@
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+stage {
+    font-family: cantarell, sans-serif;
+}
+
 .shell-link {
     color: #0000ff;
     text-decoration: underline;
@@ -101,7 +105,7 @@ StTooltip StLabel {
 
 .popup-menu {
     color: #ffffff;
-    font-size: 16px;
+    font-size: 14px;
     min-width: 200px;
 }
 
@@ -151,7 +155,7 @@ StTooltip StLabel {
 }
 
 .popup-menu-icon {
-    icon-size: 1em;
+    icon-size: 1.14em;
 }
 
 /* Switches (to be used in menus) */
@@ -178,7 +182,6 @@ StTooltip StLabel {
 
 #panel {
     color: #ffffff;
-    font-size: 16px;
     background-color: black;
 }
 
@@ -209,7 +212,7 @@ StTooltip StLabel {
     border-radius: 5px;
     border-radius-bottomleft: 0px;
     border-radius-bottomright: 0px;
-    font: 16px sans-serif;
+    font-size: 14px;
     font-weight: bold;
     transition-duration: 100;
 }
@@ -242,7 +245,7 @@ StTooltip StLabel {
 }
 
 .system-status-icon {
-    icon-size: 1em;
+    icon-size: 1.14em;
 }
 
 /* Overview */
@@ -464,7 +467,7 @@ StTooltip StLabel {
 
 .dash-search-button-label {
     color: #cccccc;
-    font: 16px sans-serif;
+    font-size: 16px;
 }
 
 /* Apps */
@@ -1036,7 +1039,7 @@ StTooltip StLabel {
 }
 
 .source-title {
-    font: 12px sans-serif;
+    font-size: 12px;
     font-weight: bold;
     padding-left: 4px;
 }
@@ -1053,7 +1056,7 @@ StTooltip StLabel {
     border-radius: 24px;
     padding: 20px;
 
-    font: 12px sans-serif;
+    font-size: 12px;
     color: white;
 }
 
@@ -1170,7 +1173,7 @@ StTooltip StLabel {
 
 /* Modal Dialogs */
 .modal-dialog {
-    font: 12pt sans-serif;
+    font-size: 12pt;
     border-radius: 24px;
     background-color: rgba(0.0, 0.0, 0.0, 0.9);
     border: 2px solid #868686;
@@ -1185,7 +1188,7 @@ StTooltip StLabel {
 .modal-dialog-button {
     border: 1px solid #8b8b8b;
     border-radius: 18px;
-    font: 14px sans-serif;
+    font-size: 14px;
 
     margin-left: 10px;
     margin-right: 10px;
@@ -1218,7 +1221,7 @@ StTooltip StLabel {
 
 /* Run Dialog */
 .run-dialog-label {
-    font: 12px sans-serif;
+    font-size: 12px;
     color: white;
 }
 
@@ -1229,12 +1232,12 @@ StTooltip StLabel {
 }
 
 .run-dialog-error-label {
-    font: 16px sans-serif;
+    font-size: 16px;
     color: white;
 }
 
 .run-dialog-entry {
-    font: 14px sans-serif;
+    font-size: 14px;
     font-weight: bold;
     width: 320px;
     color: white;
@@ -1255,7 +1258,7 @@ StTooltip StLabel {
 
 /* End Session Dialog */
 .end-session-dialog-subject {
-    font: 12pt sans-serif;
+    font-size: 12pt;
     font-weight: bold;
     color: #666666;
     padding-top: 10px;
@@ -1264,7 +1267,7 @@ StTooltip StLabel {
 }
 
 .end-session-dialog-description {
-    font: 10pt sans-serif;
+    font-size: 10pt;
     color: white;
     padding-left: 17px;
     padding-right: 40px;
@@ -1284,7 +1287,7 @@ StTooltip StLabel {
 }
 
 .end-session-dialog-app-list {
-    font: 10pt sans-serif;
+    font-size: 10pt;
     max-height: 200px;
     padding-top: 42px;
     padding-bottom: 42px;
@@ -1301,11 +1304,11 @@ StTooltip StLabel {
 }
 
 .end-session-dialog-app-list-item-name {
-    font: 10pt sans-serif;
+    font-size: 10pt;
 }
 
 .end-session-dialog-app-list-item-description {
-    font: 8pt sans-serif;
+    font-size: 8pt;
     color: #444444;
 }
 

js/ui/notificationDaemon.js

@@ -146,9 +146,9 @@ NotificationDaemon.prototype = {
                 return new St.Icon({ icon_name: icon,
                                      icon_type: St.IconType.FULLCOLOR,
                                      icon_size: size });
-        } else if (hints.icon_data) {
+        } else if (hints['image-data']) {
             let [width, height, rowStride, hasAlpha,
-                 bitsPerSample, nChannels, data] = hints.icon_data;
+                 bitsPerSample, nChannels, data] = hints['image-data'];
             return textureCache.load_from_raw(data, data.length, hasAlpha,
                                               width, height, rowStride, size);
         } else {
@@ -238,6 +238,15 @@ NotificationDaemon.prototype = {
 
         hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);
 
+        // Be compatible with the various hints for image data
+        // 'image-data' is the latest name of this hint, introduced in 1.2
+        if (!hints['image-data']) {
+            if (hints['image_data'])
+                hints['image-data'] = hints['image_data']; // version 1.1 of the spec
+            else if (hints['icon_data'])
+                hints['image-data'] = hints['icon_data']; // previous versions of the spec
+        }
+
         let ndata = { appName: appName,
                       icon: icon,
                       summary: summary,

src/st/st-icon.c

@@ -279,7 +279,7 @@ st_icon_style_changed (StWidget *widget)
   StThemeNode *theme_node = st_widget_get_theme_node (widget);
   StIconPrivate *priv = self->priv;
 
-  priv->theme_icon_size = st_theme_node_get_length (theme_node, "icon-size");
+  priv->theme_icon_size = (int)(0.5 + st_theme_node_get_length (theme_node, "icon-size"));
   st_icon_update_icon_size (self);
   st_icon_update (self);
 }