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

« back to all changes in this revision

Viewing changes to src/Dap/Banshee.Dap/Banshee.Dap/DapSource.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:
186
186
            Properties.SetString ("ActiveSourceUIResource", "ActiveSourceUI.xml");
187
187
 
188
188
            sync = new DapSync (this);
189
 
            dap_info_bar = new DapInfoBar (this);
190
 
            Properties.Set<Gtk.Widget> ("Nereid.SourceContents.FooterWidget", dap_info_bar);
191
189
 
192
190
            /*dap_properties_display = new DapPropertiesDisplay (this);
193
191
            Properties.Set<Banshee.Sources.Gui.ISourceContents> ("Nereid.SourceContents", dap_properties_display);*/
227
225
            BuildPreferences ();
228
226
 
229
227
            ThreadAssist.ProxyToMain (delegate {
 
228
                dap_info_bar = new DapInfoBar (this);
 
229
                Properties.Set<Gtk.Widget> ("Nereid.SourceContents.FooterWidget", dap_info_bar);
 
230
 
230
231
                Properties.Set<Banshee.Sources.Gui.ISourceContents> ("Nereid.SourceContents", new DapContent (this));
231
232
            });
232
233
        }