Merge pull request #276 from repzilon/master

GTK+ 2 compatibility

41 files changed, 50 insertions, 25 deletions

diff --git a/README b/README
index 1a21e7aba..f406664a3 100644
--- a/README
+++ b/README
@@ -27,7 +27,7 @@ Prerequisites
 On Ubuntu 12.04 or later, install the following packages to compile Remmina:
 
 cmake (>= 2.6)
-libgtk-3-dev
+libgtk-2-dev
 libgcrypt11-dev
 libssh-dev (>= 0.4)
 libvte-2.90-dev
@@ -37,10 +37,8 @@ libtelepathy-glib-dev
 libjpeg-dev
 libgnutls-dev
 libgnome-keyring-dev
-libavahi-ui-gtk3-dev (>= 0.6.0)
+libavahi-ui-gtk2-dev (>= 0.6.0)
 libvncserver-dev
-libappindicator3-dev
-intltool
 
 If libfreerdb-dev is not available in the required version, you'll have to
 compile and install it from source. Follow instructions at:
@@ -52,6 +50,6 @@ Compilation
 To compile and install, perform the following for all of the three main packages:
 
 mkdir build
-cmake --build=build .
+cmake --build=build -DGTK_VERSION=2 -DWITHOUT_GETTEXT -DWITHOUT_TRANSLATIONS .
 make
 sudo make install
diff --git a/cmake/FindFREERDP.cmake b/cmake/FindFREERDP.cmake
index ed4d40623..b4767f05c 100644
--- a/cmake/FindFREERDP.cmake
+++ b/cmake/FindFREERDP.cmake
@@ -50,4 +50,3 @@ set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_GDI_LIBRARY} ${FREERDP_LOCALE
 set(FREERDP_INCLUDE_DIRS ${FREERDP_INCLUDE_DIR})
 
 mark_as_advanced(FREERDP_INCLUDE_DIR FREERDP_LIBRARY)
-
diff --git a/remmina-plugins/nx/16x16/emblems/remmina-nx.png b/remmina-plugins/nx/16x16/emblems/remmina-nx.png
index 5ff160dad..9d1b952bb 100644
--- a/remmina-plugins/nx/16x16/emblems/remmina-nx.png
+++ b/remmina-plugins/nx/16x16/emblems/remmina-nx.png
diff --git a/remmina-plugins/nx/22x22/emblems/remmina-nx.png b/remmina-plugins/nx/22x22/emblems/remmina-nx.png
index 6eff10980..13766daa1 100644
--- a/remmina-plugins/nx/22x22/emblems/remmina-nx.png
+++ b/remmina-plugins/nx/22x22/emblems/remmina-nx.png
diff --git a/remmina-plugins/rdp/16x16/emblems/remmina-rdp-ssh.png b/remmina-plugins/rdp/16x16/emblems/remmina-rdp-ssh.png
index 15ec78a18..9defcd6f6 100644
--- a/remmina-plugins/rdp/16x16/emblems/remmina-rdp-ssh.png
+++ b/remmina-plugins/rdp/16x16/emblems/remmina-rdp-ssh.png
diff --git a/remmina-plugins/rdp/16x16/emblems/remmina-rdp.png b/remmina-plugins/rdp/16x16/emblems/remmina-rdp.png
index 2ede1faf7..2d7724312 100644
--- a/remmina-plugins/rdp/16x16/emblems/remmina-rdp.png
+++ b/remmina-plugins/rdp/16x16/emblems/remmina-rdp.png
diff --git a/remmina-plugins/rdp/22x22/emblems/remmina-rdp-ssh.png b/remmina-plugins/rdp/22x22/emblems/remmina-rdp-ssh.png
index cf2ec0cd7..e977bb3b7 100644
--- a/remmina-plugins/rdp/22x22/emblems/remmina-rdp-ssh.png
+++ b/remmina-plugins/rdp/22x22/emblems/remmina-rdp-ssh.png
diff --git a/remmina-plugins/rdp/22x22/emblems/remmina-rdp.png b/remmina-plugins/rdp/22x22/emblems/remmina-rdp.png
index fa9623842..feb093c09 100644
--- a/remmina-plugins/rdp/22x22/emblems/remmina-rdp.png
+++ b/remmina-plugins/rdp/22x22/emblems/remmina-rdp.png
diff --git a/remmina-plugins/rdp/rdp_cliprdr.c b/remmina-plugins/rdp/rdp_cliprdr.c
index 313aa1b75..972b06c43 100644
--- a/remmina-plugins/rdp/rdp_cliprdr.c
+++ b/remmina-plugins/rdp/rdp_cliprdr.c
@@ -112,7 +112,7 @@ static UINT8* lf2crlf(UINT8* data, int* size)
         return outbuf;
 }
 
