diff options
| author | monsta <[email protected]> | 2016-11-21 21:14:26 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-11-21 21:14:26 +0300 |
| commit | d0ddaedffa7d417a699cafce73c1e418515c4a28 (patch) | |
| tree | 645b7a86e32b21113e1ce14f563bfb8d8900fa53 /applets/notification_area/testtray.c | |
| parent | 7dfeb78328039cf92a9f45d64c9b3662d967a1fe (diff) | |
| download | mate-panel-d0ddaedffa7d417a699cafce73c1e418515c4a28.tar.bz2 mate-panel-d0ddaedffa7d417a699cafce73c1e418515c4a28.tar.xz | |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require libmate-desktop >= 1.17
WARNING: use GTK+3 build of libmateweather for this build.
that lib is not migrated to GTK+3 only as we will possibly
use libgweather instead of it.
Diffstat (limited to 'applets/notification_area/testtray.c')
| -rw-r--r-- | applets/notification_area/testtray.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/applets/notification_area/testtray.c b/applets/notification_area/testtray.c index 0cb38e92..f3724025 100644 --- a/applets/notification_area/testtray.c +++ b/applets/notification_area/testtray.c @@ -150,22 +150,14 @@ create_tray_on_screen (GdkScreen *screen, data->window = window = gtk_window_new (GTK_WINDOW_TOPLEVEL); g_object_weak_ref (G_OBJECT (window), (GWeakNotify) maybe_quit, NULL); -#if GTK_CHECK_VERSION (3, 0, 0) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); -#else - vbox = gtk_vbox_new (FALSE, 6); -#endif gtk_container_add (GTK_CONTAINER (window), vbox); button = gtk_button_new_with_mnemonic ("_Add another tray"); g_signal_connect (button, "clicked", G_CALLBACK (add_tray_cb), data); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); -#if GTK_CHECK_VERSION (3, 0, 0) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); -#else - hbox = gtk_hbox_new (FALSE, 12); -#endif gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic ("_Orientation:"); #if GTK_CHECK_VERSION (3, 16, 0) @@ -218,28 +210,15 @@ main (int argc, char *argv[]) { GdkDisplay *display; GdkScreen *screen; -#if !GTK_CHECK_VERSION (3, 0, 0) - int n_screens, i; -#endif gtk_init (&argc, &argv); gtk_window_set_default_icon_name (NOTIFICATION_AREA_ICON); display = gdk_display_get_default (); -#if GTK_CHECK_VERSION (3, 0, 0) screen = gdk_display_get_default_screen (display); create_tray_on_screen (screen, FALSE); -#else - n_screens = gdk_display_get_n_screens (display); - for (i = 0; i < n_screens; ++i) { - screen = gdk_display_get_screen (display, i); - create_tray_on_screen (screen, FALSE); - - create_tray_on_screen (screen, FALSE); - } -#endif gtk_main (); |