/x11-libs/gtk+/files/appmenu/072_indicator_menu_update.patch

https://github.com/transtone/zm-overlay · Patch · 110 lines · 104 code · 6 blank · 0 comment · 0 complexity · e7591d53364af79da60f80075998bc74 MD5 · raw file 

    

  1. ## Description: Adding two signals that are needed for Application Indicator to
    2. 

  2. ##              keep up-to-date with changed GtkMenu(Item)s.
    3. 

  3. ## Origin/Author: Cody Russell <bratsche@gnome.org>, 
    4. 

  4. ##                Sense Hofstede <sense@ubuntu.com>
    5. 

  5. ## Bug: unknown and https://launchpad.net/bug/608219
    6. 

  6. Index: gtk+-2.21.7/gtk/gtkcontainer.c
    7. 

  7. ===================================================================
    8. 

  8. --- gtk+-2.21.7.orig/gtk/gtkcontainer.c	2010-08-31 01:09:37.000000000 +1000
    9. 

  9. +++ gtk+-2.21.7/gtk/gtkcontainer.c	2010-09-01 12:22:01.612617000 +1000
    10. 

  10. @@ -48,6 +48,8 @@
    11. 

  11.    REMOVE,
    12. 

  12.    CHECK_RESIZE,
    13. 

  13.    SET_FOCUS_CHILD,
    14. 

  14. +  CHILD_ADDED,
    15. 

  15. +  CHILD_REMOVED,
    16. 

  16.    LAST_SIGNAL
    17. 

  17.  };
    18. 

  18.  
    19. 

  19. @@ -291,6 +293,24 @@
    20. 

  20.  		  _gtk_marshal_VOID__OBJECT,
    21. 

  21.  		  G_TYPE_NONE, 1,
    22. 

  22.  		  GTK_TYPE_WIDGET);
    23. 

  23. +  container_signals[CHILD_ADDED] =
    24. 

  24. +    g_signal_new (I_("child-added"),
    25. 

  25. +                  G_OBJECT_CLASS_TYPE (object_class),
    26. 

  26. +                  G_SIGNAL_RUN_LAST,
    27. 

  27. +                  0,
    28. 

  28. +                  NULL, NULL,
    29. 

  29. +                  _gtk_marshal_VOID__OBJECT,
    30. 

  30. +                  G_TYPE_NONE, 1,
    31. 

  31. +                  GTK_TYPE_WIDGET);
    32. 

  32. +  container_signals[CHILD_REMOVED] =
    33. 

  33. +    g_signal_new (I_("child-removed"),
    34. 

  34. +                  G_OBJECT_CLASS_TYPE (object_class),
    35. 

  35. +                  G_SIGNAL_RUN_LAST,
    36. 

  36. +                  0,
    37. 

  37. +                  NULL, NULL,
    38. 

  38. +                  _gtk_marshal_VOID__OBJECT,
    39. 

  39. +                  G_TYPE_NONE, 1,
    40. 

  40. +                  GTK_TYPE_WIDGET);
    41. 

  41.  }
    42. 

  42.  
    43. 

  43.  static void
    44. 

  44. Index: gtk+-2.21.7/gtk/gtkmenushell.c
    45. 

  45. ===================================================================
    46. 

  46. --- gtk+-2.21.7.orig/gtk/gtkmenushell.c	2010-09-01 12:21:11.762617001 +1000
    47. 

  47. +++ gtk+-2.21.7/gtk/gtkmenushell.c	2010-09-01 12:22:01.612617000 +1000
    48. 

  48. @@ -567,6 +567,8 @@
    49. 

  49.                                GTK_WIDGET (menu_shell),
    50. 

  50.                                child,
    51. 

  51.                                position);
    52. 

  52. +
    53. 

  53. +  g_signal_emit_by_name (menu_shell, "child-added", child);
    54. 

  54.  }
    55. 

  55.  
    56. 

  56.  static void
    57. 

  57. Index: gtk+-2.21.7/gtk/gtkmenuitem.c
    58. 

  58. ===================================================================
    59. 

  59. --- gtk+-2.21.7.orig/gtk/gtkmenuitem.c	2010-09-01 12:21:09.562617001 +1000
    60. 

  60. +++ gtk+-2.21.7/gtk/gtkmenuitem.c	2010-09-01 12:22:01.612617000 +1000
    61. 

  61. @@ -52,6 +52,8 @@
    62. 

  62.    ACTIVATE_ITEM,
    63. 

  63.    TOGGLE_SIZE_REQUEST,
    64. 

  64.    TOGGLE_SIZE_ALLOCATE,
    65. 

  65. +  SUBMENU_ADDED,
    66. 

  66. +  SUBMENU_REMOVED,
    67. 

  67.    LAST_SIGNAL
    68. 

  68.  };
    69. 

  69.  
    70. 

  70. @@ -244,6 +246,25 @@
    71. 

  71.  		  G_TYPE_NONE, 1,
    72. 

  72.  		  G_TYPE_INT);
    73. 

  73.  
    74. 

  74. +  menu_item_signals[SUBMENU_ADDED] =
    75. 

  75. +    g_signal_new (I_("submenu-added"),
    76. 

  76. +		  G_OBJECT_CLASS_TYPE (gobject_class),
    77. 

  77. +		  G_SIGNAL_RUN_FIRST,
    78. 

  78. + 		  0,
    79. 

  79. +		  NULL, NULL,
    80. 

  80. +		  _gtk_marshal_VOID__OBJECT,
    81. 

  81. +		  G_TYPE_NONE, 1,
    82. 

  82. +		  GTK_TYPE_WIDGET);
    83. 

  83. + 
    84. 

  84. + menu_item_signals[SUBMENU_REMOVED] =
    85. 

  85. +    g_signal_new (I_("submenu-removed"),
    86. 

  86. +		  G_OBJECT_CLASS_TYPE (gobject_class),
    87. 

  87. +		  G_SIGNAL_RUN_FIRST,
    88. 

  88. + 		  0,
    89. 

  89. +		  NULL, NULL,
    90. 

  90. +		  _gtk_marshal_VOID__VOID,
    91. 

  91. +		  G_TYPE_NONE, 0);
    92. 

  92. +
    93. 

  93.    /**
    94. 

  94.     * GtkMenuItem:right-justified:
    95. 

  95.     *
    96. 

  96. @@ -791,6 +812,14 @@
    97. 

  97.        if (GTK_WIDGET (menu_item)->parent)
    98. 

  98.  	gtk_widget_queue_resize (GTK_WIDGET (menu_item));
    99. 

  99.  
    100. 

  100. +        if(submenu == NULL)
    101. 

  101. +      {
    102. 

  102. +        g_signal_emit_by_name (menu_item, "submenu-removed");
    103. 

  103. +      }
    104. 

  104. +        else
    105. 

  105. +      {
    106. 

  106. +        g_signal_emit_by_name (menu_item, "submenu-added", GTK_WIDGET(submenu));
    107. 

  107. +      }
    108. 

  108.        g_object_notify (G_OBJECT (menu_item), "submenu");
    109. 

  109.      }
    110. 

  110.  }
    111.