improved HAVE_VTE handling to prevent crashes

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@69 ea778897-0a13-0410-b9d1-a72fbfd435f5

src/callbacks.c

@@ -973,12 +973,14 @@ on_window_key_press_event              (GtkWidget *widget,
 		gtk_widget_grab_focus(lookup_widget(app->window, "textview_scribble"));
 		return TRUE;
 	}
+#ifdef HAVE_VTE
 	if (event->keyval == GDK_F6 && app->have_vte)
 	{
 		gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_VTE);
 		gtk_widget_grab_focus(vc->vte);
 		return TRUE;
 	}
+#endif
 	return FALSE;
 }
 
@@ -1150,6 +1152,7 @@ on_editor_key_press_event              (GtkWidget *widget,
 			ret = TRUE;
 			break;
 		}
+#ifdef HAVE_VTE
 		case GDK_F6:
 		{
 			if (app->have_vte)
@@ -1161,6 +1164,7 @@ on_editor_key_press_event              (GtkWidget *widget,
 			ret = TRUE;
 			break;
 		}
+#endif
 /* following code is unusable unless I get a signal for a line changed, don't want to do this with
  * updateUI(), additional problem: at line changes the column isn't kept
 		case GDK_End:

src/prefs.c

@@ -404,8 +404,8 @@ void on_prefs_color_choosed(GtkColorButton *widget, gpointer user_data)
 			gtk_color_button_get_color(widget, vc->color_back);
 			break;
 		}
-	}
 #endif
+	}
 }
 
 
@@ -431,15 +431,15 @@ void on_prefs_font_choosed(GtkFontButton *widget, gpointer user_data)
 			app->editor_font = g_strdup(gtk_font_button_get_font_name(widget));
 			break;
 		}
+#ifdef HAVE_VTE
 		case 4:
 		{
-#ifdef HAVE_VTE
 			// VTE settings
 			g_free(vc->font);
 			vc->font = g_strdup(gtk_font_button_get_font_name(widget));
-#endif
 			break;
 		}
+#endif
 	}
 }