[anjuta] python-loader: Fixed build system

[Johannes Schmid <jhs src gnome org>]

commit 150de21e37f30bdf0766dc9955ced16129a78ac6
Author: Johannes Schmid <jhs gnome org>
Date:   Thu Aug 12 21:13:38 2010 +0200

    python-loader: Fixed build system

 configure.in                                       |    3 ---
 .../python-loader/anjuta-python-loader.plugin.in   |    5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/configure.in b/configure.in
index 73457da..c335dca 100644
--- a/configure.in
+++ b/configure.in
@@ -276,8 +276,6 @@ fi
 
 AM_CONDITIONAL(ENABLE_VALA, [test x$enable_vala = xyes])
 
-<<<<<<< HEAD
-=======
 dnl Check for Python
 dnl -------------------------------------------------------------
 
@@ -301,7 +299,6 @@ AM_CONDITIONAL(HAVE_PYTHON, [test x$have_python = xyes])
 PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
 		[libgda-4.0 >= $GDA_REQUIRED])
 
->>>>>>> python loader plugin
 dnl Setup Anjuta Library flags
 dnl --------------------------
 LIBANJUTA_CFLAGS='$(ANJUTA_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"'
diff --git a/plugins/python-loader/anjuta-python-loader.plugin.in b/plugins/python-loader/anjuta-python-loader.plugin.in
index 4cb3e93..557b100 100644
--- a/plugins/python-loader/anjuta-python-loader.plugin.in
+++ b/plugins/python-loader/anjuta-python-loader.plugin.in
@@ -1,9 +1,10 @@
 [Anjuta Plugin]
-Name=Python loader
-Description=Allows loading Anjuta plugins written in Python
+_Name=Python loader
+_Description=Allows loading Anjuta plugins written in Python
 Location=anjuta-pyloader:PythonLoaderPlugin
 #Icon=anjuta-python-loader-plugin.png
 Interfaces=IAnjutaPluginLoader
+UserActivable=no
 
 [Plugin Loader]
 SupportedLanguage=Python