Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:linuxmint/Cinnamon

  • Loading branch information...
commit 135af6b4f67b2bce126d7be9c8ec9924b1d6caee 2 parents 01080e8 + 17dd489
@clefebvre clefebvre authored
View
4 data/org.cinnamon.gschema.xml.in
@@ -237,9 +237,9 @@
<key name="date-format" type="s">
<default>"YYYY-MM-DD"</default>
- <_summary>Auto-hide panel</_summary>
+ <_summary>Date format</_summary>
<_description>
- Whether the panel autohides or not.
+ Format used for dates.
</_description>
</key>
View
3  files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js
@@ -144,7 +144,6 @@ ApplicationContextMenuItem.prototype = {
AppFavorites.getAppFavorites().removeFavorite(this._appButton.app.get_id());
break;
}
- this._appButton.actor.grab_key_focus();
this._appButton.toggleMenu();
return false;
}
@@ -1296,7 +1295,7 @@ MyApplet.prototype = {
}
}
} else if (nextType == GMenu.TreeItemType.DIRECTORY) {
- subdir = iter.get_directory();
+ let subdir = iter.get_directory();
this.applicationsByCategory[subdir.get_menu_id()] = new Array();
this._loadCategory(subdir, top_dir);
}
Please sign in to comment.
Something went wrong with that request. Please try again.