You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
67 lines
4.1 KiB
67 lines
4.1 KiB
7 years ago
|
From 6e109a641be45bc75b6d73f6a318bfdf294c2fbf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Trent Lloyd <trent@lloyd.id.au>
|
||
|
|
Date: Thu, 16 Jan 2014 11:14:10 +0800
|
||
|
|
Subject: [PATCH] avahi-ui: Replace usage of deprecated GTK Stock Items API
|
||
|
|
|
||
|
|
Converted to recommended label text or icon name from
|
||
|
|
https://docs.google.com/spreadsheet/pub?key=0AsPAM3pPwxagdGF4THNMMUpjUW5xMXZfdUNzMXhEa2c
|
||
|
|
---
|
||
|
|
avahi-ui/avahi-ui.c | 6 +++---
|
||
|
|
avahi-ui/bssh.c | 6 +++---
|
||
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/avahi-ui/avahi-ui.c b/avahi-ui/avahi-ui.c
|
||
|
|
index 92d765a..3845066 100644
|
||
|
|
--- a/avahi-ui/avahi-ui.c
|
||
|
|
+++ b/avahi-ui/avahi-ui.c
|
||
|
|
@@ -1032,8 +1032,8 @@ static void domain_button_clicked(GtkButton *button G_GNUC_UNUSED, gpointer user
|
||
|
|
gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(p->domain_progress_bar), 0.1);
|
||
|
|
gtk_box_pack_end(GTK_BOX(vbox2), p->domain_progress_bar, FALSE, FALSE, 0);
|
||
|
|
|
||
|
|
- gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
|
||
|
|
- p->domain_ok_button = GTK_WIDGET(gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT));
|
||
|
|
+ gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
|
||
|
|
+ p->domain_ok_button = GTK_WIDGET(gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), _("_OK"), GTK_RESPONSE_ACCEPT));
|
||
|
|
gtk_dialog_set_default_response(GTK_DIALOG(p->domain_dialog), GTK_RESPONSE_ACCEPT);
|
||
|
|
gtk_widget_set_sensitive(p->domain_ok_button, is_valid_domain_suffix(gtk_entry_get_text(GTK_ENTRY(p->domain_entry))));
|
||
|
|
|
||
|
|
@@ -1164,7 +1164,7 @@ static void aui_service_dialog_init(AuiServiceDialog *d) {
|
||
|
|
gtk_box_pack_end(GTK_BOX(vbox2), p->service_progress_bar, FALSE, FALSE, 0);
|
||
|
|
|
||
|
|
p->domain_button = gtk_button_new_with_mnemonic(_("_Domain..."));
|
||
|
|
- gtk_button_set_image(GTK_BUTTON(p->domain_button), gtk_image_new_from_stock(GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON));
|
||
|
|
+ gtk_button_set_image(GTK_BUTTON(p->domain_button), gtk_image_new_from_icon_name("network-workgroup", GTK_ICON_SIZE_BUTTON));
|
||
|
|
g_signal_connect(p->domain_button, "clicked", G_CALLBACK(domain_button_clicked), d);
|
||
|
|
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(d))), p->domain_button, FALSE, TRUE, 0);
|
||
|
|
gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(gtk_dialog_get_action_area(GTK_DIALOG(d))), p->domain_button, TRUE);
|
||
|
|
diff --git a/avahi-ui/bssh.c b/avahi-ui/bssh.c
|
||
|
|
index 491380f..ebe8b82 100644
|
||
|
|
--- a/avahi-ui/bssh.c
|
||
|
|
+++ b/avahi-ui/bssh.c
|
||
|
|
@@ -146,19 +146,19 @@ int main(int argc, char*argv[]) {
|
||
|
|
break;
|
||
|
|
|
||
|
|
case COMMAND_SHELL:
|
||
|
|
- d = aui_service_dialog_new(_("Choose Shell Server"), NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
|
||
|
|
+ d = aui_service_dialog_new(_("Choose Shell Server"), NULL, _("_Cancel"), GTK_RESPONSE_CANCEL, _("C_onnect"), GTK_RESPONSE_ACCEPT, NULL);
|
||
|
|
aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_rfb._tcp", "_ssh._tcp", NULL);
|
||
|
|
aui_service_dialog_set_service_type_name(AUI_SERVICE_DIALOG(d), "_rfb._tcp", _("Desktop"));
|
||
|
|
aui_service_dialog_set_service_type_name(AUI_SERVICE_DIALOG(d), "_ssh._tcp", _("Terminal"));
|
||
|
|
break;
|
||
|
|
|
||
|
|
case COMMAND_VNC:
|
||
|
|
- d = aui_service_dialog_new(_("Choose VNC server"), NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
|
||
|
|
+ d = aui_service_dialog_new(_("Choose VNC server"), NULL, _("_Cancel"), GTK_RESPONSE_CANCEL, _("C_onnect"), GTK_RESPONSE_ACCEPT, NULL);
|
||
|
|
aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_rfb._tcp", NULL);
|
||
|
|
break;
|
||
|
|
|
||
|
|
case COMMAND_SSH:
|
||
|
|
- d = aui_service_dialog_new(_("Choose SSH server"), NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
|
||
|
|
+ d = aui_service_dialog_new(_("Choose SSH server"), NULL, _("_Cancel"), GTK_RESPONSE_CANCEL, _("C_onnect"), GTK_RESPONSE_ACCEPT, NULL);
|
||
|
|
aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_ssh._tcp", NULL);
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|