avahi-gtk3.patch

   1 --- avahi-0.6.31/avahi-ui/avahi-ui.c.orig       2011-02-18 19:04:10.251546734 +0100
   2 +++ avahi-0.6.31/avahi-ui/avahi-ui.c    2013-11-22 23:15:26.702181607 +0100
   3 @@ -991,7 +991,11 @@
   4      gtk_dialog_set_has_separator(GTK_DIALOG(p->domain_dialog), FALSE);
   5  #endif
   6
   7 +#if GTK_CHECK_VERSION(3,0,0)
   8 +    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
   9 +#else
  10      vbox = gtk_vbox_new(FALSE, 8);
  11 +#endif
  12      gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
  13      gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(p->domain_dialog))), vbox, TRUE, TRUE, 0);
  14
  15 @@ -1002,7 +1006,11 @@
  16      g_signal_connect(p->domain_entry, "changed", G_CALLBACK(domain_entry_changed_callback), d);
  17      gtk_box_pack_start(GTK_BOX(vbox), p->domain_entry, FALSE, FALSE, 0);
  18
  19 +#if GTK_CHECK_VERSION(3,0,0)
  20 +    vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
  21 +#else
  22      vbox2 = gtk_vbox_new(FALSE, 8);
  23 +#endif
  24      gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
  25
  26      scrolled_window = gtk_scrolled_window_new(NULL, NULL);
  27 @@ -1032,8 +1040,8 @@
  28      gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(p->domain_progress_bar), 0.1);
  29      gtk_box_pack_end(GTK_BOX(vbox2), p->domain_progress_bar, FALSE, FALSE, 0);
  30
  31 -    gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
  32 -    p->domain_ok_button = GTK_WIDGET(gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT));
  33 +    gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
  34 +    p->domain_ok_button = GTK_WIDGET(gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), _("_OK"), GTK_RESPONSE_ACCEPT));
  35      gtk_dialog_set_default_response(GTK_DIALOG(p->domain_dialog), GTK_RESPONSE_ACCEPT);
  36      gtk_widget_set_sensitive(p->domain_ok_button, is_valid_domain_suffix(gtk_entry_get_text(GTK_ENTRY(p->domain_entry))));
  37
  38 @@ -1113,7 +1121,11 @@
  39
  40      gtk_container_set_border_width(GTK_CONTAINER(d), 5);
  41
  42 +#if GTK_CHECK_VERSION(3,0,0)
  43 +    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
  44 +#else
  45      vbox = gtk_vbox_new(FALSE, 8);
  46 +#endif
  47      gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
  48      gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(d))), vbox, TRUE, TRUE, 0);
  49
  50 @@ -1123,7 +1135,11 @@
  51      gtk_box_pack_start(GTK_BOX(vbox), p->domain_label, FALSE, FALSE, 0);
  52
  53
  54 +#if GTK_CHECK_VERSION(3,0,0)
  55 +    vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
  56 +#else
  57      vbox2 = gtk_vbox_new(FALSE, 8);
  58 +#endif
  59      gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
  60
  61      scrolled_window = gtk_scrolled_window_new(NULL, NULL);
  62 @@ -1164,7 +1180,7 @@
  63      gtk_box_pack_end(GTK_BOX(vbox2), p->service_progress_bar, FALSE, FALSE, 0);
  64
  65      p->domain_button = gtk_button_new_with_mnemonic(_("_Domain..."));
  66 -    gtk_button_set_image(GTK_BUTTON(p->domain_button), gtk_image_new_from_stock(GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON));
  67 +    gtk_button_set_image(GTK_BUTTON(p->domain_button), gtk_image_new_from_icon_name("network-workgroup", GTK_ICON_SIZE_BUTTON));
  68      g_signal_connect(p->domain_button, "clicked", G_CALLBACK(domain_button_clicked), d);
  69      gtk_box_pack_start(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(d))), p->domain_button, FALSE, TRUE, 0);
  70      gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(gtk_dialog_get_action_area(GTK_DIALOG(d))), p->domain_button, TRUE);
  71 --- avahi-0.6.31/avahi-ui/bssh.c.orig   2010-08-26 02:51:39.023153001 +0200
  72 +++ avahi-0.6.31/avahi-ui/bssh.c        2013-11-22 23:17:41.635509278 +0100
  73 @@ -146,19 +146,19 @@
  74              break;
  75
  76          case COMMAND_SHELL:
  77 -            d = aui_service_dialog_new(_("Choose Shell Server"), NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
  78 +            d = aui_service_dialog_new(_("Choose Shell Server"), NULL, _("_Cancel"), GTK_RESPONSE_CANCEL, gtk_image_new_from_icon_name("network-workgroup", GTK_ICON_SIZE_BUTTON), GTK_RESPONSE_ACCEPT, NULL);
  79              aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_rfb._tcp", "_ssh._tcp", NULL);
  80              aui_service_dialog_set_service_type_name(AUI_SERVICE_DIALOG(d), "_rfb._tcp", _("Desktop"));
  81              aui_service_dialog_set_service_type_name(AUI_SERVICE_DIALOG(d), "_ssh._tcp", _("Terminal"));
  82              break;
  83
  84          case COMMAND_VNC:
  85 -            d = aui_service_dialog_new(_("Choose VNC server"), NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
  86 +            d = aui_service_dialog_new(_("Choose VNC server"), NULL, _("_Cancel"), GTK_RESPONSE_CANCEL, gtk_image_new_from_icon_name("network-workgroup", GTK_ICON_SIZE_BUTTON), GTK_RESPONSE_ACCEPT, NULL);
  87              aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_rfb._tcp", NULL);
  88              break;
  89
  90          case COMMAND_SSH:
  91 -            d = aui_service_dialog_new(_("Choose SSH server"), NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
  92 +            d = aui_service_dialog_new(_("Choose SSH server"), NULL, _("_Cancel"), GTK_RESPONSE_CANCEL, gtk_image_new_from_icon_name("network-workgroup", GTK_ICON_SIZE_BUTTON), GTK_RESPONSE_ACCEPT, NULL);
  93              aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_ssh._tcp", NULL);
  94              break;
  95      }