-static void crlf2lf(UINT8* data, int* size)
+static void crlf2lf(UINT8* data, size_t* size)
 {
         UINT8 c;
         UINT8* out;
@@ -252,6 +252,7 @@ void remmina_rdp_cliprdr_process_data_response(RemminaProtocolWidget* gp, RDP_CB
 
 				data = Stream_Buffer(s);
 				size = Stream_Length(s);
+				Stream_Free(s, TRUE);
 				pixbuf = gdk_pixbuf_loader_new();
 				gdk_pixbuf_loader_write(pixbuf, data, size, NULL);
 				Stream_Free(s, TRUE);
diff --git a/remmina-plugins/rdp/rdp_event.c b/remmina-plugins/rdp/rdp_event.c
index 8dacbe292..5b536d220 100644
--- a/remmina-plugins/rdp/rdp_event.c
+++ b/remmina-plugins/rdp/rdp_event.c
@@ -677,16 +677,24 @@ static void remmina_rdp_event_connected(RemminaProtocolWidget* gp, RemminaPlugin
 
 static void remmina_rdp_event_create_cursor(RemminaProtocolWidget* gp, RemminaPluginRdpUiObject* ui)
 {
-	cairo_surface_t* surface;
 	GdkPixbuf* pixbuf;
 	rfContext* rfi = GET_DATA(gp);
 	rdpPointer* pointer = (rdpPointer*)ui->cursor.pointer;
+#if GTK_VERSION == 3
+	cairo_surface_t* surface;	
 	UINT8* data = malloc(pointer->width * pointer->height * 4);
+#else
+	guchar *data = g_malloc0(pointer->width * pointer->height * 4);
+#endif
 
 	freerdp_alpha_cursor_convert(data, pointer->xorMaskData, pointer->andMaskData, pointer->width, pointer->height, pointer->xorBpp, rfi->clrconv);
+#if GTK_VERSION == 3
 	surface = cairo_image_surface_create_for_data(data, CAIRO_FORMAT_ARGB32, pointer->width, pointer->height, cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, pointer->width));
 	pixbuf = gdk_pixbuf_get_from_surface(surface, 0, 0, pointer->width, pointer->height);
 	cairo_surface_destroy(surface);
+#else
+	pixbuf = gdk_pixbuf_new_from_data(data, GDK_COLORSPACE_RGB, TRUE, 8, pointer->width, pointer->height, (pointer->width * 4), NULL, NULL);
+#endif	
 	((rfPointer*)ui->cursor.pointer)->cursor = gdk_cursor_new_from_pixbuf(rfi->display, pixbuf, pointer->xPos, pointer->yPos);
 }
 
@@ -695,7 +703,10 @@ static void remmina_rdp_event_free_cursor(RemminaProtocolWidget* gp, RemminaPlug
 	rfContext* rfi = GET_DATA(gp);
 
 	g_mutex_lock(rfi->gmutex);
+	/* Ugly leak with GTK2, otherwise g_object_unref segfaults */
+#if GTK_VERSION == 3
 	g_object_unref(ui->cursor.pointer->cursor);
+#endif	
 	ui->cursor.pointer->cursor = NULL;
 	g_cond_signal(rfi->gcond);
 	g_mutex_unlock(rfi->gmutex);
diff --git a/remmina-plugins/rdp/rdp_gdi.c b/remmina-plugins/rdp/rdp_gdi.c
index edf29df65..e1d0ab4c5 100644
--- a/remmina-plugins/rdp/rdp_gdi.c
+++ b/remmina-plugins/rdp/rdp_gdi.c
@@ -127,7 +127,7 @@ static void rf_gdi_surface_bits(rdpContext* context, SURFACE_BITS_COMMAND* surfa
 	}
 	else if (surface_bits_command->codecID == RDP_CODEC_ID_NONE)
 	{
-		bitmap = (UINT8*) malloc(surface_bits_command->width * surface_bits_command->height * 4);
+		bitmap = (UINT8*) calloc(1, surface_bits_command->width * surface_bits_command->height * 4);
 
 		freerdp_image_flip(surface_bits_command->bitmapData, bitmap,
 				surface_bits_command->width, surface_bits_command->height, 32);
diff --git a/remmina-plugins/rdp/rdp_graphics.c b/remmina-plugins/rdp/rdp_graphics.c
index 1fa429785..e1065a316 100644
--- a/remmina-plugins/rdp/rdp_graphics.c
+++ b/remmina-plugins/rdp/rdp_graphics.c
@@ -49,7 +49,7 @@ void rf_Bitmap_New(rdpContext* context, rdpBitmap* bitmap)
 		data = freerdp_image_convert(bitmap->data, NULL,
 				bitmap->width, bitmap->height, rfi->srcBpp, rfi->bpp, rfi->clrconv);
 
-		if (bitmap->ephemeral != true)
+		if (bitmap->ephemeral != TRUE)
 		{
 			image = XCreateImage(rfi->display, rfi->visual, rfi->depth,
 				ZPixmap, 0, (char*) data, bitmap->width, bitmap->height, rfi->scanline_pad, 0);
@@ -57,13 +57,13 @@ void rf_Bitmap_New(rdpContext* context, rdpBitmap* bitmap)
 			XPutImage(rfi->display, pixmap, rfi->gc, image, 0, 0, 0, 0, bitmap->width, bitmap->height);
 			XFree(image);
 
-			if (data != bitmap->data)
-				xfree(data);
+			if (data != bitmap->data) && (data != NULL)
+				free(data);
 		}
 		else
 		{
-			if (data != bitmap->data)
-				xfree(bitmap->data);
+			if (data != bitmap->data) && (data != NULL)
+				free(bitmap->data);
 
 			bitmap->data = data;
 		}
@@ -135,7 +135,7 @@ void rf_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap,
 
 		status = bitmap_decompress(data, bitmap->data, width, height, length, bpp, bpp);
 
-		if (status != true)
+		if (status != TRUE)
 		{
 			printf("Bitmap Decompression Failed\n");
 		}
@@ -145,7 +145,7 @@ void rf_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap,
 		freerdp_image_flip(data, bitmap->data, width, height, bpp);
 	}
 
-	bitmap->compressed = false;
+	bitmap->compressed = FALSE;
 	bitmap->length = size;
 	bitmap->bpp = bpp;
 #endif
@@ -186,7 +186,11 @@ void rf_Pointer_Free(rdpContext* context, rdpPointer* pointer)
 	RemminaPluginRdpUiObject* ui;
 	rfContext* rfi = (rfContext*) context;
 
+#if GTK_VERSION == 2
+	if (((rfPointer*) pointer)->cursor != NULL)
+#else
 	if (G_IS_OBJECT(((rfPointer*) pointer)->cursor))
+#endif
 	{
 		ui = g_new0(RemminaPluginRdpUiObject, 1);
 		ui->type = REMMINA_RDP_UI_CURSOR;
@@ -196,7 +200,11 @@ void rf_Pointer_Free(rdpContext* context, rdpPointer* pointer)
 		rf_queue_ui(rfi->protocol_widget, ui);
 
 		g_mutex_lock(rfi->gmutex);
+#if GTK_VERSION == 2
+		while (((rfPointer*) pointer)->cursor != NULL)
+#else	
 		while (G_IS_OBJECT(((rfPointer*) pointer)->cursor))
+#endif
 		{
 			g_cond_wait(rfi->gcond, rfi->gmutex);
 		}
@@ -355,6 +363,7 @@ void rf_register_graphics(rdpGraphics* graphics)
 
 	pointer = (rdpPointer*) malloc(sizeof(rdpPointer));
 	ZeroMemory(pointer, sizeof(rdpPointer));
+
 	pointer->size = sizeof(rfPointer);
 
 	pointer->New = rf_Pointer_New;
@@ -364,10 +373,12 @@ void rf_register_graphics(rdpGraphics* graphics)
 	pointer->SetDefault = rf_Pointer_SetDefault;
 
 	graphics_register_pointer(graphics, pointer);
+
 	free(pointer);
 
 	glyph = (rdpGlyph*) malloc(sizeof(rdpGlyph));
 	ZeroMemory(glyph, sizeof(rdpGlyph));
+
 	glyph->size = sizeof(rfGlyph);
 
 	glyph->New = rf_Glyph_New;
@@ -377,5 +388,6 @@ void rf_register_graphics(rdpGraphics* graphics)
 	glyph->EndDraw = rf_Glyph_EndDraw;
 
 	graphics_register_glyph(graphics, glyph);
+
 	free(glyph);
 }
diff --git a/remmina-plugins/rdp/rdp_plugin.c b/remmina-plugins/rdp/rdp_plugin.c
index 7e9125c57..8bc3e4fd6 100644
--- a/remmina-plugins/rdp/rdp_plugin.c
+++ b/remmina-plugins/rdp/rdp_plugin.c
@@ -306,7 +306,7 @@ static BOOL remmina_rdp_post_connect(freerdp* instance)
 	pointer_cache_register_callbacks(instance->update);
 
 /*
-	if (rfi->sw_gdi != true)
+	if (rfi->sw_gdi != TRUE)
 	{
 		glyph_cache_register_callbacks(instance->update);
 		brush_cache_register_callbacks(instance->update);
diff --git a/remmina-plugins/vnc/16x16/emblems/remmina-vnc-ssh.png b/remmina-plugins/vnc/16x16/emblems/remmina-vnc-ssh.png
index b9dcfd76f..8b3363714 100644
--- a/remmina-plugins/vnc/16x16/emblems/remmina-vnc-ssh.png
+++ b/remmina-plugins/vnc/16x16/emblems/remmina-vnc-ssh.png
diff --git a/remmina-plugins/vnc/16x16/emblems/remmina-vnc.png b/remmina-plugins/vnc/16x16/emblems/remmina-vnc.png
index 41713cec2..b06083010 100644
--- a/remmina-plugins/vnc/16x16/emblems/remmina-vnc.png
+++ b/remmina-plugins/vnc/16x16/emblems/remmina-vnc.png
diff --git a/remmina-plugins/vnc/22x22/emblems/remmina-vnc-ssh.png b/remmina-plugins/vnc/22x22/emblems/remmina-vnc-ssh.png
index da805c1e5..644d7aa81 100644
--- a/remmina-plugins/vnc/22x22/emblems/remmina-vnc-ssh.png
+++ b/remmina-plugins/vnc/22x22/emblems/remmina-vnc-ssh.png
diff --git a/remmina-plugins/vnc/22x22/emblems/remmina-vnc.png b/remmina-plugins/vnc/22x22/emblems/remmina-vnc.png
index 29b602ea4..ab1cf2964 100644
--- a/remmina-plugins/vnc/22x22/emblems/remmina-vnc.png
+++ b/remmina-plugins/vnc/22x22/emblems/remmina-vnc.png
diff --git a/remmina-plugins/xdmcp/16x16/emblems/remmina-xdmcp-ssh.png b/remmina-plugins/xdmcp/16x16/emblems/remmina-xdmcp-ssh.png
index af0dddff5..5493ba3bc 100644
--- a/remmina-plugins/xdmcp/16x16/emblems/remmina-xdmcp-ssh.png
+++ b/remmina-plugins/xdmcp/16x16/emblems/remmina-xdmcp-ssh.png
diff --git a/remmina-plugins/xdmcp/16x16/emblems/remmina-xdmcp.png b/remmina-plugins/xdmcp/16x16/emblems/remmina-xdmcp.png
index eb5fc8eca..2367a4e6e 100644
--- a/remmina-plugins/xdmcp/16x16/emblems/remmina-xdmcp.png
+++ b/remmina-plugins/xdmcp/16x16/emblems/remmina-xdmcp.png
diff --git a/remmina-plugins/xdmcp/22x22/emblems/remmina-xdmcp-ssh.png b/remmina-plugins/xdmcp/22x22/emblems/remmina-xdmcp-ssh.png
index 165d9942c..f69563357 100644
--- a/remmina-plugins/xdmcp/22x22/emblems/remmina-xdmcp-ssh.png
+++ b/remmina-plugins/xdmcp/22x22/emblems/remmina-xdmcp-ssh.png
diff --git a/remmina-plugins/xdmcp/22x22/emblems/remmina-xdmcp.png b/remmina-plugins/xdmcp/22x22/emblems/remmina-xdmcp.png
index 318053a4b..83ffc6edb 100644
--- a/remmina-plugins/xdmcp/22x22/emblems/remmina-xdmcp.png
+++ b/remmina-plugins/xdmcp/22x22/emblems/remmina-xdmcp.png
diff --git a/remmina/desktop/16x16/apps/remmina.png b/remmina/desktop/16x16/apps/remmina.png
index 731b2fbc7..96bc6828a 100644
--- a/remmina/desktop/16x16/apps/remmina.png
+++ b/remmina/desktop/16x16/apps/remmina.png
diff --git a/remmina/desktop/22x22/apps/remmina.png b/remmina/desktop/22x22/apps/remmina.png
index 3442d1c8e..a28ca75ad 100644
--- a/remmina/desktop/22x22/apps/remmina.png
+++ b/remmina/desktop/22x22/apps/remmina.png
diff --git a/remmina/desktop/24x24/apps/remmina.png b/remmina/desktop/24x24/apps/remmina.png
index ef12e99af..5a30c8ec9 100644
--- a/remmina/desktop/24x24/apps/remmina.png
+++ b/remmina/desktop/24x24/apps/remmina.png
diff --git a/remmina/desktop/32x32/apps/remmina.png b/remmina/desktop/32x32/apps/remmina.png
index 9b1c7464b..e8c214708 100644
--- a/remmina/desktop/32x32/apps/remmina.png
+++ b/remmina/desktop/32x32/apps/remmina.png
diff --git a/remmina/desktop/48x48/apps/remmina.png b/remmina/desktop/48x48/apps/remmina.png
index 1be90fed0..519166cd5 100644
--- a/remmina/desktop/48x48/apps/remmina.png
+++ b/remmina/desktop/48x48/apps/remmina.png
diff --git a/remmina/desktop/remmina.desktop b/remmina/desktop/remmina.desktop
index 7da723309..0a922267e 100644
--- a/remmina/desktop/remmina.desktop
+++ b/remmina/desktop/remmina.desktop
@@ -15,9 +15,7 @@ Actions=Profile;Tray;
 [Desktop Action Profile]
 Name=Create a New Connection Profile
 Exec=remmina --new
-OnlyShowIn=Unity;
 
 [Desktop Action Tray]
 Name=Start Remmina Minimized
 Exec=remmina --icon
-OnlyShowIn=Unity;
diff --git a/remmina/icons/16x16/actions/remmina-fit-window.png b/remmina/icons/16x16/actions/remmina-fit-window.png
index 6c90ad0a2..bd402f6c9 100755..100644
--- a/remmina/icons/16x16/actions/remmina-fit-window.png
+++ b/remmina/icons/16x16/actions/remmina-fit-window.png
diff --git a/remmina/icons/16x16/actions/remmina-fullscreen.png b/remmina/icons/16x16/actions/remmina-fullscreen.png
index 0d59b60e6..b1366fee9 100755..100644
--- a/remmina/icons/16x16/actions/remmina-fullscreen.png
+++ b/remmina/icons/16x16/actions/remmina-fullscreen.png
diff --git a/remmina/icons/16x16/actions/remmina-pin-down.png b/remmina/icons/16x16/actions/remmina-pin-down.png
index 3a070b9d0..7c6a1cfe9 100644
--- a/remmina/icons/16x16/actions/remmina-pin-down.png
+++ b/remmina/icons/16x16/actions/remmina-pin-down.png
diff --git a/remmina/icons/16x16/actions/remmina-pin-up.png b/remmina/icons/16x16/actions/remmina-pin-up.png
index ecf4100e4..935057e79 100644
--- a/remmina/icons/16x16/actions/remmina-pin-up.png
+++ b/remmina/icons/16x16/actions/remmina-pin-up.png
diff --git a/remmina/icons/16x16/actions/remmina-scale.png b/remmina/icons/16x16/actions/remmina-scale.png
index 2c47b37e4..82fe53241 100755..100644
--- a/remmina/icons/16x16/actions/remmina-scale.png
+++ b/remmina/icons/16x16/actions/remmina-scale.png
diff --git a/remmina/icons/16x16/actions/remmina-switch-page.png b/remmina/icons/16x16/actions/remmina-switch-page.png
index 8d30f42bf..25fe11256 100755..100644
--- a/remmina/icons/16x16/actions/remmina-switch-page.png
+++ b/remmina/icons/16x16/actions/remmina-switch-page.png
diff --git a/remmina/icons/16x16/emblems/remmina-sftp.png b/remmina/icons/16x16/emblems/remmina-sftp.png
index 798b52244..406eb20cb 100755..100644
--- a/remmina/icons/16x16/emblems/remmina-sftp.png
+++ b/remmina/icons/16x16/emblems/remmina-sftp.png
diff --git a/remmina/icons/22x22/actions/remmina-fit-window.png b/remmina/icons/22x22/actions/remmina-fit-window.png
index 67e803e9d..39436ebfc 100755..100644
--- a/remmina/icons/22x22/actions/remmina-fit-window.png
+++ b/remmina/icons/22x22/actions/remmina-fit-window.png
diff --git a/remmina/icons/22x22/actions/remmina-fullscreen.png b/remmina/icons/22x22/actions/remmina-fullscreen.png
index 84afabc77..33f74fdb3 100755..100644
--- a/remmina/icons/22x22/actions/remmina-fullscreen.png
+++ b/remmina/icons/22x22/actions/remmina-fullscreen.png
diff --git a/remmina/icons/22x22/actions/remmina-scale.png b/remmina/icons/22x22/actions/remmina-scale.png
index e8b15a1ea..162cf0877 100755..100644
--- a/remmina/icons/22x22/actions/remmina-scale.png
+++ b/remmina/icons/22x22/actions/remmina-scale.png
diff --git a/remmina/icons/22x22/actions/remmina-switch-page.png b/remmina/icons/22x22/actions/remmina-switch-page.png
index b8a0c7fab..70dad5818 100755..100644
--- a/remmina/icons/22x22/actions/remmina-switch-page.png
+++ b/remmina/icons/22x22/actions/remmina-switch-page.png
diff --git a/remmina/icons/22x22/emblems/remmina-sftp.png b/remmina/icons/22x22/emblems/remmina-sftp.png
index e90f9e242..11c0b7f72 100755..100644
--- a/remmina/icons/22x22/emblems/remmina-sftp.png
+++ b/remmina/icons/22x22/emblems/remmina-sftp.png
diff --git a/remmina/src/remmina_file_editor.c b/remmina/src/remmina_file_editor.c
index d102978ae..bdb305311 100644
--- a/remmina/src/remmina_file_editor.c
+++ b/remmina/src/remmina_file_editor.c
@@ -40,6 +40,7 @@
 
 G_DEFINE_TYPE( RemminaFileEditor, remmina_file_editor, GTK_TYPE_DIALOG)
 
+#ifdef HAVE_LIBSSH
 static const gchar* charset_list = "ASCII,BIG5,"
 		"CP437,CP720,CP737,CP775,CP850,CP852,CP855,"
 		"CP857,CP858,CP862,CP866,CP874,CP1125,CP1250,"
@@ -51,6 +52,7 @@ static const gchar* charset_list = "ASCII,BIG5,"
 		"ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-12,"
 		"ISO-8859-13,ISO-8859-14,ISO-8859-15,ISO-8859-16,"
 		"KOI8-R,SJIS,UTF-8";
+#endif
 
 static const gchar* server_tips = N_("<tt><big>"
 		"Supported formats\n"
@@ -59,6 +61,7 @@ static const gchar* server_tips = N_("<tt><big>"
 		"* [server]:port"
 		"</big></tt>");
 
+#ifdef HAVE_LIBSSH
 static const gchar* server_tips2 = N_("<tt><big>"
 		"Supported formats\n"
 		"* :port\n"
@@ -66,6 +69,7 @@ static const gchar* server_tips2 = N_("<tt><big>"
 		"* server:port\n"
 		"* [server]:port"
 		"</big></tt>");
+#endif
 
 struct _RemminaFileEditorPriv
 {
diff --git a/remmina/src/remmina_main.c b/remmina/src/remmina_main.c
index 9d27a6a2c..6ce9b6d19 100644
--- a/remmina/src/remmina_main.c
+++ b/remmina/src/remmina_main.c
@@ -1217,17 +1217,19 @@ static void remmina_main_init(RemminaMain *remminamain)
 	hbox = gtk_hbox_new(FALSE, 0);
 #endif
 
-	priv->quickconnect_protocol = gtk_combo_box_text_new();
+	
 #if GTK_VERSION == 3
+	priv->quickconnect_protocol = gtk_combo_box_text_new();
 	gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(priv->quickconnect_protocol), "RDP", "RDP");
 	gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(priv->quickconnect_protocol), "VNC", "VNC");
 	gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(priv->quickconnect_protocol), "NX", "NX");
 	gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(priv->quickconnect_protocol), "SSH", "SSH");
 #elif GTK_VERSION == 2
-	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(priv->quickconnect_protocol), "RDP");
-	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(priv->quickconnect_protocol), "VNC");
-	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(priv->quickconnect_protocol), "NX");
-	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(priv->quickconnect_protocol), "SSH");
+	priv->quickconnect_protocol = gtk_combo_box_new_text();
+	gtk_combo_box_append_text(GTK_COMBO_BOX(priv->quickconnect_protocol), "RDP");
+	gtk_combo_box_append_text(GTK_COMBO_BOX(priv->quickconnect_protocol), "VNC");
+	gtk_combo_box_append_text(GTK_COMBO_BOX(priv->quickconnect_protocol), "NX");
+	gtk_combo_box_append_text(GTK_COMBO_BOX(priv->quickconnect_protocol), "SSH");
 #endif
 	gtk_combo_box_set_active(GTK_COMBO_BOX(priv->quickconnect_protocol), 0);
 	gtk_widget_show(priv->quickconnect_protocol);
@@ -1244,7 +1246,7 @@ static void remmina_main_init(RemminaMain *remminamain)
 	gtk_box_pack_start(GTK_BOX(hbox), quickconnect, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(quickconnect), "clicked", G_CALLBACK(remmina_main_quickconnect_on_click), remminamain);
 
-	gtk_container_add(GTK_CONTAINER(vbox), hbox);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	gtk_widget_show(hbox);
 
 	/* Create the scrolled window for the file list */