commit 40b77f3a2583d3d17c4e0fc4d234fcb5a9a52431
parent 8223fed3fe153c27acafe113e85019f962e2008d
Author: Paweł Pękala <c0rn@gazeta.pl>
Date: Sat, 11 Sep 2010 07:28:42 +0000
2010-09-11 [pawel] 3.7.6cvs33
* src/mainwindow.c
* src/summaryview.c
* src/toolbar.c
gtk_widget_set_can_focus() -> GTK_WIDGET_UNSET_FLAGS()
fixes build with GTK+ < 2.18
Diffstat:
6 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-11 [pawel] 3.7.6cvs33
+
+ * src/mainwindow.c
+ * src/summaryview.c
+ * src/toolbar.c
+ gtk_widget_set_can_focus() -> GTK_WIDGET_UNSET_FLAGS()
+ fixes build with GTK+ < 2.18
+
2010-09-10 [pawel] 3.7.6cvs32
* src/mainwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4028,3 +4028,4 @@
( cvs diff -u -r 1.115.2.228 -r 1.115.2.229 src/main.c; ) > 3.7.6cvs30.patchset
( cvs diff -u -r 1.49.2.132 -r 1.49.2.133 src/procmime.c; cvs diff -u -r 1.100.2.74 -r 1.100.2.75 AUTHORS; cvs diff -u -r 1.1.2.67 -r 1.1.2.68 src/gtk/authors.h; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/common/base64.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/base64.h; ) > 3.7.6cvs31.patchset
( cvs diff -u -r 1.274.2.313 -r 1.274.2.314 src/mainwindow.c; cvs diff -u -r 1.395.2.420 -r 1.395.2.421 src/summaryview.c; cvs diff -u -r 1.43.2.117 -r 1.43.2.118 src/toolbar.c; ) > 3.7.6cvs32.patchset
+( cvs diff -u -r 1.274.2.314 -r 1.274.2.315 src/mainwindow.c; cvs diff -u -r 1.395.2.421 -r 1.395.2.422 src/summaryview.c; cvs diff -u -r 1.43.2.118 -r 1.43.2.119 src/toolbar.c; ) > 3.7.6cvs33.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=6
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -2035,7 +2035,7 @@ MainWindow *main_window_create()
online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_ONLINE);
offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_OFFLINE);
online_switch = gtk_button_new ();
- gtk_widget_set_can_focus(online_switch, FALSE);
+ GTK_WIDGET_UNSET_FLAGS(online_switch, GTK_CAN_FOCUS);
CLAWS_SET_TIP(online_switch,
_("You are online. Click the icon to go offline"));
offline_switch = gtk_button_new ();
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -539,7 +539,7 @@ SummaryView *summary_create(MainWindow *mainwin)
toggle_search = gtk_toggle_button_new();
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_search),
prefs_common.show_searchbar);
- gtk_widget_set_can_focus(toggle_search, FALSE);
+ GTK_WIDGET_UNSET_FLAGS(toggle_search, GTK_CAN_FOCUS);
gtk_widget_show(toggle_search);
CLAWS_SET_TIP(toggle_search, _("Toggle quick search bar"));
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -1737,7 +1737,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)); \
- gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
+ GTK_WIDGET_UNSET_FLAGS(gtk_bin_get_child(GTK_BIN(item)), GTK_CAN_FOCUS); \
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); \
@@ -1761,9 +1761,9 @@ static void toolbar_buttons_cb(GtkWidget *widget,
gchild = gtk_container_get_children( \
GTK_CONTAINER(child)); \
btn = (GtkWidget *)gchild->data; \
- gtk_widget_set_can_focus(btn, FALSE); \
+ GTK_WIDGET_UNSET_FLAGS(btn, GTK_CAN_FOCUS); \
arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL); \
- gtk_widget_set_can_focus(arr, FALSE); \
+ GTK_WIDGET_UNSET_FLAGS(arr, GTK_CAN_FOCUS); \
g_list_free(gchild); \
gchild = gtk_container_get_children(GTK_CONTAINER(arr)); \
gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1); \
@@ -1772,7 +1772,7 @@ static void toolbar_buttons_cb(GtkWidget *widget,
#else
#define TOOLBAR_ITEM(item,icon,text,tooltip) { \
item = GTK_WIDGET(gtk_tool_button_new(icon, text)); \
- gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \
+ GTK_WIDGET_UNSET_FLAGS(gtk_bin_get_child(GTK_BIN(item)), GTK_CAN_FOCUS); \
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); \
@@ -1791,9 +1791,9 @@ static void toolbar_buttons_cb(GtkWidget *widget,
gchild = gtk_container_get_children( \
GTK_CONTAINER(child)); \
btn = (GtkWidget *)gchild->data; \
- gtk_widget_set_can_focus(btn, FALSE); \
+ GTK_WIDGET_UNSET_FLAGS(btn, GTK_CAN_FOCUS); \
arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL); \
- gtk_widget_set_can_focus(arr, FALSE); \
+ GTK_WIDGET_UNSET_FLAGS(arr, GTK_CAN_FOCUS); \
g_list_free(gchild); \
gchild = gtk_container_get_children(GTK_CONTAINER(arr)); \
gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1); \
