rpms/im-chooser/F-9 im-chooser-fix-window-border.patch, NONE, 1.1 imsettings-ignore-error-on-check-running.patch, NONE, 1.1 im-chooser.spec, 1.40, 1.41

[Akira TAGOH (tagoh)]

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25754

Modified Files:
	im-chooser.spec 
Added Files:
	im-chooser-fix-window-border.patch 
	imsettings-ignore-error-on-check-running.patch 
Log Message:
* Wed May 14 2008 Akira TAGOH <tagoh at redhat.com> - 0.99.6-4
- im-chooser-fix-window-border.patch: Display the progress window with
  the certain window border. (#444818)
- imsettings-ignore-error-on-check-running.patch: Fix a crash issue when
  the pidfile doesn't exist. (#445129)

im-chooser-fix-window-border.patch:

--- NEW FILE im-chooser-fix-window-border.patch ---
Index: src/im-chooser-simple.c
===================================================================
--- src/im-chooser-simple.c	(リビジョン 337)
+++ src/im-chooser-simple.c	(リビジョン 338)
@@ -582,7 +582,8 @@
 	/* setup a progress window */
 	gtk_window_set_title(GTK_WINDOW (im->progress), _("Work in progress..."));
 	gtk_window_set_skip_taskbar_hint(GTK_WINDOW (im->progress), TRUE);
-	gtk_window_set_decorated(GTK_WINDOW (im->progress), FALSE);
+	gtk_window_set_resizable(GTK_WINDOW (im->progress), FALSE);
+	gtk_window_set_deletable(GTK_WINDOW (im->progress), FALSE);
 	/* setup widgets in the progress window */
 	image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_INFO,
 					 GTK_ICON_SIZE_DIALOG);

imsettings-ignore-error-on-check-running.patch:

--- NEW FILE imsettings-ignore-error-on-check-running.patch ---
Index: src/factory.c
===================================================================
--- src/factory.c	(リビジョン 2)
+++ src/factory.c	(作業コピー)
@@ -262,6 +262,13 @@
 	gchar *contents = NULL;
 	gsize len = 0;
 
+	/* check the existence first to get rid of the unnecessary error output */
+	if (!g_file_test(pidfile, G_FILE_TEST_EXISTS)) {
+		g_set_error(error, G_FILE_ERROR, G_FILE_ERROR_NOENT,
+			    _("%s: No such file or directory"),
+			    pidfile);
+		return 0;
+	}
 	if (!g_file_get_contents(pidfile, &contents, &len, error))
 		return 0;
 
@@ -660,6 +667,14 @@
 		pidfile = _build_pidfilename(xinputfile, priv->display_name, "xim");
 		pid = _get_pid(pidfile, "xim", error);
 		if (pid == 0) {
+			if (g_error_matches(*error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
+				/* No pidfile is available. there aren't anything else to do.
+				 * basically this is no problem. someone may just did stop an IM
+				 * actually not running.
+				 */
+				g_error_free(*error);
+				*error = NULL;
+			}
 			g_free(module);
 			module = NULL;
 		} else {


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/F-9/im-chooser.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- im-chooser.spec	29 Apr 2008 03:56:14 -0000	1.40
+++ im-chooser.spec	14 May 2008 07:27:45 -0000	1.41
@@ -1,6 +1,6 @@
 Name:		im-chooser
 Version:	0.99.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 URL:		http://fedorahosted.org/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,6 +13,8 @@
 Patch2:		im-chooser-0.99.6-correct-build-order.patch
 Patch3:		im-chooser-0.99.6-sanity-check-on-dbus-conn.patch
 Patch4:		im-chooser-0.99.6-validate-pid.patch
+Patch5:		im-chooser-fix-window-border.patch
+Patch6:		imsettings-ignore-error-on-check-running.patch
 
 Summary:	Desktop Input Method configuration tool
 Group:		Applications/System
@@ -69,6 +71,10 @@
 %patch2 -p1 -b .build_order
 %patch3 -p0 -b .dbusconn
 %patch4 -p0 -b .pid
+%patch5 -p0 -b .border
+pushd imsettings
+%patch6 -p0 -b .ignore-error
+popd
 autoreconf
 
 %build
@@ -153,6 +159,12 @@
 %{_libdir}/pkgconfig/imsettings.pc
 
 %changelog
+* Wed May 14 2008 Akira TAGOH <tagoh at redhat.com> - 0.99.6-4
+- im-chooser-fix-window-border.patch: Display the progress window with
+  the certain window border. (#444818)
+- imsettings-ignore-error-on-check-running.patch: Fix a crash issue when
+  the pidfile doesn't exist. (#445129)
+
 * Tue Apr 29 2008 Akira TAGOH <tagoh at redhat.com> - 0.99.6-3
 - im-chooser-0.99.6-sanity-check-on-dbus-conn.patch: Do not abort even if
   getting the bus is failed. (#444494)