← Back to branch summary

~ubuntu-branches/ubuntu/trusty/me-tv/trusty

« back to all changes in this revision

Viewing changes to src/main_window.cc

  • Committer: Bazaar Package Importer
  • Author(s): Teis Dreijer
  • Date: 2010-02-14 11:29:00 UTC
  • mfrom: (1.1.11 upstream) (3.1.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100214112900-krutrmpz248vz1ji
Tags: 1.1.6-2
http://bugs.debian.org/568782
* Updated debian/control
  - Removed libgnomem-2.6-dev and libgnomeuimm-2.6-dev
    from Build-Depends (Closes: #568782)
  - Added libgconfmm-2.6-dev to Build-Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main_window.cc
28
28
#include "application.h"
29
29
#include "scheduled_recordings_dialog.h"
30
30
#include "engine.h"
31
 
#include <libgnome/libgnome.h>
 
31
#include <gtkmm.h>
32
32
#include <gdk/gdkx.h>
33
33
 
34
34
#define POKE_INTERVAL                                   30
474
474
        Gtk::Window::on_hide();
475
475
        if (!get_application().get_boolean_configuration_value("display_status_icon"))
476
476
        {
477
 
                Gnome::Main::quit();
 
477
                Gtk::Main::quit();
478
478
        }
479
479
        CATCH
480
480
}
689
689
{
690
690
        Glib::RecMutex::Lock lock(mutex);
691
691
 
692
 
        if (!get_application().stream_manager.get_streams().empty())
 
692
        if (!get_application().stream_manager.get_streams().empty() && property_visible())
693
693
        {
694
 
                if (property_visible())
695
 
                {
696
 
                        play(get_application().stream_manager.get_display_stream().filename);
697
 
                }
 
694
                play(get_application().stream_manager.get_display_stream().filename);
698
695
        }
699
696
}
700
697