shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-01-06 13:17:45 +03:00
Code Issues Projects Releases Wiki Activity

src: set min gtk to 3.18 to match glib 2.48 vintage

Browse Source 
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-01-13 17:50:40 +00:00
parent 6c6af77fdd
commit eb9dffbbd9
11 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -29,8 +29,8 @@ glib_min_version='>=2.48'
glib_min_version_symbol='GLIB_VERSION_2_48'
# Keep these two definitions in agreement.
gtk_min_version='>=3.12'
gtk_min_version_symbol='GDK_VERSION_3_12'
gtk_min_version='>=3.18'
gtk_min_version_symbol='GDK_VERSION_3_18'
libxml_min_version='>=2.6.0'
libvirt_min_version='>=1.2.8'

1
src/resources/ui/remote-viewer-connect.ui
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.18"/>
<object class="GtkWindow" id="remote-viewer-connection-window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Connection details</property>

2
src/resources/ui/remote-viewer-iso-list.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.16"/>
<requires lib="gtk+" version="3.18"/>
<object class="GtkListStore" id="liststore">
<columns>
<!-- column-name selected -->

2
src/resources/ui/virt-viewer-about.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<requires lib="gtk+" version="3.18"/>
<object class="GtkAboutDialog" id="about">
<property name="can_focus">False</property>
<property name="border_width">5</property>

2
src/resources/ui/virt-viewer-auth.ui
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 2.12 -->
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="auth">
<property name="can_focus">False</property>
<property name="border_width">5</property>

3
src/resources/ui/virt-viewer-file-transfer-dialog.ui
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.10"/>
<!-- interface-naming-policy project-wide -->
<requires lib="gtk+" version="3.18"/>
<template class="VirtViewerFileTransferDialog" parent="GtkDialog">
<property name="default_width">400</property>
<property name="can_focus">False</property>

2
src/resources/ui/virt-viewer-guest-details.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Thu Jan 16 16:13:38 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="guestdetailsdialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Guest Details</property>

3
src/resources/ui/virt-viewer-preferences.ui
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 2.6 -->
<!-- interface-naming-policy toplevel-contextual -->
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="preferences">
<property name="can_focus">False</property>
<property name="border_width">5</property>

2
src/resources/ui/virt-viewer-vm-connection.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="vm-connection-dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>

2
src/resources/ui/virt-viewer.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<requires lib="gtk+" version="3.18"/>
<object class="GtkAccelGroup" id="accelgroup"/>
<object class="GtkApplicationWindow" id="viewer">
<property name="can_focus">False</property>

6
src/virt-viewer-window.c
View File

@ -604,19 +604,13 @@ virt_viewer_window_enter_fullscreen(VirtViewerWindow *self, gint monitor)
}
virt_viewer_window_move_to_monitor(self);
#if GTK_CHECK_VERSION(3, 18, 0)
if (monitor == -1) {
// just go fullscreen on the current monitor
gtk_window_fullscreen(GTK_WINDOW(self->window));
} else {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_window_fullscreen_on_monitor(GTK_WINDOW(self->window),
gdk_screen_get_default(), monitor);
G_GNUC_END_IGNORE_DEPRECATIONS
}
#else
gtk_window_fullscreen(GTK_WINDOW(self->window));
#endif /* GTK_CHECK_VERSION */
}
#define MAX_KEY_COMBO 4