[cinnamon] Update to the latest snapshot

leigh123linux leigh123linux at fedoraproject.org
Tue Jul 24 22:02:27 UTC 2012


commit aec1c2d364fdf97b495aa35b5b1bbc31b7eccab8
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Jul 24 23:02:19 2012 +0100

    Update to the latest snapshot
    
    - Remove buildrequires telepathy-glib-devel, telepathy-logger-devel and folks-devel
    - Drop obsolete patches

 cinnamon-1.5.0_datetime_setting.patch |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/cinnamon-1.5.0_datetime_setting.patch b/cinnamon-1.5.0_datetime_setting.patch
new file mode 100644
index 0000000..dab9b02
--- /dev/null
+++ b/cinnamon-1.5.0_datetime_setting.patch
@@ -0,0 +1,25 @@
+--- a/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js	2012-03-12 14:31:34.000000000 +0000
++++ b/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js	2012-03-13 10:56:47.918048379 +0000
+@@ -62,9 +62,7 @@ MyApplet.prototype = {
+             this._calendar = new Calendar.Calendar(this._eventSource);       
+             vbox.add(this._calendar.actor);
+ 
+-            let item = new PopupMenu.PopupMenuItem(_("Date and Time Settings"))
+-            item.connect("activate", Lang.bind(this, this._onLaunchSettings));
+-            //this.menu.addMenuItem(item);
++            item = this.menu.addSettingsAction(_("Date and Time Settings"), 'gnome-datetime-panel.desktop');
+             if (item) {
+                 let separator = new PopupMenu.PopupSeparatorMenuItem();
+                 separator.setColumnWidths(1);
+@@ -96,11 +94,6 @@ MyApplet.prototype = {
+     on_applet_clicked: function(event) {
+         this.menu.toggle();
+     },
+-    
+-    _onLaunchSettings: function() {
+-        this.menu.close();
+-        Util.spawnCommandLine("cinnamon-settings calendar");
+-    },
+ 
+     _updateClockAndDate: function() {
+         let dateFormat = this._calendarSettings.get_string('date-format');       


More information about the scm-commits mailing list