rpms/scim-skk/FC-3 gtkComboBox.patch, NONE, 1.1 scim-skk.spec, 1.7, 1.8

[Ryo Dairiki (ryo)]

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13074

Modified Files:
	scim-skk.spec 
Added Files:
	gtkComboBox.patch 
Log Message:
add a patch for gtk-2.4


gtkComboBox.patch:

--- NEW FILE gtkComboBox.patch ---
--- src/scim_skk_setup_dictionaries.cpp.orig	2005-11-11 20:07:42.000000000 +0900
+++ src/scim_skk_setup_dictionaries.cpp	2005-12-03 09:56:11.000000000 +0900
@@ -30,6 +30,8 @@
 
 #include "scim_skk_intl.h"
 
+#define gtk_combo_box_get_active_text n_gtk_combo_box_get_active_text
+
 using namespace scim;
 
 namespace scim_skk {
@@ -91,6 +93,18 @@
 
 static GtkWidget *__combo_box_dict_types = NULL;
 
+// There is no gtk_combo_box_get_active_text for gtk 2.4
+
+static const gchar *gtk_combo_box_get_active_text(GtkComboBox *combo) {
+	gint index = gtk_combo_box_get_active(combo);
+	if (index != -1) {
+		return __dict_type_names[index].data();
+	} else {
+		return NULL;
+	}
+}
+
+//
 
 static void
 file_selection_clicked_cb (GtkButton *button,
@@ -123,7 +137,7 @@
 dict_type_changed_cb (GtkComboBox *combo,
                       gpointer userdata)
 {
-    gchar *typetext = gtk_combo_box_get_active_text(combo);
+    const gchar *typetext = gtk_combo_box_get_active_text(combo);
     for (int i = 0; __dict_type_names[i] != ""; i++) {
         if (__dict_type_names[i] == typetext) {
             gtk_widget_show_all(__widgets_dicts[i].widget);


Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scim-skk.spec	2 Dec 2005 14:57:18 -0000	1.7
+++ scim-skk.spec	3 Dec 2005 01:02:57 -0000	1.8
@@ -7,6 +7,7 @@
 License:	GPL
 URL:		http://scim-imengine.sourceforge.jp/
 Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
+Patch0:	gtkComboBox.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:		scim skkdic
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -52,6 +54,7 @@
 %changelog
 * Fri Dec 2 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.4.0-1
 - update to 0.5.0
+- patch for gtk-2.4; There is no gtk_combo_box_get_active_text for gtk-2.4
 
 * Tue Nov 1 2005 Ryo Diairki <ryo-dairiki at users.sourceforge.net> - 0.4.0-1
 - update to 0.4.0