Re: [virt-tools-list] [PATCH v3 1/5] Drop support to gtk2

2016-02-15 Thread Fabiano Fidêncio 
On Fri, 2016-02-12 at 09:35 -0200, Eduardo Lima (Etrunko) wrote:
> From: Fabiano Fidêncio 
> 
> The 3.0 release was the last one that still supports GTK2. For the
> Windows builds the support to GTK2 was dropped in the previous
> release.
> Let's do the same for the entire project now.
> ---
>  configure.ac  | 39 +++
>  src/view/autoDrawer.c | 10 -
>  src/view/ovBox.c  | 45 --
>  src/virt-gtk-compat.h | 12 --
>  src/virt-viewer-display.c | 96 +--
> 
>  src/virt-viewer-window.c  | 10 -
>  virt-viewer.spec.in   | 23 
>  7 files changed, 6 insertions(+), 229 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 8aa80ca..250a7fe 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -15,9 +15,7 @@ AM_SILENT_RULES([yes])
>  GLIB2_REQUIRED=2.22.0
>  LIBXML2_REQUIRED="2.6.0"
>  LIBVIRT_REQUIRED="0.10.0"
> -GTK2_REQUIRED="2.18.0"
>  GTK3_REQUIRED="3.0"
> -GTK_VNC1_REQUIRED="0.3.8"
>  GTK_VNC2_REQUIRED="0.4.0"
>  SPICE_GTK_REQUIRED="0.30"
>  SPICE_PROTOCOL_REQUIRED="0.12.7"
> @@ -26,9 +24,7 @@ GOVIRT_REQUIRED="0.3.2"
>  AC_SUBST([GLIB2_REQUIRED])
>  AC_SUBST([LIBXML2_REQUIRED])
>  AC_SUBST([LIBVIRT_REQUIRED])
> -AC_SUBST([GTK2_REQUIRED])
>  AC_SUBST([GTK3_REQUIRED])
> -AC_SUBST([GTK_VNC1_REQUIRED])
>  AC_SUBST([GTK_VNC2_REQUIRED])
>  AC_SUBST([SPICE_GTK_REQUIRED])
>  AC_SUBST([SPICE_PROTOCOL_REQUIRED])
> @@ -121,36 +117,15 @@ AC_CHECK_LIB([virt],
>   [AC_DEFINE([HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD], 1, [Have
> virDomainOpenGraphicsFD?])])
>  LIBS=$old_LIBS
>  
> -AC_MSG_CHECKING([which gtk+ version to compile against])
> -AC_ARG_WITH([gtk],
> -  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to
> compile against (default: 3.0)])],
> -  [case "$with_gtk" in
> - 2.0|3.0) ;;
> - *) AC_MSG_ERROR([invalid gtk version specified]) ;;
> -   esac],
> -  [with_gtk=3.0])
> -AC_MSG_RESULT([$with_gtk])
> -
> -case "$with_gtk" in
> -  2.0) GTK_API_VERSION=2.0
> -   GTK_REQUIRED=$GTK2_REQUIRED
> -   GTK_VNC_REQUIRED=$GTK_VNC1_REQUIRED
> -   GTK_VNC_API_VERSION=1.0
> -   SPICE_GTK_API_VERSION=2.0
> -   ;;
> -  3.0) GTK_API_VERSION=3.0
> -   GTK_REQUIRED=$GTK3_REQUIRED
> -   GTK_VNC_REQUIRED=$GTK_VNC2_REQUIRED
> -   GTK_VNC_API_VERSION=2.0
> -   SPICE_GTK_API_VERSION=3.0
> -   ;;
> -esac
> +GTK_API_VERSION=3.0
> +GTK_REQUIRED=$GTK3_REQUIRED
> +GTK_VNC_REQUIRED=$GTK_VNC2_REQUIRED
> +GTK_VNC_API_VERSION=2.0
> +SPICE_GTK_API_VERSION=3.0
>  
>  AC_SUBST([GTK_API_VERSION])
>  AC_SUBST([GTK_REQUIRED])
>  AC_SUBST([GTK_VNC_API_VERSION])
> -AM_CONDITIONAL([HAVE_GTK_2],[test "$with_gtk" = "2.0"])
> -AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"])
>  
>  PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
>  
> @@ -275,10 +250,6 @@ AC_MSG_NOTICE([])
>  AC_MSG_NOTICE([Configuration summary])
>  AC_MSG_NOTICE([=])
>  AC_MSG_NOTICE([])
> -AC_MSG_NOTICE([ Features:])
> -AC_MSG_NOTICE([])
> -AC_MSG_NOTICE([  Gtk: $with_gtk])
> -AC_MSG_NOTICE([])
>  AC_MSG_NOTICE([ Libraries:])
>  AC_MSG_NOTICE([])
>  AC_MSG_NOTICE([   GLIB2: $GLIB2_CFLAGS $GLIB2_LIBS])
> diff --git a/src/view/autoDrawer.c b/src/view/autoDrawer.c
> index cbf92de..2ae106c 100644
> --- a/src/view/autoDrawer.c
> +++ b/src/view/autoDrawer.c
> @@ -218,7 +218,6 @@ ViewAutoDrawerUpdate(ViewAutoDrawer *that, // IN
> if (gtk_widget_get_window(priv->evBox)) {
>    int x;
>    int y;
> -#if GTK_CHECK_VERSION(3, 0, 0)
>    GdkDevice *dev;
>    GdkDeviceManager *devmgr;
>  
> @@ -227,9 +226,6 @@ ViewAutoDrawerUpdate(ViewAutoDrawer *that, // IN
>  
>    gdk_window_get_device_position(gtk_widget_get_window(priv-
> >evBox),
>   dev, , , NULL);
> -#else
> -  gtk_widget_get_pointer(priv->evBox, , );
> -#endif
>  
>    gtk_widget_get_allocation(priv->evBox, );
>    g_assert(gtk_container_get_border_width(   GTK_CONTAINER(priv-
> >evBox))
> @@ -262,16 +258,10 @@ ViewAutoDrawerUpdate(ViewAutoDrawer *that, //
> IN
> if (!priv->inputUngrabbed) {
>    GtkWidget *grabbed = NULL;
>  
> -#if GTK_CHECK_VERSION(3, 0, 0)
>    if (gtk_window_has_group (window)) {
>  GtkWindowGroup *group = gtk_window_get_group (window);
>  grabbed = gtk_window_group_get_current_grab (group);
>    }
> -#else
> -  if (window->group && window->group->grabs) {
> -grabbed = GTK_WIDGET(window->group->grabs->data);
> -  }
> -#endif
>    if (!grabbed) {
>   grabbed = gtk_grab_get_current();
>    }
> diff --git a/src/view/ovBox.c b/src/view/ovBox.c
> index 185b0b7..fa56fd5 100644
> --- a/src/view/ovBox.c
> +++ b/src/view/ovBox.c
> @@ -76,13 +76,6 @@
>  
>  #include "ovBox.h"
>  
> -#if ! GTK_CHECK_VERSION(3, 0, 0)
> -#define gtk_widget_set_realized(widget, val)\
> -  GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED)
>

Re: [virt-tools-list] [PATCH v3 1/5] Drop support to gtk2

2016-02-15 Thread Eduardo Lima (Etrunko) 
On 02/15/2016 11:48 AM, Fabiano Fidêncio wrote:

> 
> This patch got already ACKed in one of the previous iterations?
> If yes, I'll push it. If it's not the case, I cannot ACK my own patch
> though :-)
> 

I can ack it for you :P. But this one is already outdated due to Pavel's
recent changes in virt-viewer-display.c. I will post the updated version.


-- 
Eduardo de Barros Lima (Etrunko)
Software Engineer - RedHat
etru...@redhat.com

___
virt-tools-list mailing list
virt-tools-list@redhat.com
https://www.redhat.com/mailman/listinfo/virt-tools-list

[virt-tools-list] [PATCH v3 1/5] Drop support to gtk2

2016-02-12 Thread Eduardo Lima (Etrunko) 
From: Fabiano Fidêncio 

The 3.0 release was the last one that still supports GTK2. For the
Windows builds the support to GTK2 was dropped in the previous release.
Let's do the same for the entire project now.
---
 configure.ac  | 39 +++
 src/view/autoDrawer.c | 10 -
 src/view/ovBox.c  | 45 --
 src/virt-gtk-compat.h | 12 --
 src/virt-viewer-display.c | 96 +--
 src/virt-viewer-window.c  | 10 -
 virt-viewer.spec.in   | 23 
 7 files changed, 6 insertions(+), 229 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8aa80ca..250a7fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,9 +15,7 @@ AM_SILENT_RULES([yes])
 GLIB2_REQUIRED=2.22.0
 LIBXML2_REQUIRED="2.6.0"
 LIBVIRT_REQUIRED="0.10.0"
-GTK2_REQUIRED="2.18.0"
 GTK3_REQUIRED="3.0"
-GTK_VNC1_REQUIRED="0.3.8"
 GTK_VNC2_REQUIRED="0.4.0"
 SPICE_GTK_REQUIRED="0.30"
 SPICE_PROTOCOL_REQUIRED="0.12.7"
@@ -26,9 +24,7 @@ GOVIRT_REQUIRED="0.3.2"
 AC_SUBST([GLIB2_REQUIRED])
 AC_SUBST([LIBXML2_REQUIRED])
 AC_SUBST([LIBVIRT_REQUIRED])
-AC_SUBST([GTK2_REQUIRED])
 AC_SUBST([GTK3_REQUIRED])
-AC_SUBST([GTK_VNC1_REQUIRED])
 AC_SUBST([GTK_VNC2_REQUIRED])
 AC_SUBST([SPICE_GTK_REQUIRED])
 AC_SUBST([SPICE_PROTOCOL_REQUIRED])
@@ -121,36 +117,15 @@ AC_CHECK_LIB([virt],
  [AC_DEFINE([HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD], 1, [Have 
virDomainOpenGraphicsFD?])])
 LIBS=$old_LIBS
 
-AC_MSG_CHECKING([which gtk+ version to compile against])
-AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against 
(default: 3.0)])],
-  [case "$with_gtk" in
- 2.0|3.0) ;;
- *) AC_MSG_ERROR([invalid gtk version specified]) ;;
-   esac],
-  [with_gtk=3.0])
-AC_MSG_RESULT([$with_gtk])
-
-case "$with_gtk" in
-  2.0) GTK_API_VERSION=2.0
-   GTK_REQUIRED=$GTK2_REQUIRED
-   GTK_VNC_REQUIRED=$GTK_VNC1_REQUIRED
-   GTK_VNC_API_VERSION=1.0
-   SPICE_GTK_API_VERSION=2.0
-   ;;
-  3.0) GTK_API_VERSION=3.0
-   GTK_REQUIRED=$GTK3_REQUIRED
-   GTK_VNC_REQUIRED=$GTK_VNC2_REQUIRED
-   GTK_VNC_API_VERSION=2.0
-   SPICE_GTK_API_VERSION=3.0
-   ;;
-esac
+GTK_API_VERSION=3.0
+GTK_REQUIRED=$GTK3_REQUIRED
+GTK_VNC_REQUIRED=$GTK_VNC2_REQUIRED
+GTK_VNC_API_VERSION=2.0
+SPICE_GTK_API_VERSION=3.0
 
 AC_SUBST([GTK_API_VERSION])
 AC_SUBST([GTK_REQUIRED])
 AC_SUBST([GTK_VNC_API_VERSION])
-AM_CONDITIONAL([HAVE_GTK_2],[test "$with_gtk" = "2.0"])
-AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"])
 
 PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
 
@@ -275,10 +250,6 @@ AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Configuration summary])
 AC_MSG_NOTICE([=])
 AC_MSG_NOTICE([])
-AC_MSG_NOTICE([ Features:])
-AC_MSG_NOTICE([])
-AC_MSG_NOTICE([  Gtk: $with_gtk])
-AC_MSG_NOTICE([])
 AC_MSG_NOTICE([ Libraries:])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([   GLIB2: $GLIB2_CFLAGS $GLIB2_LIBS])
diff --git a/src/view/autoDrawer.c b/src/view/autoDrawer.c
index cbf92de..2ae106c 100644
--- a/src/view/autoDrawer.c
+++ b/src/view/autoDrawer.c
@@ -218,7 +218,6 @@ ViewAutoDrawerUpdate(ViewAutoDrawer *that, // IN
if (gtk_widget_get_window(priv->evBox)) {
   int x;
   int y;
-#if GTK_CHECK_VERSION(3, 0, 0)
   GdkDevice *dev;
   GdkDeviceManager *devmgr;
 
@@ -227,9 +226,6 @@ ViewAutoDrawerUpdate(ViewAutoDrawer *that, // IN
 
   gdk_window_get_device_position(gtk_widget_get_window(priv->evBox),
  dev, , , NULL);
-#else
-  gtk_widget_get_pointer(priv->evBox, , );
-#endif
 
   gtk_widget_get_allocation(priv->evBox, );
   g_assert(gtk_container_get_border_width(   GTK_CONTAINER(priv->evBox))
@@ -262,16 +258,10 @@ ViewAutoDrawerUpdate(ViewAutoDrawer *that, // IN
if (!priv->inputUngrabbed) {
   GtkWidget *grabbed = NULL;
 
-#if GTK_CHECK_VERSION(3, 0, 0)
   if (gtk_window_has_group (window)) {
 GtkWindowGroup *group = gtk_window_get_group (window);
 grabbed = gtk_window_group_get_current_grab (group);
   }
-#else
-  if (window->group && window->group->grabs) {
-grabbed = GTK_WIDGET(window->group->grabs->data);
-  }
-#endif
   if (!grabbed) {
  grabbed = gtk_grab_get_current();
   }
diff --git a/src/view/ovBox.c b/src/view/ovBox.c
index 185b0b7..fa56fd5 100644
--- a/src/view/ovBox.c
+++ b/src/view/ovBox.c
@@ -76,13 +76,6 @@
 
 #include "ovBox.h"
 
-#if ! GTK_CHECK_VERSION(3, 0, 0)
-#define gtk_widget_set_realized(widget, val)\
-  GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED)
-#define gtk_widget_get_realized(widget)\
-  GTK_WIDGET_REALIZED(widget)
-#endif
-
 struct _ViewOvBoxPrivate
 {
GdkWindow *underWin;
@@ -338,22 +331,12 @@ static void
 ViewOvBoxSetBackground(ViewOvBox *that) // IN
 {
GtkWidget *widget = GTK_WIDGET(that);
-
-#if GTK_CHECK_VERSION(3, 0, 0)
GtkStyleContext *stylecontext;
 
stylecontext =