[fedora-virt-maint] rpms/virt-viewer/F-11 virt-viewer-0.0.3-keyboard-grab.patch, 1.1, 1.2 virt-viewer.spec, 1.13, 1.14

[Daniel P. Berrange]

Author: berrange

Update of /cvs/pkgs/rpms/virt-viewer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2608

Modified Files:
	virt-viewer-0.0.3-keyboard-grab.patch virt-viewer.spec 
Log Message:
Fix initialization of GValue & Alt-XX menu accel block (rhbz #499362)

virt-viewer-0.0.3-keyboard-grab.patch:

Index: virt-viewer-0.0.3-keyboard-grab.patch
===================================================================
RCS file: /cvs/pkgs/rpms/virt-viewer/F-11/virt-viewer-0.0.3-keyboard-grab.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- virt-viewer-0.0.3-keyboard-grab.patch	7 May 2009 12:05:18 -0000	1.1
+++ virt-viewer-0.0.3-keyboard-grab.patch	15 Jul 2009 11:17:33 -0000	1.2
@@ -1,8 +1,6 @@
-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
+--- virt-viewer-0.0.3.orig/src/main.c	2009-07-15 11:52:54.000000000 +0100
++++ virt-viewer-0.0.3.new/src/main.c	2009-07-15 12:15:16.000000000 +0100
 @@ -81,16 +81,21 @@ struct menuItem {
  	guint menu;
  	GtkWidget *label;
@@ -30,7 +28,7 @@ diff -rup virt-viewer-0.0.3.orig/src/mai
  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 
+@@ -109,24 +114,90 @@ static void viewer_set_title(VncDisplay 
  
  static void viewer_grab(GtkWidget *vnc, GtkWidget *window)
  {
@@ -42,10 +40,11 @@ diff -rup virt-viewer-0.0.3.orig/src/mai
 +	viewer_set_title(VNC_DISPLAY(vnc), window, FALSE);
 +}
 +
-+static void viewer_ignore_accel(GtkWidget *menu G_GNUC_UNUSED,
-+				GtkWindow *window G_GNUC_UNUSED)
++static gboolean viewer_ignore_accel(GtkWidget *menu G_GNUC_UNUSED,
++				    GtkWindow *window G_GNUC_UNUSED)
 +{
 +	/* ignore accelerator */
++	return TRUE;
 +}
 +
 +
@@ -127,7 +126,7 @@ diff -rup virt-viewer-0.0.3.orig/src/mai
  }
  
  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
+@@ -528,11 +599,22 @@ static GtkWidget *viewer_build_window(Vn
  	gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
  
  	if (with_menubar) {
@@ -138,6 +137,9 @@ diff -rup virt-viewer-0.0.3.orig/src/mai
  		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);
 +
++		memset(&accelSetting, 0, sizeof accelSetting);
++		g_value_init(&accelSetting, G_TYPE_STRING);
++
 +		accels = gtk_accel_groups_from_object(G_OBJECT(window));
 +		for ( ; accels ; accels = accels->next) {
 +			accelList = g_slist_append(accelList, accels->data);
@@ -147,7 +149,7 @@ diff -rup virt-viewer-0.0.3.orig/src/mai
  	} else
  		gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(vnc));
  
-@@ -541,6 +619,11 @@ static GtkWidget *viewer_build_window(Vn
+@@ -541,6 +623,11 @@ static GtkWidget *viewer_build_window(Vn
  	gtk_signal_connect(GTK_OBJECT(vnc), "vnc-pointer-ungrab",
  			   GTK_SIGNAL_FUNC(viewer_ungrab), window);
  


Index: virt-viewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-viewer/F-11/virt-viewer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- virt-viewer.spec	7 May 2009 12:05:18 -0000	1.13
+++ virt-viewer.spec	15 Jul 2009 11:17:34 -0000	1.14
@@ -6,7 +6,7 @@
 
 Name: virt-viewer
 Version: 0.0.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Virtual Machine Viewer
 Group: Applications/System
 License: GPLv2+
@@ -21,7 +21,7 @@ BuildRequires: gtk2-devel
 BuildRequires: libvirt-devel >= 0.3.1-4.fc8
 BuildRequires: libxml2-devel
 BuildRequires: gtk-vnc-devel >= 0.3.4
-# For /usr/bin/pod2man 
+# For /usr/bin/pod2man
 BuildRequires: perl
 %if %{_with_plugin}
 %if 0%{?fedora} > 8
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Jul 15 2009 Daniel P. Berrange <berrange at redhat.com> - 0.0.3-6.fc11
+- Fix initialization of GValue & Alt-XX menu accel block (rhbz #499362)
+
 * Thu May  7 2009 Daniel P. Berrange <berrange at redhat.com> - 0.0.3-5.fc11
 - Fix auth against libvirt (rhbz #499594)
 - Fix confusion of VNC credentials (rhbz #499595)