From 8eaf68846d1ae8fb00250a935ec4e8f83a538193 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 29 Jul 2009 14:33:14 +0000 Subject: [PATCH] Update to 0.2.0 release --- sources | 2 +- virt-viewer-0.0.3-auth-fixes.patch | 24 ---- virt-viewer-0.0.3-keyboard-grab.patch | 161 -------------------------- virt-viewer.spec | 24 ++-- 4 files changed, 15 insertions(+), 196 deletions(-) delete mode 100644 virt-viewer-0.0.3-auth-fixes.patch delete mode 100644 virt-viewer-0.0.3-keyboard-grab.patch diff --git a/sources b/sources index 9892d92..edccf2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -feb97e8e0df27fbeeeefe733b49cc157 virt-viewer-0.0.3.tar.gz +4c103eabc50c95e036add9b5a9a7bb96 virt-viewer-0.2.0.tar.gz diff --git a/virt-viewer-0.0.3-auth-fixes.patch b/virt-viewer-0.0.3-auth-fixes.patch deleted file mode 100644 index 249fd50..0000000 --- a/virt-viewer-0.0.3-auth-fixes.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -rup virt-viewer-0.0.3.orig/src/main.c virt-viewer-0.0.3.new/src/main.c ---- virt-viewer-0.0.3.orig/src/main.c 2008-03-10 14:49:48.000000000 +0000 -+++ virt-viewer-0.0.3.new/src/main.c 2009-05-07 12:29:19.000000000 +0100 -@@ -306,7 +306,7 @@ static void viewer_credential(GtkWidget - switch (g_value_get_enum(cred)) { - case VNC_DISPLAY_CREDENTIAL_USERNAME: - case VNC_DISPLAY_CREDENTIAL_PASSWORD: -- data[i] = gtk_entry_get_text(GTK_ENTRY(entry[row])); -+ data[i] = gtk_entry_get_text(GTK_ENTRY(entry[row++])); - break; - } - } -@@ -795,7 +795,10 @@ viewer_start (const char *uri, const cha - - verbose = set_verbose; - -- conn = virConnectOpenReadOnly(uri); -+ /* XXX Write a graphical auth prompter */ -+ conn = virConnectOpenAuth(uri, -+ virConnectAuthPtrDefault, -+ VIR_CONNECT_RO); - if (!conn) { - fprintf(stderr, "unable to connect to libvirt %s\n", - uri ? uri : "xen"); diff --git a/virt-viewer-0.0.3-keyboard-grab.patch b/virt-viewer-0.0.3-keyboard-grab.patch deleted file mode 100644 index d4c6b10..0000000 --- a/virt-viewer-0.0.3-keyboard-grab.patch +++ /dev/null @@ -1,161 +0,0 @@ -Only in virt-viewer-0.0.3.orig/src: .#main.c -Only in virt-viewer-0.0.3.orig/src: #main.c# -diff -rup virt-viewer-0.0.3.orig/src/main.c virt-viewer-0.0.3.new/src/main.c ---- virt-viewer-0.0.3.orig/src/main.c 2009-05-07 12:40:03.000000000 +0100 -+++ virt-viewer-0.0.3.new/src/main.c 2009-05-07 12:49:34.000000000 +0100 -@@ -81,16 +81,21 @@ struct menuItem { - guint menu; - GtkWidget *label; - const char *ungrabbed_text; -- const char *grabbed_text; - }; - - static struct menuItem menuItems[] = { -- { FILE_MENU, NULL, "_File", "File" }, -- { VIEW_MENU, NULL, "_View", "View" }, -- { SEND_KEY_MENU, NULL, "_Send Key", "Send Key" }, -- { HELP_MENU, NULL, "_Help", "Help" } -+ { FILE_MENU, NULL, "_File" }, -+ { VIEW_MENU, NULL, "_View" }, -+ { SEND_KEY_MENU, NULL, "_Send Key"}, -+ { HELP_MENU, NULL, "_Help" }, - }; - -+static gboolean accelEnabled = TRUE; -+static GValue accelSetting; -+static GSList *accelList = NULL; -+static int accelMenuSig[LAST_MENU]; -+ -+ - static void viewer_set_title(VncDisplay *vnc G_GNUC_UNUSED, GtkWidget *window, gboolean grabbed) - { - char title[1024]; -@@ -109,24 +114,89 @@ static void viewer_set_title(VncDisplay - - static void viewer_grab(GtkWidget *vnc, GtkWidget *window) - { -+ viewer_set_title(VNC_DISPLAY(vnc), window, TRUE); -+} -+ -+static void viewer_ungrab(GtkWidget *vnc, GtkWidget *window) -+{ -+ viewer_set_title(VNC_DISPLAY(vnc), window, FALSE); -+} -+ -+static void viewer_ignore_accel(GtkWidget *menu G_GNUC_UNUSED, -+ GtkWindow *window G_GNUC_UNUSED) -+{ -+ /* ignore accelerator */ -+} -+ -+ -+static void viewer_disable_modifiers(GtkWindow *window) -+{ -+ GtkSettings *settings = gtk_settings_get_default(); -+ GValue empty; -+ GSList *accels; - int i; - -- viewer_set_title(VNC_DISPLAY(vnc), window, TRUE); -+ if (!accelEnabled) -+ return; -+ -+ /* This stops F10 activating menu bar */ -+ memset(&empty, 0, sizeof empty); -+ g_value_init(&empty, G_TYPE_STRING); -+ g_object_get_property(G_OBJECT(settings), "gtk-menu-bar-accel", &accelSetting); -+ g_object_set_property(G_OBJECT(settings), "gtk-menu-bar-accel", &empty); -+ -+ /* This stops global accelerators like Ctrl+Q == Quit */ -+ for (accels = accelList ; accels ; accels = accels->next) { -+ gtk_window_remove_accel_group(GTK_WINDOW(window), accels->data); -+ } - -- for (i = 0 ; i < LAST_MENU; i++) { -- gtk_label_set_text_with_mnemonic(GTK_LABEL(menuItems[i].label), menuItems[i].grabbed_text); -+ /* This stops menu bar shortcuts like Alt+F == File */ -+ for (i = 0 ; i < LAST_MENU ; i++) { -+ GtkWidget *menu = menuItems[i].label; -+ accelMenuSig[i] = -+ g_signal_connect(GTK_OBJECT(menu), "mnemonic-activate", -+ GTK_SIGNAL_FUNC(viewer_ignore_accel), window); - } -+ -+ accelEnabled = FALSE; - } - --static void viewer_ungrab(GtkWidget *vnc, GtkWidget *window) -+ -+static void viewer_enable_modifiers(GtkWindow *window) - { -+ GtkSettings *settings = gtk_settings_get_default(); -+ GSList *accels; - int i; - -- viewer_set_title(VNC_DISPLAY(vnc), window, FALSE); -+ if (accelEnabled) -+ return; -+ -+ /* This allows F10 activating menu bar */ -+ g_object_set_property(G_OBJECT(settings), "gtk-menu-bar-accel", &accelSetting); - -- for (i = 0 ; i < LAST_MENU; i++) { -- gtk_label_set_text_with_mnemonic(GTK_LABEL(menuItems[i].label), menuItems[i].ungrabbed_text); -+ /* This allows global accelerators like Ctrl+Q == Quit */ -+ for (accels = accelList ; accels ; accels = accels->next) { -+ gtk_window_add_accel_group(GTK_WINDOW(window), accels->data); - } -+ -+ /* This allows menu bar shortcuts like Alt+F == File */ -+ for (i = 0 ; i < LAST_MENU ; i++) { -+ GtkWidget *menu = menuItems[i].label; -+ g_signal_handler_disconnect(GTK_OBJECT(menu), -+ accelMenuSig[i]); -+ } -+ -+ accelEnabled = TRUE; -+} -+ -+static void viewer_key_grab(GtkWidget *vnc G_GNUC_UNUSED, GtkWidget *window) -+{ -+ viewer_disable_modifiers(GTK_WINDOW(window)); -+} -+ -+static void viewer_key_ungrab(GtkWidget *vnc G_GNUC_UNUSED, GtkWidget *window) -+{ -+ viewer_enable_modifiers(GTK_WINDOW(window)); - } - - static void viewer_shutdown(GtkWidget *src G_GNUC_UNUSED, void *dummy G_GNUC_UNUSED, GtkWidget *vnc) -@@ -528,11 +598,19 @@ static GtkWidget *viewer_build_window(Vn - gtk_window_set_resizable(GTK_WINDOW(window), TRUE); - - if (with_menubar) { -+ GSList *accels; - layout = gtk_vbox_new(FALSE, 3); - menubar = viewer_build_menu(vnc, window, gtk_widget_is_composited(window)); - gtk_container_add(GTK_CONTAINER(window), layout); - gtk_container_add_with_properties(GTK_CONTAINER(layout), menubar, "expand", FALSE, NULL); - gtk_container_add_with_properties(GTK_CONTAINER(layout), GTK_WIDGET(vnc), "expand", TRUE, NULL); -+ -+ accels = gtk_accel_groups_from_object(G_OBJECT(window)); -+ for ( ; accels ; accels = accels->next) { -+ accelList = g_slist_append(accelList, accels->data); -+ g_object_ref(G_OBJECT(accels->data)); -+ } -+ - } else - gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(vnc)); - -@@ -541,6 +619,11 @@ static GtkWidget *viewer_build_window(Vn - gtk_signal_connect(GTK_OBJECT(vnc), "vnc-pointer-ungrab", - GTK_SIGNAL_FUNC(viewer_ungrab), window); - -+ gtk_signal_connect(GTK_OBJECT(vnc), "vnc-keyboard-grab", -+ GTK_SIGNAL_FUNC(viewer_key_grab), window); -+ gtk_signal_connect(GTK_OBJECT(vnc), "vnc-keyboard-ungrab", -+ GTK_SIGNAL_FUNC(viewer_key_ungrab), window); -+ - gtk_signal_connect(GTK_OBJECT(window), "delete-event", - GTK_SIGNAL_FUNC(viewer_shutdown), vnc); - diff --git a/virt-viewer.spec b/virt-viewer.spec index 625b0c3..afaab10 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -5,24 +5,22 @@ %define _with_plugin %{?with_plugin:1}%{!?with_plugin:0} Name: virt-viewer -Version: 0.0.3 -Release: 6%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz -Patch1: %{name}-%{version}-auth-fixes.patch -Patch2: %{name}-%{version}-keyboard-grab.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: openssh-clients BuildRequires: gtk2-devel -BuildRequires: libvirt-devel >= 0.3.1-4.fc8 +BuildRequires: libvirt-devel >= 0.6.0 BuildRequires: libxml2-devel -BuildRequires: gtk-vnc-devel >= 0.3.4 -# For /usr/bin/pod2man -BuildRequires: perl +BuildRequires: libglade2-devel +BuildRequires: gtk-vnc-devel >= 0.3.8 +BuildRequires: /usr/bin/pod2man %if %{_with_plugin} %if 0%{?fedora} > 8 BuildRequires: xulrunner-devel @@ -52,8 +50,6 @@ browsers. %prep %setup -q -%patch1 -p1 -%patch2 -p1 %build %if %{_with_plugin} @@ -79,6 +75,11 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc README COPYING AUTHORS ChangeLog NEWS %{_bindir}/%{name} +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/ui/ +%{_datadir}/%{name}/ui/auth.glade +%{_datadir}/%{name}/ui/about.glade +%{_datadir}/%{name}/ui/viewer.glade %{_mandir}/man1/%{name}* %if %{_with_plugin} @@ -88,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Jul 29 2009 Daniel P. Berrange - 0.2.0-1.fc12 +- Update to 0.2.0 release + * Sun Jul 26 2009 Fedora Release Engineering - 0.0.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild