From af14939d57d712c7d1b26566981de33426a22bb3 Mon Sep 17 00:00:00 2001 From: rolf Date: Mon, 7 Dec 2009 08:56:16 +0000 Subject: [PATCH] 2009-12-07 Rolf Bjarne Kvinge * plugin.cpp: Put the "Reinstall media pack" into an DEBUG #ifdef. It causes us to crash if we've already loaded the codecs into the processes. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/moon@147773 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- plugin/ChangeLog | 6 ++++++ plugin/plugin.cpp | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/plugin/ChangeLog b/plugin/ChangeLog index 604f85cbb..7bf9dabc0 100644 --- a/plugin/ChangeLog +++ b/plugin/ChangeLog @@ -1,3 +1,9 @@ +2009-12-07 Rolf Bjarne Kvinge + + * plugin.cpp: Put the "Reinstall media pack" into an DEBUG #ifdef. + It causes us to crash if we've already loaded the codecs into the + processes. + 2009-12-03 Larry Ewing * moonlight.h: bump up the version of 3.0 we claim to support. diff --git a/plugin/plugin.cpp b/plugin/plugin.cpp index 7f23a2a91..2c0e6bc54 100644 --- a/plugin/plugin.cpp +++ b/plugin/plugin.cpp @@ -149,11 +149,15 @@ plugin_show_menu (PluginInstance *plugin) if (!Media::IsMSCodecsInstalled ()) { menu_item = gtk_menu_item_new_with_label ("Install Microsoft Media Pack"); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + g_signal_connect_swapped (G_OBJECT(menu_item), "activate", G_CALLBACK (plugin_media_pack), plugin); +#if DEBUG } else { menu_item = gtk_menu_item_new_with_label ("Reinstall Microsoft Media Pack"); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + g_signal_connect_swapped (G_OBJECT(menu_item), "activate", G_CALLBACK (plugin_media_pack), plugin); +#endif } - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); - g_signal_connect_swapped (G_OBJECT(menu_item), "activate", G_CALLBACK (plugin_media_pack), plugin); #ifdef DEBUG menu_item = gtk_menu_item_new_with_label ("Show XAML Hierarchy"); -- 2.11.4.GIT