diff options
| author | Giovanni Panozzo <giovanni@panozzo.it> | 2014-12-08 23:29:27 +0300 |
|---|---|---|
| committer | Giovanni Panozzo <giovanni@panozzo.it> | 2014-12-08 23:29:27 +0300 |
| commit | cc77c59b39c1a0ccfb07681a5ac255d5b17aad31 (patch) | |
| tree | c19343e2c2ac675c21f9555c5694d5ac64f1811a | |
| parent | a2aee21b56a9f2908ba62363d800281891576efb (diff) | |
| parent | 1bb7f3d3ff7d699bb5cc6cf75c785022bb661597 (diff) | |
Merge branch 'v1.1.2'v1.1.2
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | remmina/src/remmina_about.c | 1 | ||||
| -rw-r--r-- | remmina/src/remmina_connection_window.c | 21 |
3 files changed, 6 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b0c2d4ea..0465af36f 100644 --- 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 index b8e18420a..0462ed35b 100644 --- a/remmina/src/remmina_about.c +++ b/remmina/src/remmina_about.c @@ -50,6 +50,7 @@ void remmina_about_open(GtkWindow* parent) "Alex Chateau <ash@zednet.lv>", "Alexander Logvinov <avl@logvinov.com>", "Antenore Gatta <antenore@simbiosi.org>", + "Fabio Castelli (Muflone) <muflone@vbsimple.net>", "Giovanni Panozzo <giovanni@panozzo.it>", "Harun Trefry <aihtdikh@gmail.com>", "Nikolay Botev <bono8106@gmail.com>", diff --git a/remmina/src/remmina_connection_window.c b/remmina/src/remmina_connection_window.c index d6d55db0e..e40ba7f53 100644 --- 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); |