Merge pull request #11 from doctaweeks/master

A few minor issues
FreeRDP · Feb 2, 2012 · cf19683 · cf19683
2 parents 09e9719 + 13a9b2b
commit cf19683
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/README b/README
@@ -29,8 +29,8 @@ On Ubuntu 11.10 (Oneiric), install the following packages before compiling:
 sudo add-apt-repository ppa:chihchun/freerdp # for freerdp v1
 sudo apt-get update
 sudo apt-get install cmake intltool \
-  libgtk-3-dev libssh-dev libavahi-ui-gtk3-dev libvte-dev \
-  libunique-dev libtelepathy-glib-dev libgnome-keyring-dev \
+  libgtk-3-dev libssh-dev libavahi-ui-gtk3-dev libvte-2.90-dev libxkbfile-dev \ 
+  libtelepathy-glib-dev libgnome-keyring-dev \
   libappindicator3-dev libgcrypt11-dev libgnutls-dev \
   libfreerdp-dev libjpeg-dev
 

diff --git a/remmina/src/remmina_file_editor.c b/remmina/src/remmina_file_editor.c
@@ -331,7 +331,9 @@ static void remmina_file_editor_create_server(RemminaFileEditor* gfe, const Remm
 {
 	RemminaProtocolPlugin* plugin = gfe->priv->plugin;
 	GtkWidget* widget;
+#ifdef HAVE_LIBAVAHI_UI
 	GtkWidget* hbox;
+#endif
 	gchar* s;
 
 	widget = gtk_label_new(_("Server"));