diff options
Diffstat (limited to 'trashapplet')
| -rw-r--r-- | trashapplet/src/trashapplet.c | 22 | ||||
| -rw-r--r-- | trashapplet/src/xstuff.c | 9 |
2 files changed, 0 insertions, 31 deletions
diff --git a/trashapplet/src/trashapplet.c b/trashapplet/src/trashapplet.c index 942cf67e..c2036cf0 100644 --- a/trashapplet/src/trashapplet.c +++ b/trashapplet/src/trashapplet.c @@ -368,17 +368,10 @@ trash_applet_open_folder (GtkAction *action, { GError *err = NULL; -#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (NULL, "trash:", gtk_get_current_event_time (), &err); -#else - gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)), - "trash:", - gtk_get_current_event_time (), - &err); -#endif if (err) { @@ -395,17 +388,10 @@ trash_applet_show_help (GtkAction *action, GError *err = NULL; /* FIXME - Actually, we need a user guide */ -#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (NULL, "help:mate-trashapplet", gtk_get_current_event_time (), &err); -#else - gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)), - "help:mate-trashapplet", - gtk_get_current_event_time (), - &err); -#endif if (err) { @@ -513,11 +499,7 @@ confirm_delete_immediately (GtkWidget *parent_view, gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -#endif gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); gtk_widget_show (label); g_free (str); @@ -525,11 +507,7 @@ confirm_delete_immediately (GtkWidget *parent_view, label = gtk_label_new (detail); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -#endif gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); gtk_widget_show (label); g_free (detail); diff --git a/trashapplet/src/xstuff.c b/trashapplet/src/xstuff.c index 5255bf0d..b7432a09 100644 --- a/trashapplet/src/xstuff.c +++ b/trashapplet/src/xstuff.c @@ -153,11 +153,7 @@ xstuff_zoom_animate (GtkWidget *widget, GdkRectangle *opt_rect) GdkScreen *gscreen; GdkRectangle rect, dest; GtkAllocation allocation; -#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor; -#else - int monitor; -#endif if (opt_rect) rect = *opt_rect; @@ -173,14 +169,9 @@ xstuff_zoom_animate (GtkWidget *widget, GdkRectangle *opt_rect) } gscreen = gtk_widget_get_screen (widget); -#if GTK_CHECK_VERSION (3, 22, 0) monitor = gdk_display_get_monitor_at_window (gdk_screen_get_display (gscreen), gtk_widget_get_window (widget)); gdk_monitor_get_geometry (monitor, &dest); -#else - monitor = gdk_screen_get_monitor_at_window (gscreen, gtk_widget_get_window (widget)); - gdk_screen_get_monitor_geometry (gscreen, monitor, &dest); -#endif draw_zoom_animation (gscreen, rect.x, rect.y, rect.width, rect.height, |