[anjuta] terminal: Reenable plugin

[Johannes Schmid <jhs src gnome org>]

commit 2dfc6cbd272900b5ca5faceaed1b249f2df88eb8
Author: Johannes Schmid <jhs gnome org>
Date:   Fri Nov 12 13:59:38 2010 +0100

    terminal: Reenable plugin
    
    Preferences are still broken because we have to wait until gnome-terminal has been
    ported to GSettings

 configure.ac                |    1 +
 plugins/Makefile.am         |    1 +
 plugins/terminal/terminal.c |    9 +++++----
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 812a0f9..d2846d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -867,6 +867,7 @@ plugins/cvs-plugin/Makefile
 plugins/subversion/Makefile
 plugins/git/Makefile
 plugins/sourceview/Makefile
+plugins/terminal/Makefile
 plugins/tools/Makefile
 plugins/tools/scripts/Makefile
 plugins/language-manager/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index a2b825b..63c5d25 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -36,6 +36,7 @@ SUBDIRS = . \
 	starter \
 	subversion \
 	symbol-db \
+	terminal \
 	tools
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/terminal/terminal.c b/plugins/terminal/terminal.c
index b0c12fa..5e0e456 100644
--- a/plugins/terminal/terminal.c
+++ b/plugins/terminal/terminal.c
@@ -130,8 +130,9 @@ terminal_set_preferences (VteTerminal *term, GSettings* settings, TerminalPlugin
 	GdkColor* background;
 	gchar *profile;
 	
-	g_return_if_fail (client != NULL);
-	
+	g_return_if_fail (settings != NULL);
+
+#if 0
 	/* Update the currently available list of terminal profiles */
 	setting = g_settings_get_boolean (settings,
 	                                  PREFS_TERMINAL_PROFILE_USE_DEFAULT);
@@ -242,6 +243,7 @@ terminal_set_preferences (VteTerminal *term, GSettings* settings, TerminalPlugin
 	
 	g_free (profile);
 	g_object_unref (client);
+#endif
 }
 
 static void
@@ -428,7 +430,7 @@ terminal_keypress_cb (GtkWidget *widget, GdkEventKey  *event,
 		return FALSE;
 	
 	/* ctrl-d */
-	if ((event->keyval == GDK_d || event->keyval == GDK_D) &&
+	if ((event->keyval == GDK_KEY_d || event->keyval == GDK_KEY_D) &&
 		(event->state & GDK_CONTROL_MASK))
 	{
 		if (terminal_plugin->child_pid)
@@ -925,7 +927,6 @@ ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError**
 {
 	GError* error = NULL;
 	GSList *profiles;
-	GConfClient *client;	
 	
 	/* Create the terminal preferences page */
 	TerminalPlugin* term_plugin = ANJUTA_PLUGIN_TERMINAL (ipref);