mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

70 lines
2.1 KiB

  1. --- ./src/acme.c.orig 2004-12-04 23:42:11.283583688 +0100
  2. +++ ./src/acme.c 2004-12-04 23:44:15.366720184 +0100
  3. @@ -51,6 +51,10 @@
  4. guint dialog_timeout;
  5. WnckScreen *screen;
  6. + /* The Event */
  7. + GdkEvent *event;
  8. + GdkXEvent *xevent;
  9. +
  10. /* Multihead stuff */
  11. GdkDisplay *display;
  12. GdkScreen *current_screen;
  13. @@ -801,8 +805,14 @@
  14. }
  15. }
  16. + /* Since libwnck 2.6.2.1 you need to give a timestamp */
  17. if (focused != NULL)
  18. - wnck_window_close (focused);
  19. + {
  20. + if (acme->event)
  21. + wnck_window_close (focused, acme->event->key.time);
  22. + else
  23. + wnck_window_close (focused, GDK_CURRENT_TIME);
  24. + }
  25. }
  26. static void
  27. @@ -1171,6 +1181,10 @@
  28. GList *l;
  29. int i;
  30. + /* Store the event */
  31. + acme->event = event;
  32. + acme->xevent = xevent;
  33. +
  34. /* Look for which screen we're receiving events */
  35. for (l = acme->screens; (l != NULL) && (event_screen == NULL);
  36. l = l->next)
  37. --- ./src/eggcellrendererkeys.c.orig 2003-07-18 01:12:02.000000000 +0200
  38. +++ ./src/eggcellrendererkeys.c 2004-12-04 23:47:04.379026408 +0100
  39. @@ -581,10 +581,9 @@
  40. return GTK_CELL_EDITABLE (keys->edit_widget);
  41. }
  42. -void
  43. -egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
  44. - guint keyval,
  45. - GdkModifierType mask)
  46. +void egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
  47. + guint keyval,
  48. + EggVirtualModifierType mask)
  49. {
  50. char *text;
  51. gboolean changed;
  52. @@ -623,10 +622,9 @@
  53. }
  54. -void
  55. -egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
  56. - guint *keyval,
  57. - GdkModifierType *mask)
  58. +void egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
  59. + guint *keyval,
  60. + EggVirtualModifierType *mask)
  61. {
  62. g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));