← Back to branch summary

~ubuntu-branches/ubuntu/precise/me-tv/precise-proposed

« back to all changes in this revision

Viewing changes to src/status_icon.cc

  • Committer: Bazaar Package Importer
  • Author(s): Scott Evans
  • Date: 2009-06-27 00:46:22 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090627004622-q0zvsie6ioa60vh3
Tags: 0.9.4-0ubuntu1
https://launchpad.net/bugs/379706
https://launchpad.net/bugs/72872
https://launchpad.net/bugs/382197
https://launchpad.net/bugs/379685
https://launchpad.net/bugs/377020
https://launchpad.net/bugs/377050
https://launchpad.net/bugs/371165
https://launchpad.net/bugs/351510
https://launchpad.net/bugs/361514
https://launchpad.net/bugs/359710
https://launchpad.net/bugs/353796
https://launchpad.net/bugs/350402
* New upstream release (LP: #379706)
  - Fix to stop EPG update crashing the application
    after faulty save (LP: #72872)
  - Fixed spin buttons from GtkBuilder conversion (LP: #382197) 
  - Fixed icon on application popup menu (LP: #379685)
  - Fixed compiling of me-tv-0.8.12 fails on Fedora 11 (LP: #377020)
  - Fixed Failed to lock to channel at boot (LP: #377050)
  - Increased timeout to 5 seconds again (LP: #371165)
  - Fixed me-tv unusually slow, often freezes (LP: #351510)
  - Fixed channel persistence (LP: #361514)
  - Fix for forward slashes in description (LP: #359710)
  - Fixed Must create .me-tv directory manually (LP: #353796)
  - Fixed audio stream can't be changed (LP: #350402)
* debian/control:
  - Removed dependency libxine1-ffmpeg, libxine1-x
  - Removed libglademm-2.4-dev Build-Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/status_icon.cc
23
23
#include "channel.h"
24
24
#include "me-tv.h"
25
25
 
26
 
StatusIcon::StatusIcon(Glib::RefPtr<Gnome::Glade::Xml>& glade_xml)
27
 
        : glade(glade_xml)
 
26
StatusIcon::StatusIcon(Glib::RefPtr<Gtk::Builder>& builder)
 
27
        : builder(builder)
28
28
{
 
29
        g_debug("StatusIcon constructor started");
 
30
        
29
31
        status_icon = Gtk::StatusIcon::create("me-tv");
30
 
        popup_menu = dynamic_cast<Gtk::Menu*>(glade->get_widget("menu_application_popup"));
 
32
        builder->get_widget("menu_application_popup", popup_menu);
31
33
        status_icon->signal_activate().connect(sigc::mem_fun(*this, &StatusIcon::on_activate));
32
34
        status_icon->signal_popup_menu().connect(sigc::mem_fun(*this, &StatusIcon::on_popup_menu));
33
 
        glade->connect_clicked("application_menu_item_me_tv", sigc::mem_fun(*this, &StatusIcon::on_menu_item_me_tv_clicked));
34
 
        glade->connect_clicked("menu_item_popup_quit", sigc::mem_fun(*this, &StatusIcon::on_menu_item_popup_quit_clicked));
 
35
 
 
36
//      builder->get_widget("application_menu_item_me_tv");
 
37
//      builder->connect_clicked(sigc::mem_fun(*this, &StatusIcon::on_menu_item_me_tv_clicked));
 
38
 
 
39
        Gtk::MenuItem* menu_item = NULL;
 
40
        builder->get_widget("menu_item_popup_quit", menu_item);
 
41
        menu_item->signal_activate().connect(sigc::mem_fun(*this, &StatusIcon::on_menu_item_popup_quit_clicked));
 
42
 
 
43
        g_debug("StatusIcon constructed");
35
44
}
36
45
 
37
46
void StatusIcon::on_popup_menu(guint button, guint32 activate_time)
57
66
 
58
67
void StatusIcon::update()
59
68
{
60
 
        Channel* channel = get_application().get_profile_manager().get_current_profile().get_display_channel();
 
69
        Application& application = get_application();
 
70
        Channel* channel = application.channel_manager.get_display_channel();
61
71
        Glib::ustring title = _("Unknown program");
62
72
 
63
 
        status_icon->set_visible(get_application().get_boolean_configuration_value("display_status_icon"));
 
73
        status_icon->set_visible(application.get_boolean_configuration_value("display_status_icon"));
64
74
        
65
75
        if (channel != NULL)
66
76
        {