remove all gtk3 conditionals

[claws.git] / src / gtk / menu.c

diff --git a/src/gtk/menu.c b/src/gtk/menu.c
index 87abbad05a1c28ecddc472ac2461c100df99c5c7..050b109c4561012f5fc1e9e52fb72ed00d5edce9 100644 (file)
--- a/src/gtk/menu.c
+++ b/src/gtk/menu.c
@@ -26,9 +26,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#if !GTK_CHECK_VERSION(3, 0, 0)
 #include "gtkcmoptionmenu.h"
-#endif
 #include "menu.h"
 #include "utils.h"
 #include "gtkutils.h"
@@ -134,9 +132,11 @@ GtkWidget *cm_menu_item_new_label_from_url(gchar *url)
                url[64] = '\0', url[63] = url[62] = url[61] = '.', url[60] = ' ';
                GtkWidget *newlabel = gtk_menu_item_new_with_label(url);
                gtk_widget_set_tooltip_markup(GTK_WIDGET(newlabel),
-                       _("<span><b>Warning:</b> This URL was too long for displaying and\n"
+                       g_strconcat("<span><b>", _("Warning:"), "</b>",
+                       _("This URL was too long for displaying and\n"
                        "has been truncated for safety. This message could be\n"
-                       "corrupted, malformed or part of some DoS attempt.</span>"));
+                       "corrupted, malformed or part of some DoS attempt."),
+                       "</span>", NULL));
                return newlabel;
        }
        
@@ -209,7 +209,6 @@ void menu_button_position(GtkMenu *menu, gint *x, gint *y, gboolean *push_in,
                *y -= mreq.height;
 }
 
-#if !GTK_CHECK_VERSION(3, 0, 0)
 gint menu_find_option_menu_index(GtkCMOptionMenu *optmenu, gpointer data,
                                 GCompareFunc func)
 {
@@ -243,4 +242,3 @@ gint menu_find_option_menu_index(GtkCMOptionMenu *optmenu, gpointer data,
 
        return found;
 }
-#endif