rpms/im-chooser/F-11 im-chooser-disable-status-icon.patch, NONE, 1.1 im-chooser.spec, 1.56, 1.57

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22007

Modified Files:
	im-chooser.spec 
Added Files:
	im-chooser-disable-status-icon.patch 
Log Message:
* Mon May 25 2009 Akira TAGOH <tagoh at redhat.com> - 1.2.6-3
- Disable the status icon check box.

im-chooser-disable-status-icon.patch:

--- NEW FILE im-chooser-disable-status-icon.patch ---
diff -pruN im-chooser-1.2.6.orig/src/im-chooser-simple.c im-chooser-1.2.6/src/im-chooser-simple.c
--- im-chooser-1.2.6.orig/src/im-chooser-simple.c	2009-02-23 23:15:32.000000000 +0900
+++ im-chooser-1.2.6/src/im-chooser-simple.c	2009-05-25 21:11:40.000000000 +0900
@@ -1024,17 +1024,21 @@ im_chooser_simple_get_widget(IMChooserSi
 		gtk_alignment_set_padding(GTK_ALIGNMENT (align_im), 6, 0, 18, 6);
 		gtk_container_add(GTK_CONTAINER (frame), align_im);
 
+#if 0
 		align_applet = gtk_alignment_new(0, 0, 0, 0);
 		im->checkbox_is_applet_shown = checkbox = gtk_check_button_new_with_mnemonic(_("Show the status icon"));
 		gtk_container_add(GTK_CONTAINER(align_applet), checkbox);
 		gtk_alignment_set_padding(GTK_ALIGNMENT (align_applet), 0, 6, 6, 6);
 		g_signal_connect(checkbox, "toggled",
 				 G_CALLBACK (im_chooser_simple_show_status_icon_on_toggled), im);
+#endif
 
 		gtk_container_set_border_width(GTK_CONTAINER (vbox), 0);
 		gtk_box_pack_start(GTK_BOX (vbox), align_im_enabled, FALSE, TRUE, 0);
 		gtk_box_pack_start(GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+#if 0
 		gtk_box_pack_start(GTK_BOX (vbox), align_applet, FALSE, TRUE, 0);
+#endif
 
 		im->widget = vbox;
 	}
@@ -1044,6 +1048,7 @@ im_chooser_simple_get_widget(IMChooserSi
 	gtk_widget_set_sensitive(im->widget_scrolled, FALSE);
 	gtk_widget_set_sensitive(im->button_im_config, FALSE);
 
+#if 0
 	client = gconf_client_get_default();
 	val = gconf_client_get(client, "/apps/imsettings-applet/show_icon", NULL);
 	if (val && gconf_value_get_bool(val))
@@ -1052,6 +1057,7 @@ im_chooser_simple_get_widget(IMChooserSi
 	else
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (im->checkbox_is_applet_shown),
 					     FALSE);
+#endif
 
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (im->checkbox_is_im_enabled),
 				     FALSE);


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/F-11/im-chooser.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- im-chooser.spec	26 Feb 2009 01:45:20 -0000	1.56
+++ im-chooser.spec	25 May 2009 12:16:18 -0000	1.57
@@ -1,6 +1,6 @@
 Name:		im-chooser
 Version:	1.2.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 URL:		http://fedorahosted.org/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -8,6 +8,7 @@ BuildRequires:	gtk2-devel libgnomeui-dev
 BuildRequires:	imsettings-devel >= 0.106.0
 
 Source0:	http://fedorahosted.org/releases/i/m/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		im-chooser-disable-status-icon.patch
 
 Summary:	Desktop Input Method configuration tool
 Group:		Applications/System
@@ -21,6 +22,7 @@ to be used or disable Input Method usage
 
 %prep
 %setup -q
+%patch0 -p1 -b .0-status-icon
 
 %build
 %configure
@@ -56,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 25 2009 Akira TAGOH <tagoh at redhat.com> - 1.2.6-3
+- Disable the status icon check box.
+
 * Thu Feb 26 2009 Akira TAGOH <tagoh at redhat.com> - 1.2.6-2
 - Fix a typo in xfce4-im-chooser.desktop. (#487275)