[uim] r7230 committed - * helper/pref-gtk-custom-widgets.c...

[codesite-noreply]

Revision: 7230
Author:   ek.kato
Date:     Thu Jul 21 21:16:30 2011
Log:      * helper/pref-gtk-custom-widgets.c
* gtk/key-util-gtk.c
  - Merge r7132 from trunk.
http://code.google.com/p/uim/source/detail?r=7230

Modified:
 /branches/1.7/gtk/key-util-gtk.c
 /branches/1.7/helper/pref-gtk-custom-widgets.c

=======================================
--- /branches/1.7/gtk/key-util-gtk.c    Fri Feb 11 20:09:56 2011
+++ /branches/1.7/gtk/key-util-gtk.c    Thu Jul 21 21:16:30 2011
@@ -340,13 +340,11 @@
       if (map->modifiermap[k]) {
        KeySym ks;
        int index = 0;
-       char *nm;
        do {
          ks = XKeycodeToKeysym(display, map->modifiermap[k], index);
          index++;
        } while (!ks && index < keysyms_per_keycode);

-       nm = XKeysymToString(ks);
        switch (i) {
        case ShiftMapIndex:
          break;
=======================================
--- /branches/1.7/helper/pref-gtk-custom-widgets.c      Sat May  7 06:04:26 2011
+++ /branches/1.7/helper/pref-gtk-custom-widgets.c      Thu Jul 21 21:16:30 2011
@@ -1521,7 +1521,6 @@
 choose_key_button_clicked_cb(GtkWidget *widget, GtkEntry *key_entry)
 {
   GtkWidget *dialog;
-  gint rv;

   dialog =  
gtk_message_dialog_new(GTK_WINDOW(gtk_widget_get_toplevel(widget)),
                                  GTK_DIALOG_MODAL,
@@ -1539,7 +1538,7 @@
                    TRUE, GDK_CURRENT_TIME);


-  rv = gtk_dialog_run(GTK_DIALOG(dialog));
+  gtk_dialog_run(GTK_DIALOG(dialog));

   gtk_widget_destroy(dialog);
 }