← Back to branch summary

~ubuntu-branches/ubuntu/raring/banshee/raring

« back to all changes in this revision

Viewing changes to src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin
  • Date: 2012-09-30 23:52:25 UTC
  • mfrom: (1.2.23) (6.3.26 experimental)
  • Revision ID: package-import@ubuntu.com-20120930235225-cfjm36x1xjx6mim5
Tags: 2.6.0-1ubuntu1
* [f84d118] Merge from Debian Experimental, remaining changes:
  - Enable and recommend SoundMenu and Disable NotificationArea by default
  - Disable boo and karma extensions
  - Move desktop file for Meego UI to /usr/share/une/applications
  - Change the url for the Amazon store redirector
  - [9b356d6] Add workaround for set_Height exception.
  - [ccbcbbd] Make Banshee translatable in Launchpad

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs
180
180
 
181
181
            var uia_service = ServiceManager.Get<InterfaceActionService> ();
182
182
            if (uia_service != null) {
183
 
                uia_service.GlobalActions.Add (
184
 
                    new ActionEntry ("AddRemoteDaapServerAction", Stock.Add,
185
 
                        Catalog.GetString ("Add Remote DAAP Server"), null,
186
 
                        Catalog.GetString ("Add a new remote DAAP server"),
187
 
                        OnAddRemoteServer)
188
 
                );
189
 
                actions_id = uia_service.UIManager.AddUiFromResource ("GlobalUI.xml");
 
183
                ThreadAssist.ProxyToMain ( () => {
 
184
                    uia_service.GlobalActions.Add (
 
185
                        new ActionEntry ("AddRemoteDaapServerAction", Stock.Add,
 
186
                            Catalog.GetString ("Add Remote DAAP Server"), null,
 
187
                            Catalog.GetString ("Add a new remote DAAP server"),
 
188
                            OnAddRemoteServer)
 
189
                    );
 
190
                    actions_id = uia_service.UIManager.AddUiFromResource ("GlobalUI.xml");
 
191
                });
 
192
 
190
193
            }
191
194
        }
192
195