aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/account_dialog.c11
-rw-r--r--src/prefs_filter.c11
3 files changed, 23 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 87e08060..d33c0193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-09
+
+ * src/account_dialog.c
+ src/prefs_filter.c: fixed duplicated keyboard accelerators.
+
2011-06-08
* libsylph/procmsg.[ch]
diff --git a/src/account_dialog.c b/src/account_dialog.c
index 0e9cb567..49272336 100644
--- a/src/account_dialog.c
+++ b/src/account_dialog.c
@@ -284,6 +284,7 @@ static void account_edit_create(void)
GtkWidget *del_btn;
GtkWidget *up_btn;
GtkWidget *down_btn;
+ GtkWidget *image;
GtkWidget *default_btn;
@@ -417,13 +418,19 @@ static void account_edit_create(void)
g_signal_connect (G_OBJECT(del_btn), "clicked",
G_CALLBACK (account_delete), NULL);
- down_btn = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
+ down_btn = gtk_button_new ();
+ image = gtk_image_new_from_stock (GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image);
+ gtk_button_set_image (GTK_BUTTON(down_btn), image);
gtk_widget_show (down_btn);
gtk_box_pack_end (GTK_BOX (vbox2), down_btn, FALSE, FALSE, 4);
g_signal_connect (G_OBJECT(down_btn), "clicked",
G_CALLBACK (account_down), NULL);
- up_btn = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
+ up_btn = gtk_button_new ();
+ image = gtk_image_new_from_stock (GTK_STOCK_GO_UP, GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image);
+ gtk_button_set_image (GTK_BUTTON(up_btn), image);
gtk_widget_show (up_btn);
gtk_box_pack_end (GTK_BOX (vbox2), up_btn, FALSE, FALSE, 4);
g_signal_connect (G_OBJECT(up_btn), "clicked",
diff --git a/src/prefs_filter.c b/src/prefs_filter.c
index 59a20acb..4185bcbb 100644
--- a/src/prefs_filter.c
+++ b/src/prefs_filter.c
@@ -183,6 +183,7 @@ static void prefs_filter_create(void)
GtkWidget *edit_btn;
GtkWidget *copy_btn;
GtkWidget *del_btn;
+ GtkWidget *image;
debug_print("Creating filter setting window...\n");
@@ -280,13 +281,19 @@ static void prefs_filter_create(void)
PACK_VSPACER(btn_vbox, spc_vbox, VSPACING_NARROW_2);
- up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+ up_btn = gtk_button_new();
+ image = gtk_image_new_from_stock(GTK_STOCK_GO_UP, GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show(image);
+ gtk_button_set_image(GTK_BUTTON(up_btn), image);
gtk_widget_show(up_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(up_btn), "clicked",
G_CALLBACK(prefs_filter_up), NULL);
- down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+ down_btn = gtk_button_new();
+ image = gtk_image_new_from_stock(GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show(image);
+ gtk_button_set_image(GTK_BUTTON(down_btn), image);
gtk_widget_show(down_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(down_btn), "clicked",