comparison: pidgin/gtkimhtmltoolbar.c
pidgin/gtkimhtmltoolbar.c
- changeset 18546
- 3515b5b454e9
- parent 18545
- 5af898e91ec2
- child 18547
- cb6e8c0a08ca
equal
deleted
inserted
replaced
| 18545:5af898e91ec2 | 18546:3515b5b454e9 |
|---|---|
| 644 } | 644 } |
| 645 | 645 |
| 646 static gboolean | 646 static gboolean |
| 647 smiley_dialog_input_cb(GtkWidget *dialog, GdkEvent *event, GtkIMHtmlToolbar *toolbar) | 647 smiley_dialog_input_cb(GtkWidget *dialog, GdkEvent *event, GtkIMHtmlToolbar *toolbar) |
| 648 { | 648 { |
| 649 gboolean close_dialog = | 649 if ((event->type == GDK_KEY_PRESS && event->key.keyval == GDK_Escape) || |
| 650 (GDK_KEY_PRESS == event->type) ? (GDK_Escape == event->key.keyval) : | 650 (event->type == GDK_BUTTON_PRESS && event->button.button == 1)) |
| 651 (GDK_BUTTON_PRESS == event->type) ? (1 == event->button.button) : FALSE; | 651 { |
| 652 | |
| 653 if (close_dialog) | |
| 654 close_smiley_dialog(NULL, NULL, toolbar); | 652 close_smiley_dialog(NULL, NULL, toolbar); |
| 655 | 653 return TRUE; |
| 656 return close_dialog; | 654 } |
| 655 | |
| 656 return FALSE; | |
| 657 } | 657 } |
| 658 | 658 |
| 659 static void | 659 static void |
| 660 insert_smiley_cb(GtkWidget *smiley, GtkIMHtmlToolbar *toolbar) | 660 insert_smiley_cb(GtkWidget *smiley, GtkIMHtmlToolbar *toolbar) |
| 661 { | 661 { |
