From 82d089cf1d2ca7947eeed86f73ab78a78c0842e3 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Jul 08 2008 09:58:53 +0000 Subject: - New upstream release. --- diff --git a/.cvsignore b/.cvsignore index fdb4ec3..c3444bc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -22,3 +22,5 @@ im-chooser-0.99.3.tar.gz im-chooser-0.99.4.tar.gz im-chooser-0.99.5.tar.gz im-chooser-0.99.6.tar.gz +im-chooser-1.1.1.tar.bz2 +im-chooser-1.2.0.tar.bz2 diff --git a/im-chooser-0.99.6-check-if-im-is-running.patch b/im-chooser-0.99.6-check-if-im-is-running.patch deleted file mode 100644 index 9526219..0000000 --- a/im-chooser-0.99.6-check-if-im-is-running.patch +++ /dev/null @@ -1,241 +0,0 @@ -Index: imsettings/utils/imsettings-list.c -=================================================================== ---- imsettings/utils/imsettings-list.c (リビジョン 331) -+++ imsettings/utils/imsettings-list.c (作業コピー) -@@ -31,10 +31,10 @@ - main(int argc, - char **argv) - { -- IMSettingsRequest *imsettings; -+ IMSettingsRequest *imsettings_info, *imsettings; - DBusConnection *connection; - gchar **list, *locale; -- gchar *user_im, *system_im; -+ gchar *user_im, *system_im, *running_im; - gint i; - - setlocale(LC_ALL, ""); -@@ -43,16 +43,18 @@ - g_type_init(); - - connection = dbus_bus_get(DBUS_BUS_SESSION, NULL); -- imsettings = imsettings_request_new(connection, IMSETTINGS_INFO_INTERFACE_DBUS); -- imsettings_request_set_locale(imsettings, locale); -- if ((list = imsettings_request_get_im_list(imsettings)) == NULL) { -+ imsettings = imsettings_request_new(connection, IMSETTINGS_INTERFACE_DBUS); -+ imsettings_info = imsettings_request_new(connection, IMSETTINGS_INFO_INTERFACE_DBUS); -+ imsettings_request_set_locale(imsettings_info, locale); -+ if ((list = imsettings_request_get_im_list(imsettings_info)) == NULL) { - g_printerr("Failed to get an IM list.\n"); - } else { -- user_im = imsettings_request_get_current_user_im(imsettings); -- system_im = imsettings_request_get_current_system_im(imsettings); -+ user_im = imsettings_request_get_current_user_im(imsettings_info); -+ system_im = imsettings_request_get_current_system_im(imsettings_info); -+ running_im = imsettings_request_what_im_is_running(imsettings); - for (i = 0; list[i] != NULL; i++) { - g_print("%s %d: %s %s\n", -- (strcmp(user_im, list[i]) == 0 ? "*" : " "), -+ (strcmp(running_im, list[i]) == 0 ? "*" : (strcmp(user_im, list[i]) == 0 ? "-" : " ")), - i + 1, - list[i], - (strcmp(system_im, list[i]) == 0 ? "(recommended)" : "")); -@@ -60,6 +62,7 @@ - g_strfreev(list); - } - g_object_unref(imsettings); -+ g_object_unref(imsettings_info); - dbus_connection_unref(connection); - - return 0; -Index: imsettings/imsettings/imsettings-observer.h -=================================================================== ---- imsettings/imsettings/imsettings-observer.h (リビジョン 331) -+++ imsettings/imsettings/imsettings-observer.h (作業コピー) -@@ -84,6 +84,8 @@ - gboolean update_xinputrc, - gboolean force, - GError **error); -+ const gchar * (* what_im_is_running) (IMSettingsObserver *imsettings, -+ GError **error); - - /* signals */ - void (* s_start_im) (IMSettingsObserver *imsettings, -Index: imsettings/imsettings/imsettings-request.h -=================================================================== ---- imsettings/imsettings/imsettings-request.h (リビジョン 331) -+++ imsettings/imsettings/imsettings-request.h (作業コピー) -@@ -95,6 +95,7 @@ - const gchar *module, - gboolean update_xinputrc, - gboolean force); -+gchar *imsettings_request_what_im_is_running (IMSettingsRequest *imsettings); - gboolean imsettings_request_reload (IMSettingsRequest *imsettings, - gboolean force); - gboolean imsettings_request_change_to (IMSettingsRequest *imsettings, -Index: imsettings/imsettings/imsettings.xml -=================================================================== ---- imsettings/imsettings/imsettings.xml (リビジョン 331) -+++ imsettings/imsettings/imsettings.xml (作業コピー) -@@ -13,6 +13,11 @@ - - - -+ -+ -+ -+ -+ - - - -Index: imsettings/imsettings/imsettings-observer.c -=================================================================== ---- imsettings/imsettings/imsettings-observer.c (リビジョン 331) -+++ imsettings/imsettings/imsettings-observer.c (作業コピー) -@@ -134,6 +134,28 @@ - } - - static gboolean -+imsettings_what_input_method_is_running(GObject *object, -+ const gchar **ret, -+ GError **error) -+{ -+ IMSettingsObserverClass *klass = IMSETTINGS_OBSERVER_GET_CLASS (object); -+ const gchar *module; -+ gboolean retval = FALSE; -+ -+ d(g_print("Getting current IM running\n")); -+ if (klass->what_im_is_running) { -+ module = klass->what_im_is_running(IMSETTINGS_OBSERVER (object), -+ error); -+ if (*error == NULL) { -+ *ret = g_strdup(module); -+ retval = TRUE; -+ } -+ } -+ -+ return retval; -+} -+ -+static gboolean - imsettings_get_list(GObject *object, - const gchar *lang, - gchar ***ret, -Index: imsettings/imsettings/imsettings-request.c -=================================================================== ---- imsettings/imsettings/imsettings-request.c (リビジョン 331) -+++ imsettings/imsettings/imsettings-request.c (作業コピー) -@@ -633,6 +633,28 @@ - user_data) != NULL; - } - -+gchar * -+imsettings_request_what_im_is_running(IMSettingsRequest *imsettings) -+{ -+ IMSettingsRequestPrivate *priv; -+ GError *error = NULL; -+ gchar *retval; -+ -+ g_return_val_if_fail (IMSETTINGS_IS_REQUEST (imsettings), FALSE); -+ -+ priv = IMSETTINGS_REQUEST_GET_PRIVATE (imsettings); -+ if (!com_redhat_imsettings_what_input_method_is_running(priv->proxy, -+ &retval, -+ &error)) { -+ g_warning(_("Failed to invoke a method `%s':\n %s"), "WhatInputMethodIsRunning", error->message); -+ g_error_free(error); -+ -+ return NULL; -+ } -+ -+ return retval; -+} -+ - gboolean - imsettings_request_reload(IMSettingsRequest *imsettings, - gboolean force) -Index: imsettings/src/factory.c -=================================================================== ---- imsettings/src/factory.c (リビジョン 331) -+++ imsettings/src/factory.c (作業コピー) -@@ -625,6 +625,41 @@ - return retval; - } - -+const gchar * -+imsettings_manager_real_what_im_is_running(IMSettingsObserver *observer, -+ GError **error) -+{ -+ IMSettingsManagerPrivate *priv = IMSETTINGS_MANAGER_GET_PRIVATE (observer); -+ IMSettingsRequest *req; -+ DBusConnection *conn; -+ gchar *module, *xinputfile = NULL, *pidfile = NULL; -+ -+ conn = dbus_bus_get(DBUS_BUS_SESSION, NULL); -+ req = imsettings_request_new(conn, IMSETTINGS_INFO_INTERFACE_DBUS); -+ module = imsettings_request_get_current_user_im(req); -+ if (module) { -+ xinputfile = imsettings_request_get_xinput_filename(req, module); -+ if (!xinputfile) { -+ g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_IM_NOT_FOUND, -+ _("No such input method on your system: %s"), -+ module); -+ goto end; -+ } -+ pidfile = _build_pidfilename(xinputfile, priv->display_name, "xim"); -+ if (!g_file_test(pidfile, G_FILE_TEST_EXISTS)) { -+ g_free(module); -+ module = NULL; -+ } -+ } -+ end: -+ g_free(xinputfile); -+ g_free(pidfile); -+ g_object_unref(req); -+ dbus_connection_unref(conn); -+ -+ return module; -+} -+ - static void - imsettings_manager_class_init(IMSettingsManagerClass *klass) - { -@@ -637,8 +672,9 @@ - object_class->get_property = imsettings_manager_real_get_property; - object_class->finalize = imsettings_manager_real_finalize; - -- observer_class->start_im = imsettings_manager_real_start_im; -- observer_class->stop_im = imsettings_manager_real_stop_im; -+ observer_class->start_im = imsettings_manager_real_start_im; -+ observer_class->stop_im = imsettings_manager_real_stop_im; -+ observer_class->what_im_is_running = imsettings_manager_real_what_im_is_running; - - /* properties */ - g_object_class_install_property(object_class, PROP_DISPLAY_NAME, -Index: src/im-chooser-simple.c -=================================================================== ---- src/im-chooser-simple.c (リビジョン 331) -+++ src/im-chooser-simple.c (作業コピー) -@@ -626,10 +626,11 @@ - GtkRequisition requisition; - guint count = 0; - gint i, priority = 0; -- gchar *user_im, *system_im; -+ gchar *user_im, *system_im, *running_im; - - user_im = imsettings_request_get_current_user_im(im->imsettings_info); - system_im = imsettings_request_get_current_system_im(im->imsettings_info); -+ running_im = imsettings_request_what_im_is_running(im->imsettings); - if (im->im_list == NULL) - goto end; - -@@ -654,7 +655,7 @@ - def_iter = gtk_tree_iter_copy(&iter); - } - if (im->current_im == NULL && -- strcmp(user_im, im->im_list[i]) == 0) { -+ strcmp(running_im, im->im_list[i]) == 0) { - im->current_im = g_strdup(im->im_list[i]); - if (im->initial_im == NULL) - im->initial_im = g_strdup(im->current_im); diff --git a/im-chooser-0.99.6-correct-build-order.patch b/im-chooser-0.99.6-correct-build-order.patch deleted file mode 100644 index 11cbf52..0000000 --- a/im-chooser-0.99.6-correct-build-order.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -pruN im-chooser-0.99.6.orig/imsettings/imsettings/Makefile.am im-chooser-0.99.6/imsettings/imsettings/Makefile.am ---- im-chooser-0.99.6.orig/imsettings/imsettings/Makefile.am 2008-03-19 15:12:55.000000000 +0900 -+++ im-chooser-0.99.6/imsettings/imsettings/Makefile.am 2008-04-25 22:38:36.000000000 +0900 -@@ -37,7 +37,8 @@ noinst_HEADERS = \ - imsettings-marshal.h \ - $(NULL) - --imsettings.h: stamp-bindings.h $(srcdir)/imsettings-marshal.h $(srcdir)/imsettings-marshal.c -+imsettings-observer.c: stamp-bindings.h $(srcdir)/imsettings-marshal.h Makefile -+imsettings-request.c: stamp-bindings.h Makefile - $(top_srcdir)/imsettings/imsettings/imsettings-glib-bindings.h: stamp-bindings.h Makefile - @true - stamp-bindings.h: $(srcdir)/imsettings.xml Makefile -@@ -49,13 +50,13 @@ stamp-bindings.h: $(srcdir)/imsettings.x - --mode=glib-server \ - --output=$(srcdir)/imsettings-glib-glue.h $(srcdir)/imsettings.xml ) && \ - echo timestamp > $(@F) --$(srcdir)/imsettings-marshal.h: $(srcdir)/marshal.list $(srcdir)/imsettings-marshal.c Makefile -+$(srcdir)/imsettings-marshal.h: $(srcdir)/marshal.list Makefile - ( cd $(srcdir) && \ - @GLIB_GENMARSHAL@ --prefix=imsettings_marshal $(srcdir)/marshal.list \ - --header > xgen-imh && \ - (cmp -s xgen-imh imsettings-marshal.h || cp xgen-imh imsettings-marshal.h) && \ - rm -f xgen-imh) --$(srcdir)/imsettings-marshal.c: $(srcdir)/marshal.list $(srcdir)/imsettings-marshal.h Makefile -+$(srcdir)/imsettings-marshal.c: $(srcdir)/imsettings-marshal.h Makefile - ( cd $(srcdir) && \ - @GLIB_GENMARSHAL@ --prefix=imsettings_marshal $(srcdir)/marshal.list \ - --body > xgen-imc && \ diff --git a/im-chooser-0.99.6-sanity-check-on-dbus-conn.patch b/im-chooser-0.99.6-sanity-check-on-dbus-conn.patch deleted file mode 100644 index 67e31c9..0000000 --- a/im-chooser-0.99.6-sanity-check-on-dbus-conn.patch +++ /dev/null @@ -1,20 +0,0 @@ -2008-04-29 Akira TAGOH - - * utils/imsettings-reload.c (main): exit if opening session bus - is failed. - -Index: imsettings/utils/imsettings-reload.c -=================================================================== ---- imsettings/utils/imsettings-reload.c (revision 334) -+++ imsettings/utils/imsettings-reload.c (revision 335) -@@ -67,6 +67,10 @@ - g_option_context_free(ctx); - - connection = dbus_bus_get(DBUS_BUS_SESSION, NULL); -+ if (connection == NULL) { -+ g_printerr("Failed to get a session bus.\n"); -+ return 1; -+ } - imsettings = imsettings_request_new(connection, IMSETTINGS_INTERFACE_DBUS); - imgconf = imsettings_request_new(connection, IMSETTINGS_GCONF_INTERFACE_DBUS); - iminfo = imsettings_request_new(connection, IMSETTINGS_INFO_INTERFACE_DBUS); diff --git a/im-chooser-0.99.6-validate-pid.patch b/im-chooser-0.99.6-validate-pid.patch deleted file mode 100644 index 95d331d..0000000 --- a/im-chooser-0.99.6-validate-pid.patch +++ /dev/null @@ -1,118 +0,0 @@ - 2008-04-29 Akira TAGOH - - * src/factory.c (_get_pid): new. - (imsettings_manager_real_what_im_is_running): check if pid is valid - or not. - -Index: imsettings/src/factory.c -=================================================================== ---- imsettings/src/factory.c (revision 335) -+++ imsettings/src/factory.c (revision 336) -@@ -77,7 +77,9 @@ - PROP_DISPLAY_NAME, - }; - --GType imsettings_manager_get_type(void) G_GNUC_CONST; -+GType imsettings_manager_get_type (void) G_GNUC_CONST; -+const gchar *imsettings_manager_real_what_im_is_running(IMSettingsObserver *observer, -+ GError **error); - - G_DEFINE_TYPE (IMSettingsManager, imsettings_manager, IMSETTINGS_TYPE_OBSERVER); - -@@ -251,17 +253,39 @@ - return (*error == NULL); - } - -+static pid_t -+_get_pid(const gchar *pidfile, -+ const gchar *type, -+ GError **error) -+{ -+ pid_t pid; -+ gchar *contents = NULL; -+ gsize len = 0; -+ -+ if (!g_file_get_contents(pidfile, &contents, &len, error)) -+ return 0; -+ -+ if ((pid = atoi(contents)) == 0) { -+ /* maybe invalid pidfile. */ -+ g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_UNABLE_TO_TRACK_IM, -+ _("Couldn't determine the pid for %s process."), -+ type); -+ } -+ g_free(contents); -+ -+ return pid; -+} -+ - static gboolean - _stop_process(const gchar *pidfile, - const gchar *type, - GError **error) - { -- gchar *contents = NULL; -- gsize len = 0; - pid_t pid; - gboolean retval = FALSE; - -- if (!g_file_get_contents(pidfile, &contents, &len, error)) { -+ pid = _get_pid(pidfile, type, 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 -@@ -270,19 +294,8 @@ - g_error_free(*error); - *error = NULL; - retval = TRUE; -- } else { -- /* Otherwise that shouldn't be happened. -- */ -- g_return_val_if_reached(FALSE); - } - } else { -- if ((pid = atoi(contents)) == 0) { -- /* maybe invalid pidfile. */ -- g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_UNABLE_TO_TRACK_IM, -- _("Couldn't determine the pid for %s process."), -- type); -- goto end; -- } - if (kill(-pid, SIGTERM) == -1) { - g_set_error(error, IMSETTINGS_GERROR, IMSETTINGS_GERROR_UNABLE_TO_TRACK_IM, - _("Couldn't send a signal to the %s process successfully."), -@@ -292,8 +305,6 @@ - retval = TRUE; - } - } -- end: -- g_free(contents); - - return retval; - } -@@ -633,6 +644,7 @@ - IMSettingsRequest *req; - DBusConnection *conn; - gchar *module, *xinputfile = NULL, *pidfile = NULL; -+ pid_t pid; - - conn = dbus_bus_get(DBUS_BUS_SESSION, NULL); - req = imsettings_request_new(conn, IMSETTINGS_INFO_INTERFACE_DBUS); -@@ -646,9 +658,15 @@ - goto end; - } - pidfile = _build_pidfilename(xinputfile, priv->display_name, "xim"); -- if (!g_file_test(pidfile, G_FILE_TEST_EXISTS)) { -+ pid = _get_pid(pidfile, "xim", error); -+ if (pid == 0) { - g_free(module); - module = NULL; -+ } else { -+ if (kill(pid, 0) == -1) { -+ g_free(module); -+ module = NULL; -+ } - } - } - end: diff --git a/im-chooser-constraint-of-language.patch b/im-chooser-constraint-of-language.patch deleted file mode 100644 index bc48edd..0000000 --- a/im-chooser-constraint-of-language.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ruN im-chooser-0.4.0.orig/data/xinput.sh.in.in im-chooser-0.4.0/data/xinput.sh.in.in ---- im-chooser-0.4.0.orig/data/xinput.sh.in.in 2007-07-25 23:06:26.000000000 +0900 -+++ im-chooser-0.4.0/data/xinput.sh.in.in 2007-07-25 23:27:56.000000000 +0900 -@@ -35,7 +35,14 @@ - if [ -r "$USER_XINPUTRC" -a "x$IM_CHOOSER_DISABLE_USER_XINPUTRC" = "xno" ]; then - source "$USER_XINPUTRC" - elif [ -r "$SYS_XINPUTRC" ]; then -- source "$SYS_XINPUTRC" -+ # FIXME: This hardcoded list has to be gone in the future. -+ _language_list="as bn gu hi ja kn ko ml mr ne or pa si ta te th ur vi zh" -+ for i in $_language_list; do -+ if echo $tmplang | grep -q -E "^$i"; then -+ source "$SYS_XINPUTRC" -+ break -+ fi -+ done - fi - - [ -z "$XIM" ] && XIM=none diff --git a/im-chooser-fix-window-border.patch b/im-chooser-fix-window-border.patch deleted file mode 100644 index 79ab81a..0000000 --- a/im-chooser-fix-window-border.patch +++ /dev/null @@ -1,14 +0,0 @@ -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); diff --git a/im-chooser.spec b/im-chooser.spec index 2c07183..d31464f 100644 --- a/im-chooser.spec +++ b/im-chooser.spec @@ -1,86 +1,29 @@ Name: im-chooser -Version: 0.99.6 -Release: 5%{?dist} +Version: 1.2.0 +Release: 1%{?dist} License: GPLv2+ URL: http://fedorahosted.org/im-chooser/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel intltool gettext libgnomeui-devel dbus-devel dbus-glib-devel gamin-devel xfce-mcs-manager-devel libxfce4mcs-devel -BuildRequires: desktop-file-utils libtool - -Source0: http://fedorahosted.org/releases/i/m/%{name}/%{name}-%{version}.tar.gz -Patch0: im-chooser-constraint-of-language.patch -Patch1: im-chooser-0.99.6-check-if-im-is-running.patch -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 +BuildRequires: gtk2-devel libgnomeui-devel desktop-file-utils intltool gettext +BuildRequires: imsettings-devel >= 0.101.1-2 + +Source0: http://fedorahosted.org/releases/i/m/%{name}/%{name}-%{version}.tar.bz2 Summary: Desktop Input Method configuration tool Group: Applications/System -Requires(post): %{_sbindir}/alternatives -Requires(postun): %{_sbindir}/alternatives -Requires: imsettings = %{version}-%{release} Obsoletes: system-switch-im +Requires: imsettings >= 0.101.0 %description im-chooser is a GUI configuration tool to choose the Input Method to be used or disable Input Method usage on the desktop. -%package -n imsettings -Summary: Input Method settings framework -Group: Applications/System -Requires: xorg-x11-xinit >= 1.0.2-22.fc8 -Requires: imsettings-libs = %{version}-%{release} -Requires(post): /bin/dbus-send -Requires(postun): /bin/dbus-send - -%description -n imsettings -imsettings is a framework to deal with IM configuration through D-Bus. - -%package -n imsettings-xfce -Summary: Xfce support on imsettings -Group: Applications/System -Requires: imsettings-libs = %{version}-%{release} - -%description -n imsettings-xfce -imsettings is a framework to deal with IM configuration through D-Bus. -This package contains a plugin to get this working on Xfce. - -%package -n imsettings-libs -Summary: Libraries for imsettings -Group: Development/Libraries - -%description -n imsettings-libs -imsettings is a framework to deal with IM configuration through D-Bus. -This package contains a library for imsettings. - -%package -n imsettings-devel -Summary: Development files for imsettings -Group: Development/Libraries -Requires: imsettings-libs = %{version}-%{release} - -%description -n imsettings-devel -imsettings is a framework to deal with IM configuration through D-Bus. -This package contains the development files to make any applications with imsettings. %prep %setup -q -%patch0 -p1 -b .language -%patch1 -p0 -b .is_running -%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 -%configure --with-xinput-suffix=.conf \ - --with-xinputsh=50-xinput.sh \ - --disable-static +%configure make %{?_smp_mflags} %install @@ -94,33 +37,11 @@ desktop-file-install --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/im-chooser.desktop -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.la -rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/qt-im-settings-daemon.service -rm -f $RPM_BUILD_ROOT%{_libexecdir}/qt-im-settings-daemon - %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%post -n imsettings -alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf 10 -alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf 30 -dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || : -imsettings-reload -f > /dev/null 2>&1 || : - -%postun -n imsettings -if [ "$1" = 0 ]; then - alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf - alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf - dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || : -fi -imsettings-reload -f > /dev/null 2>&1 || : - -%post -n imsettings-libs -p /sbin/ldconfig - -%postun -n imsettings-libs -p /sbin/ldconfig %files -f %{name}.lang %defattr (-, root, root) @@ -129,36 +50,18 @@ imsettings-reload -f > /dev/null 2>&1 || : %{_datadir}/applications/fedora-im-chooser.desktop %{_datadir}/pixmaps/im-chooser.png -%files -n imsettings -%defattr (-, root, root, -) -%doc AUTHORS COPYING imsettings/ChangeLog README -%{_bindir}/imsettings-* -%{_libexecdir}/gconf-im-settings-daemon -%{_libexecdir}/im-info-daemon -%{_libexecdir}/im-settings-daemon -%{_libexecdir}/xinputinfo.sh -%{_datadir}/dbus-1/services/*.service -%{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh -%{_sysconfdir}/X11/xinit/xinput.d - -%files -n imsettings-xfce -%defattr (-, root, root, -) -%doc AUTHORS COPYING imsettings/ChangeLog README -%{_libdir}/xfce4/mcs-plugins/imsettings_plugin.so - -%files -n imsettings-libs -%defattr (-, root, root, -) -%doc AUTHORS COPYING imsettings/ChangeLog README -%{_libdir}/libimsettings.so.* - -%files -n imsettings-devel -%defattr (-, root, root, -) -%doc AUTHORS COPYING imsettings/ChangeLog README -%{_includedir}/imsettings -%{_libdir}/libimsettings.so -%{_libdir}/pkgconfig/imsettings.pc %changelog +* Tue Jul 8 2008 Akira TAGOH - 1.2.0-1 +- New upstream release. + +* Fri Jun 27 2008 Akira TAGOH - 1.1.1-1 +- New upstream release. + - Fix a segfault when no Input Method installed. (#452997) + +* Thu Jun 12 2008 Akira TAGOH - 1.1.0-1 +- New upstream release. + * Mon May 26 2008 Akira TAGOH - 0.99.6-5 - Fix a typo in the package group of imsettings-xfce. (#448037) diff --git a/imsettings-ignore-error-on-check-running.patch b/imsettings-ignore-error-on-check-running.patch deleted file mode 100644 index 346785b..0000000 --- a/imsettings-ignore-error-on-check-running.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 { diff --git a/sources b/sources index ea1cb8a..3be0ac0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22efbfcf3651e91af5535c334d73ba76 im-chooser-0.99.6.tar.gz +9d0b83ff217e5a2795d844b46e27fced im-chooser-1.2.0.tar.bz2