diff options
| author | Vincent Untz <[email protected]> | 2011-01-31 17:30:46 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-07-14 13:08:19 +0200 |
| commit | 7160b2fe0a7299371e1d67edb1765d1f984bacf8 (patch) | |
| tree | a0a2faad4a59c6c6fd9f7caec46dfcb462dc4310 | |
| parent | 59c66fd0169b84fbbccf3dad672589f5d915d4a0 (diff) | |
| download | mate-panel-7160b2fe0a7299371e1d67edb1765d1f984bacf8.tar.bz2 mate-panel-7160b2fe0a7299371e1d67edb1765d1f984bacf8.tar.xz | |
na: Move creating of GtkBox for NaTray
Do it in init() instead of constructor(), for consistency. It shouldn't
matter much, really.
Conflicts:
applets/notification_area/na-tray.c
| -rw-r--r-- | applets/notification_area/na-tray.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/applets/notification_area/na-tray.c b/applets/notification_area/na-tray.c index 356e4d53..2bacc7d2 100644 --- a/applets/notification_area/na-tray.c +++ b/applets/notification_area/na-tray.c @@ -89,27 +89,6 @@ static TraysScreen *trays_screens = NULL; static void icon_tip_show_next (IconTip *icontip); -#if !GTK_CHECK_VERSION (3, 0, 0) -/* NaBox, an instantiable GtkBox */ - -typedef GtkBox NaBox; -typedef GtkBoxClass NaBoxClass; - -static GType na_box_get_type (void); - -G_DEFINE_TYPE (NaBox, na_box, GTK_TYPE_BOX) - -static void -na_box_init (NaBox *box) -{ -} - -static void -na_box_class_init (NaBoxClass *klass) -{ -} -#endif - /* NaTray */ G_DEFINE_TYPE (NaTray, na_tray, GTK_TYPE_BIN) @@ -545,7 +524,7 @@ na_tray_expose_icon (GtkWidget *widget, #endif gpointer data) { - cairo_t *cr = data; + cairo_t *cr = (cairo_t *) data; if (na_tray_child_has_alpha (NA_TRAY_CHILD (widget))) { |