← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ekiga/vivid-proposed

« back to all changes in this revision

Viewing changes to lib/engine/framework/menu-xml.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Kilian Krause
  • Date: 2011-07-17 00:24:50 UTC
  • mfrom: (5.1.5 upstream) (7.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20110717002450-ytg3wsrc1ptd3153
Tags: 3.3.1-1
* New upstream release.
 - Required libpt-dev 2.10 and libopal-dev 3.10
* Fix debian/watch to catch new version
* Remove libnotify0.7.patch - included upstream
* Add libboost-dev and libboost-signals-dev to Build-Depends
* debian/rules: Don't install *.la files for new internal shared libs
* Fix Vcs URIs to point to correct desktop/experimental/ekiga tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/engine/framework/menu-xml.cpp
1
1
 
2
2
/*
3
3
 * Ekiga -- A VoIP and Video-Conferencing application
4
 
 * Copyright (C) 2000-2007 Damien Sandras
 
4
 * Copyright (C) 2000-2009 Damien Sandras <dsandras@seconix.com>
5
5
 
6
6
 * This program is free software; you can  redistribute it and/or modify
7
7
 * it under the terms of the GNU General Public License as published by
52
52
  g_spawn_command_line_async (command.c_str (), NULL);
53
53
}
54
54
 
55
 
static void pull_trigger (Ekiga::Trigger *trigger)
 
55
static void pull_trigger (boost::shared_ptr<Ekiga::Trigger> trigger)
56
56
{
57
57
  trigger->pull ();
58
58
}
97
97
                populate_item (core, builder, child, true);
98
98
              if (xmlStrEqual (BAD_CAST "internal", attr))
99
99
                populate_item (core, builder, child, false);
 
100
              xmlFree (attr);
100
101
            }
101
102
          }
102
103
          if (xmlStrEqual (BAD_CAST "separator", child->name))
170
171
        if (is_external) {
171
172
 
172
173
          builder.add_action (icon, label,
173
 
                              sigc::bind (sigc::ptr_fun (run_command),
 
174
                              boost::bind (&run_command,
174
175
                                          command));
175
176
        } else {
176
177
 
177
 
          Ekiga::Trigger *trigger =
178
 
            dynamic_cast<Ekiga::Trigger *>(core.get (command));
179
 
          if (trigger != NULL)
 
178
          boost::shared_ptr<Ekiga::Trigger> trigger = core.get<Ekiga::Trigger> (command);
 
179
          if (trigger)
180
180
            builder.add_action (icon, label,
181
 
                                sigc::bind (sigc::ptr_fun (pull_trigger),
 
181
                                boost::bind (&pull_trigger,
182
182
                                            trigger));
183
183
        }
184
184
        break;