[gnome-bluetooth] lib: Remove GtkStock usage
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth] lib: Remove GtkStock usage
- Date: Fri, 6 Dec 2013 11:03:36 +0000 (UTC)
commit 3e6d74dbabba0751d7462dd76f4454ae43bf175e
Author: Bastien Nocera <hadess hadess net>
Date: Tue Dec 3 13:11:13 2013 +0100
lib: Remove GtkStock usage
As it is deprecated now.
lib/bluetooth-chooser-button.c | 4 ++--
lib/bluetooth-chooser.c | 2 +-
lib/test-client.c | 2 +-
lib/test-deviceselection.c | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/lib/bluetooth-chooser-button.c b/lib/bluetooth-chooser-button.c
index 1648f9e..ed330a2 100644
--- a/lib/bluetooth-chooser-button.c
+++ b/lib/bluetooth-chooser-button.c
@@ -202,8 +202,8 @@ bluetooth_chooser_button_clicked (GtkButton *widget)
//FIXME title
button->dialog = gtk_dialog_new_with_buttons("", GTK_WINDOW (parent),
GTK_DIALOG_MODAL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+ "_Cancel", GTK_RESPONSE_REJECT,
+ "_OK", GTK_RESPONSE_ACCEPT, NULL);
g_signal_connect (button->dialog, "response",
G_CALLBACK (dialog_response_cb), button);
gtk_dialog_set_response_sensitive (GTK_DIALOG(button->dialog),
diff --git a/lib/bluetooth-chooser.c b/lib/bluetooth-chooser.c
index 38ac622..465d593 100644
--- a/lib/bluetooth-chooser.c
+++ b/lib/bluetooth-chooser.c
@@ -121,7 +121,7 @@ connected_to_icon (GtkTreeViewColumn *column, GtkCellRenderer *cell,
gtk_tree_model_get (model, iter, BLUETOOTH_COLUMN_CONNECTED, &connected, -1);
- g_object_set (cell, "icon-name", connected ? GTK_STOCK_CONNECT : NULL, NULL);
+ g_object_set (cell, "icon-name", connected ? "gtk-connected" : NULL, NULL);
}
static void
diff --git a/lib/test-client.c b/lib/test-client.c
index 402f58e..1489eb4 100644
--- a/lib/test-client.c
+++ b/lib/test-client.c
@@ -165,7 +165,7 @@ static void create_window(void)
gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), FALSE);
gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, TRUE, 0);
- item = gtk_tool_button_new_from_stock(GTK_STOCK_REFRESH);
+ item = gtk_tool_button_new (gtk_image_new_from_icon_name ("gtk-refresh",
GTK_ICON_SIZE_LARGE_TOOLBAR), NULL);
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
g_signal_connect(item, "clicked", G_CALLBACK(scan_callback), NULL);
diff --git a/lib/test-deviceselection.c b/lib/test-deviceselection.c
index 152474d..e4c5806 100644
--- a/lib/test-deviceselection.c
+++ b/lib/test-deviceselection.c
@@ -125,7 +125,7 @@ create_phone_dialogue (const char *bdaddr)
dialog = gtk_dialog_new_with_buttons("My test prefs", NULL,
0,
- GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
+ "_Close", GTK_RESPONSE_ACCEPT, NULL);
button = bluetooth_chooser_button_new ();
if (bdaddr != NULL)
g_object_set (G_OBJECT (button), "device", bdaddr, NULL);
@@ -154,8 +154,8 @@ create_dialogue (const char *title)
dialog = gtk_dialog_new_with_buttons(title, NULL,
0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
+ "_Cancel", GTK_RESPONSE_REJECT,
+ "Connect", GTK_RESPONSE_ACCEPT, NULL);
gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT, FALSE);
gtk_window_set_default_size(GTK_WINDOW(dialog), 480, 400);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]