← Back to branch summary

~ubuntu-branches/ubuntu/natty/moon/natty

« back to all changes in this revision

Viewing changes to plugin/plugin.cpp

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2011-01-31 16:04:45 UTC
  • Revision ID: package-import@ubuntu.com-20110131160445-dhh1gw64qo6nzw9k
Tags: 2.3-0ubuntu5
https://launchpad.net/bugs/538796
* Fix LP: #538796 - cannot open Firefox/Chromium/Chrome when moonlight
  is installed, due to a symbol collision with the icedtea plugin. Thanks
  to Evan Martin and Chris Toshok for figuring this out
  - add debian/patches/avoid_icedtea_symbol_collision.patch
  - update debian/patches/series
* Fix build with xulrunner 2.0
  - add debian/patches/xulrunner_20.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/plugin.cpp
166
166
#ifdef DEBUG
167
167
        menu_item = gtk_menu_item_new_with_label ("Show XAML Hierarchy");
168
168
        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
169
 
        g_signal_connect_swapped (G_OBJECT(menu_item), "activate", G_CALLBACK (plugin_debug), plugin);
 
169
        g_signal_connect_swapped (G_OBJECT(menu_item), "activate", G_CALLBACK (moon_plugin_debug), plugin);
170
170
        
171
171
        menu_item = gtk_menu_item_new_with_label ("Sources");
172
172
        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);