← Back to branch summary

~bratsche/ubuntu/maverick/monodevelop/disable-appmenu

« back to all changes in this revision

Viewing changes to src/addins/MonoDevelop.GtkCore/lib/stetic/libstetic/editor/ActionMenuItem.cs

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Ebner
  • Date: 2008-03-29 23:36:33 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20080329233633-wq5p1rktg8ek3vxc
Tags: 1.0+dfsg-1ubuntu1
https://launchpad.net/bugs/209012
* Merge from Debian unstable. (LP: #209012) Remaining Ubuntu changes:
+ debian/control: 
  - Build-dep on xulrunner-1.9-dev instead of firefox-dev
  - Depend on xulrunner-1.9 instead of firefox
+ don't do any MOZILLA_HOME/MOZILLA_FIVE_HOME business which isn't needed
  for xulrunner-1.9 using the standalone glue anymore (gecko gil uses
  standalone by default)
  - add debian/patches/use_xulrunner_1.9.dpatch
  - update debian/patches/00list
* Remove build-dep on libxul-dev and the dep on libxul0d
  since we are using xulrunner1.9 instead.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/MonoDevelop.GtkCore/lib/stetic/libstetic/editor/ActionMenuItem.cs
80
80
                                        localUpdate = true;
81
81
                                        if (entry.Text.Length > 0 || node.Action.GtkAction.StockId != null) {
82
82
                                                using (node.Action.UndoManager.AtomicChange) {
83
 
                                                        node.Action.GtkAction.Label = entry.Text;
 
83
                                                        node.Action.Label = entry.Text;
84
84
                                                        node.Action.NotifyChanged ();
85
85
                                                }
86
86
                                        }
387
387
                void OnStockSelected (object s, IconEventArgs args)
388
388
                {
389
389
                        using (node.Action.UndoManager.AtomicChange) {
390
 
                                node.Action.GtkAction.StockId = args.IconId;
 
390
                                node.Action.StockId = args.IconId;
391
391
                                node.Action.NotifyChanged ();
392
392
                        }
393
393
                }
419
419
                void OnClearIcon (object on, EventArgs args)
420
420
                {
421
421
                        using (node.Action.UndoManager.AtomicChange) {
422
 
                                node.Action.GtkAction.StockId = null;
 
422
                                node.Action.StockId = null;
423
423
                                node.Action.NotifyChanged ();
424
424
                        }
425
425
                }