Drop no longer used gtk+2 utility functions

[claws.git] / src / toolbar.c

diff --git a/src/toolbar.c b/src/toolbar.c
index 36263293d7d771f7e3495a1c1bfc98c63dad6ed1..7a56fc869d82086aef249cf7d7a6a76d523c3d4a 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -2103,7 +2103,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
 #ifndef GENERIC_UMPC
 #define TOOLBAR_ITEM(item,icon,text,tooltip) {                                                         \
        item = GTK_WIDGET(gtk_tool_button_new(icon, text));                                             \
-       gtkut_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE);                            \
+       gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE);                              \
        gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                                      \
        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
@@ -2116,7 +2116,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
        item = GTK_WIDGET(gtk_toggle_tool_button_new());                                                \
        gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(item), icon);                                   \
        gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), text);                                         \
-       gtkut_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE);                            \
+       gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE);                              \
        gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                                      \
        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
@@ -2140,9 +2140,9 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
        gchild = gtk_container_get_children(                                                            \
                        GTK_CONTAINER(child));                                                          \
        btn = (GtkWidget *)gchild->data;                                                                \
-       gtkut_widget_set_can_focus(btn, FALSE);                                                         \
+       gtk_widget_set_can_focus(btn, FALSE);                                                           \
        arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL);                                      \
-       gtkut_widget_set_can_focus(arr, FALSE);                                                         \
+       gtk_widget_set_can_focus(arr, FALSE);                                                           \
        g_list_free(gchild);                                                                            \
        gchild = gtk_container_get_children(GTK_CONTAINER(arr));                                        \
        gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1);                                   \
@@ -2153,7 +2153,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
 
 #define TOOLBAR_ITEM(item,icon,text,tooltip) {                                                         \
        item = GTK_WIDGET(gtk_tool_button_new(icon, text));                                             \
-       gtkut_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE);                            \
+       gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE);                              \
        gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                                      \
        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
@@ -2164,7 +2164,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
        item = GTK_WIDGET(gtk_toggle_tool_button_new());                                                \
        gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(item), icon);                                   \
        gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), text);                                         \
-       gtkut_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE);                            \
+       gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE);                              \
        gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                                      \
        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
@@ -2183,9 +2183,9 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
        gchild = gtk_container_get_children(                                                            \
                        GTK_CONTAINER(child));                                                          \
        btn = (GtkWidget *)gchild->data;                                                                \
-       gtkut_widget_set_can_focus(btn, FALSE);                                                         \
+       gtk_widget_set_can_focus(btn, FALSE);                                                           \
        arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL);                                      \
-       gtkut_widget_set_can_focus(arr, FALSE);                                                         \
+       gtk_widget_set_can_focus(arr, FALSE);                                                           \
        g_list_free(gchild);                                                                            \
        gchild = gtk_container_get_children(GTK_CONTAINER(arr));                                        \
        gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1);                                   \