rpms/scim-skk/FC-3 scim-skk-broken-iter.diff, NONE, 1.1 scim-skk-gtkComboBox.patch, NONE, 1.1 gtkComboBox.patch, 1.1, NONE

[Ryo Dairiki (ryo)]

Author: ryo

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

Added Files:
	scim-skk-broken-iter.diff scim-skk-gtkComboBox.patch 
Removed Files:
	gtkComboBox.patch 
Log Message:
Update patch files.


scim-skk-broken-iter.diff:

--- NEW FILE scim-skk-broken-iter.diff ---
--- src/scim_skk_dictionary.cpp.orig	2006-04-29 13:24:36.000000000 +0900
+++ src/scim_skk_dictionary.cpp	2006-04-29 13:25:16.000000000 +0900
@@ -544,9 +544,11 @@
 {
     list<CandPair> &cl = m_dictdata[key];
-    for (list<CandPair>::iterator it = cl.begin(); it != cl.end(); it++) {
-        if (it->first == data.first) {
-            cl.erase(it);
-        }
+    for (list<CandPair>::iterator it = cl.begin(); it != cl.end();) {
+        if (it->first == data.first) {
+            it = cl.erase(it);
+        } else {
+            ++it;
+        }
     }
     cl.push_front(data);
     m_writeflag = true;

scim-skk-gtkComboBox.patch:

--- NEW FILE scim-skk-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);


--- gtkComboBox.patch DELETED ---