Merge branch 'v1.1.2'

FreeRDP · Dec 8, 2014 · cc77c59 · cc77c59
2 parents a2aee21 + 1bb7f3d
commit cc77c59
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -94,7 +94,7 @@ include_directories(remmina/include)
 set(WITH_LIBRARY_VERSIONING "ON")
 set(REMMINA_VERSION_MAJOR "1")
 set(REMMINA_VERSION_MINOR "1")
-set(REMMINA_VERSION_REVISION "1")
+set(REMMINA_VERSION_REVISION "2")
 #^set(REMMINA_VERSION_SUFFIX "")
 set(REMMINA_VERSION "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}")
 

diff --git a/remmina/src/remmina_about.c b/remmina/src/remmina_about.c
@@ -50,6 +50,7 @@ void remmina_about_open(GtkWindow* parent)
 		"Alex Chateau <[email protected]>",
 		"Alexander Logvinov <[email protected]>",
 		"Antenore Gatta <[email protected]>",
+		"Fabio Castelli (Muflone) <[email protected]>",
 		"Giovanni Panozzo <[email protected]>",
 		"Harun Trefry <[email protected]>",
 		"Nikolay Botev <[email protected]>",

diff --git a/remmina/src/remmina_connection_window.c b/remmina/src/remmina_connection_window.c
@@ -1982,15 +1982,9 @@ static void remmina_connection_window_initialize_notebook(GtkNotebook* to, GtkNo
 		tab = remmina_connection_object_create_tab(cnnobj);
 		remmina_connection_object_append_page(cnnobj, to, tab, view_mode);
 
-#if GTK_VERSION == 3		
-		/* Reparent cnnobj->viewport */
-		g_object_ref(cnnobj->viewport);
-		gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(cnnobj->viewport)), cnnobj->viewport);
-		gtk_container_add(GTK_CONTAINER(cnnobj->scrolled_container), cnnobj->viewport );
-		g_object_unref(cnnobj->viewport);
-#elif GTK_VERSION == 2
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 		gtk_widget_reparent(cnnobj->viewport, cnnobj->scrolled_container);
-#endif
+		G_GNUC_END_IGNORE_DEPRECATIONS
 
 		if (cnnobj->window)
 		{
@@ -2518,16 +2512,9 @@ static void remmina_connection_object_on_connect(RemminaProtocolWidget* gp, Remm
 		tab = remmina_connection_object_create_tab(cnnobj);
 		i = remmina_connection_object_append_page(cnnobj, GTK_NOTEBOOK(cnnhld->cnnwin->priv->notebook), tab,
 				cnnhld->cnnwin->priv->view_mode);
-
-#if GTK_VERSION == 3		
-		/* Reparent cnnobj->viewport */
-		g_object_ref(cnnobj->viewport);
-		gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(cnnobj->viewport)), cnnobj->viewport);
-		gtk_container_add(GTK_CONTAINER(cnnobj->scrolled_container), cnnobj->viewport );
-		g_object_unref(cnnobj->viewport);
-#elif GTK_VERSION == 2
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 		gtk_widget_reparent(cnnobj->viewport, cnnobj->scrolled_container);
-#endif
+		G_GNUC_END_IGNORE_DEPRECATIONS
 
 		gtk_window_present(GTK_WINDOW(cnnhld->cnnwin));
 		gtk_notebook_set_current_page(GTK_NOTEBOOK(cnnhld->cnnwin->priv->notebook), i);