From 18b741804c7e9d92dbe13960ac5cc89d912bb616 Mon Sep 17 00:00:00 2001 From: Chase Patterson Date: Fri, 15 Sep 2017 17:36:02 -0400 Subject: Use localized "HexChat" in window titles Also allow rearranging of "HexChat" in window titles --- src/fe-gtk/banlist.c | 8 ++++---- src/fe-gtk/chanlist.c | 4 ++-- src/fe-gtk/dccgui.c | 13 ++++++++----- src/fe-gtk/fkeys.c | 6 ++++-- src/fe-gtk/ignoregui.c | 6 ++++-- src/fe-gtk/joind.c | 3 ++- src/fe-gtk/maingui.c | 26 +++++++++++++++----------- src/fe-gtk/menu.c | 44 +++++++++++++++++++++++++++----------------- src/fe-gtk/notifygui.c | 6 ++++-- src/fe-gtk/plugin-tray.c | 37 +++++++++++++++++++------------------ src/fe-gtk/plugingui.c | 5 +++-- src/fe-gtk/rawlog.c | 2 +- src/fe-gtk/servlistgui.c | 6 ++++-- src/fe-gtk/setup.c | 4 +++- src/fe-gtk/urlgrab.c | 6 ++++-- 15 files changed, 104 insertions(+), 72 deletions(-) (limited to 'src/fe-gtk') diff --git a/src/fe-gtk/banlist.c b/src/fe-gtk/banlist.c index 99a99277..9e844f24 100644 --- a/src/fe-gtk/banlist.c +++ b/src/fe-gtk/banlist.c @@ -436,8 +436,8 @@ banlist_do_refresh (banlist_info *banl) { GtkListStore *store; - g_snprintf (tbuf, sizeof tbuf, "Ban List (%s, %s) - ", - sess->channel, sess->server->servername); + g_snprintf (tbuf, sizeof tbuf, "Ban List (%s, %s) - %s", + sess->channel, sess->server->servername, _(DISPLAY_NAME)); mg_set_title (banl->window, tbuf); store = get_store (sess); @@ -805,8 +805,8 @@ banlist_opengui (struct session *sess) /* Force on the checkmark in the "Bans" box */ banl->checked = 1<server->servername); + g_snprintf (tbuf, sizeof tbuf, _("Ban List (%s) - %s"), + sess->server->servername, _(DISPLAY_NAME)); banl->window = mg_create_generic_tab ("BanList", tbuf, FALSE, TRUE, banlist_closegui, banl, 700, 300, &vbox, sess->server); diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c index 12dba53e..aeddc417 100644 --- a/src/fe-gtk/chanlist.c +++ b/src/fe-gtk/chanlist.c @@ -717,8 +717,8 @@ chanlist_opengui (server *serv, int do_refresh) return; } - g_snprintf (tbuf, sizeof tbuf, _("Channel List (%s) - "DISPLAY_NAME), - server_get_network (serv, TRUE)); + g_snprintf (tbuf, sizeof tbuf, _("Channel List (%s) - %s"), + server_get_network (serv, TRUE), _(DISPLAY_NAME)); serv->gui->chanlist_pending_rows = NULL; serv->gui->chanlist_tag = 0; diff --git a/src/fe-gtk/dccgui.c b/src/fe-gtk/dccgui.c index 9126694a..5b8dbac9 100644 --- a/src/fe-gtk/dccgui.c +++ b/src/fe-gtk/dccgui.c @@ -792,6 +792,7 @@ fe_dcc_open_recv_win (int passive) GtkWidget *radio, *table, *vbox, *bbox, *view, *exp, *detailbox; GtkListStore *store; GSList *group; + char buf[128]; if (dccfwin.window) { @@ -799,9 +800,9 @@ fe_dcc_open_recv_win (int passive) mg_bring_tofront (dccfwin.window); return TRUE; } - dccfwin.window = mg_create_generic_tab ("Transfers", _("Uploads and Downloads - "DISPLAY_NAME), - FALSE, TRUE, close_dcc_file_window, NULL, - win_width, win_height, &vbox, 0); + g_snprintf(buf, sizeof(buf), _("Uploads and Downloads - %s"), _(DISPLAY_NAME)); + dccfwin.window = mg_create_generic_tab ("Transfers", buf, FALSE, TRUE, close_dcc_file_window, + NULL, win_width, win_height, &vbox, 0); gtkutil_destroy_on_esc (dccfwin.window); gtk_container_set_border_width (GTK_CONTAINER (dccfwin.window), 3); gtk_box_set_spacing (GTK_BOX (vbox), 3); @@ -1037,6 +1038,7 @@ fe_dcc_open_chat_win (int passive) { GtkWidget *view, *vbox, *bbox; GtkListStore *store; + char buf[128]; if (dcccwin.window) { @@ -1045,9 +1047,10 @@ fe_dcc_open_chat_win (int passive) return TRUE; } + g_snprintf(buf, sizeof(buf), _("DCC Chat List - %s"), _(DISPLAY_NAME)); dcccwin.window = - mg_create_generic_tab ("DCCChat", _("DCC Chat List - "DISPLAY_NAME), - FALSE, TRUE, dcc_chat_close_cb, NULL, 550, 180, &vbox, 0); + mg_create_generic_tab ("DCCChat", buf, FALSE, TRUE, dcc_chat_close_cb, + NULL, 550, 180, &vbox, 0); gtkutil_destroy_on_esc (dcccwin.window); gtk_container_set_border_width (GTK_CONTAINER (dcccwin.window), 3); gtk_box_set_spacing (GTK_BOX (vbox), 3); diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c index bc33a772..dc4b41bc 100644 --- a/src/fe-gtk/fkeys.c +++ b/src/fe-gtk/fkeys.c @@ -801,6 +801,7 @@ key_dialog_show () GtkWidget *vbox, *box; GtkWidget *view, *xtext; GtkListStore *store; + char buf[128]; if (key_dialog) { @@ -808,8 +809,9 @@ key_dialog_show () return; } - key_dialog = mg_create_generic_tab ("editkeys", _("Keyboard Shortcuts - "DISPLAY_NAME), - TRUE, FALSE, key_dialog_close, NULL, 600, 360, &vbox, 0); + g_snprintf(buf, sizeof(buf), _("Keyboard Shortcuts - %s"), _(DISPLAY_NAME)); + key_dialog = mg_create_generic_tab ("editkeys", buf, TRUE, FALSE, key_dialog_close, + NULL, 600, 360, &vbox, 0); view = key_dialog_treeview_new (vbox); xtext = gtk_xtext_new (colors, 0); diff --git a/src/fe-gtk/ignoregui.c b/src/fe-gtk/ignoregui.c index d935822b..6c74253c 100644 --- a/src/fe-gtk/ignoregui.c +++ b/src/fe-gtk/ignoregui.c @@ -339,6 +339,7 @@ ignore_gui_open () GSList *temp = ignore_list; char *mask; gboolean private, chan, notice, ctcp, dcc, invite, unignore; + char buf[128]; if (ignorewin) { @@ -346,9 +347,10 @@ ignore_gui_open () return; } + g_snprintf(buf, sizeof(buf), _("Ignore list - %s"), _(DISPLAY_NAME)); ignorewin = - mg_create_generic_tab ("IgnoreList", _("Ignore list - "DISPLAY_NAME), - FALSE, TRUE, close_ignore_gui_callback, + mg_create_generic_tab ("IgnoreList", buf, FALSE, TRUE, + close_ignore_gui_callback, NULL, 700, 300, &vbox, 0); gtkutil_destroy_on_esc (ignorewin); diff --git a/src/fe-gtk/joind.c b/src/fe-gtk/joind.c index 26ca7738..f1d3da50 100644 --- a/src/fe-gtk/joind.c +++ b/src/fe-gtk/joind.c @@ -130,7 +130,8 @@ joind_show_dialog (server *serv) char buf2[256]; serv->gui->joind_win = dialog1 = gtk_dialog_new (); - gtk_window_set_title (GTK_WINDOW (dialog1), _("Connection Complete - "DISPLAY_NAME)); + g_snprintf(buf, sizeof(buf), _("Connection Complete - %s"), _(DISPLAY_NAME)); + gtk_window_set_title (GTK_WINDOW (dialog1), buf); gtk_window_set_type_hint (GTK_WINDOW (dialog1), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_window_set_position (GTK_WINDOW (dialog1), GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_transient_for (GTK_WINDOW(dialog1), GTK_WINDOW(serv->front_session->gui->window)); diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index b11a9f79..d0c59aa0 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -382,28 +382,31 @@ fe_set_title (session *sess) switch (type) { case SESS_DIALOG: - g_snprintf (tbuf, sizeof (tbuf), "%s %s @ %s - "DISPLAY_NAME, - _("Dialog with"), sess->channel, server_get_network (sess->server, TRUE)); + g_snprintf (tbuf, sizeof (tbuf), "%s %s @ %s - %s", + _("Dialog with"), sess->channel, server_get_network (sess->server, TRUE), + _(DISPLAY_NAME)); break; case SESS_SERVER: - g_snprintf (tbuf, sizeof (tbuf), "%s @ %s - "DISPLAY_NAME, - sess->server->nick, server_get_network (sess->server, TRUE)); + g_snprintf (tbuf, sizeof (tbuf), "%s @ %s - %s", + sess->server->nick, server_get_network (sess->server, TRUE), + _(DISPLAY_NAME)); break; case SESS_CHANNEL: /* don't display keys in the titlebar */ if (prefs.hex_gui_win_modes) { g_snprintf (tbuf, sizeof (tbuf), - "%s @ %s / %s (%s) - "DISPLAY_NAME, + "%s @ %s / %s (%s) - %s", sess->server->nick, server_get_network (sess->server, TRUE), - sess->channel, sess->current_modes ? sess->current_modes : ""); + sess->channel, sess->current_modes ? sess->current_modes : "", + _(DISPLAY_NAME)); } else { g_snprintf (tbuf, sizeof (tbuf), - "%s @ %s / %s - "DISPLAY_NAME, + "%s @ %s / %s - %s", sess->server->nick, server_get_network (sess->server, TRUE), - sess->channel); + sess->channel, _(DISPLAY_NAME)); } if (prefs.hex_gui_win_ucount) { @@ -412,12 +415,13 @@ fe_set_title (session *sess) break; case SESS_NOTICES: case SESS_SNOTICES: - g_snprintf (tbuf, sizeof (tbuf), "%s @ %s (notices) - "DISPLAY_NAME, - sess->server->nick, server_get_network (sess->server, TRUE)); + g_snprintf (tbuf, sizeof (tbuf), "%s @ %s (notices) - %s", + sess->server->nick, server_get_network (sess->server, TRUE), + _(DISPLAY_NAME)); break; default: def: - g_snprintf (tbuf, sizeof (tbuf), DISPLAY_NAME); + g_snprintf (tbuf, sizeof (tbuf), _(DISPLAY_NAME)); gtk_window_set_title (GTK_WINDOW (sess->gui->window), tbuf); return; } diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index 966b6f8f..097093b4 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -1134,8 +1134,9 @@ menu_settings (GtkWidget * wid, gpointer none) static void menu_usermenu (void) { - editlist_gui_open (NULL, NULL, usermenu_list, _("User menu - "DISPLAY_NAME), - "usermenu", "usermenu.conf", 0); + char buf[128]; + g_snprintf(buf, sizeof(buf), _("User menu - %s"), _(DISPLAY_NAME)); + editlist_gui_open (NULL, NULL, usermenu_list, buf, "usermenu", "usermenu.conf", 0); } static void @@ -1524,29 +1525,34 @@ menu_noplugin_info (void) static void menu_usercommands (void) { - editlist_gui_open (NULL, NULL, command_list, _("User Defined Commands - "DISPLAY_NAME), - "commands", "commands.conf", usercommands_help); + char buf[128]; + g_snprintf(buf, sizeof(buf), _("User Defined Commands - %s"), _(DISPLAY_NAME)); + editlist_gui_open (NULL, NULL, command_list, buf, "commands", "commands.conf", + usercommands_help); } static void menu_ulpopup (void) { - editlist_gui_open (NULL, NULL, popup_list, _("Userlist Popup menu - "DISPLAY_NAME), "popup", - "popup.conf", ulbutton_help); + char buf[128]; + g_snprintf(buf, sizeof(buf), _("Userlist Popup menu - %s"), _(DISPLAY_NAME)); + editlist_gui_open (NULL, NULL, popup_list, buf, "popup", "popup.conf", ulbutton_help); } static void menu_rpopup (void) { - editlist_gui_open (_("Text"), _("Replace with"), replace_list, _("Replace - "DISPLAY_NAME), "replace", - "replace.conf", 0); + char buf[128]; + g_snprintf(buf, sizeof(buf), _("Replace - %s"), _(DISPLAY_NAME)); + editlist_gui_open (_("Text"), _("Replace with"), replace_list, buf, "replace", "replace.conf", 0); } static void menu_urlhandlers (void) { - editlist_gui_open (NULL, NULL, urlhandler_list, _("URL Handlers - "DISPLAY_NAME), "urlhandlers", - "urlhandlers.conf", url_help); + char buf[128]; + g_snprintf(buf, sizeof(buf), _("URL Handlers - %s"), _(DISPLAY_NAME)); + editlist_gui_open (NULL, NULL, urlhandler_list, buf, "urlhandlers", "urlhandlers.conf", url_help); } static void @@ -1564,22 +1570,26 @@ menu_keypopup (void) static void menu_ulbuttons (void) { - editlist_gui_open (NULL, NULL, button_list, _("Userlist buttons - "DISPLAY_NAME), "buttons", - "buttons.conf", ulbutton_help); + char buf[128]; + g_snprintf(buf, sizeof(buf), _("Userlist buttons - %s"), _(DISPLAY_NAME)); + editlist_gui_open (NULL, NULL, button_list, buf, "buttons", "buttons.conf", ulbutton_help); } static void menu_dlgbuttons (void) { - editlist_gui_open (NULL, NULL, dlgbutton_list, _("Dialog buttons - "DISPLAY_NAME), "dlgbuttons", - "dlgbuttons.conf", dlgbutton_help); + char buf[128]; + g_snprintf(buf, sizeof(buf), _("Dialog buttons - %s"), _(DISPLAY_NAME)); + editlist_gui_open (NULL, NULL, dlgbutton_list, buf, "dlgbuttons", "dlgbuttons.conf", + dlgbutton_help); } static void menu_ctcpguiopen (void) { - editlist_gui_open (NULL, NULL, ctcp_list, _("CTCP Replies - "DISPLAY_NAME), "ctcpreply", - "ctcpreply.conf", ctcp_help); + char buf[128]; + g_snprintf(buf, sizeof(buf), _("CTCP Replies - %s"), _(DISPLAY_NAME)); + editlist_gui_open (NULL, NULL, ctcp_list, buf, "ctcpreply", "ctcpreply.conf", ctcp_help); } static void @@ -1727,7 +1737,7 @@ menu_about (GtkWidget *wid, gpointer sess) #endif get_sys_str (0)); - gtk_about_dialog_set_program_name (dialog, DISPLAY_NAME); + gtk_about_dialog_set_program_name (dialog, _(DISPLAY_NAME)); gtk_about_dialog_set_version (dialog, PACKAGE_VERSION); gtk_about_dialog_set_license (dialog, license); /* gtk3 can use GTK_LICENSE_GPL_2_0 */ gtk_about_dialog_set_website (dialog, "http://hexchat.github.io"); diff --git a/src/fe-gtk/notifygui.c b/src/fe-gtk/notifygui.c index a919b1cb..38b35eb9 100644 --- a/src/fe-gtk/notifygui.c +++ b/src/fe-gtk/notifygui.c @@ -398,6 +398,7 @@ notify_opengui (void) { GtkWidget *vbox, *bbox; GtkWidget *view; + char buf[128]; if (notify_window) { @@ -405,9 +406,10 @@ notify_opengui (void) return; } + g_snprintf(buf, sizeof(buf), _("Friends List - %s"), _(DISPLAY_NAME)); notify_window = - mg_create_generic_tab ("Notify", _("Friends List - "DISPLAY_NAME), FALSE, TRUE, - notify_closegui, NULL, 400, 250, &vbox, 0); + mg_create_generic_tab ("Notify", buf, FALSE, TRUE, notify_closegui, NULL, 400, + 250, &vbox, 0); gtkutil_destroy_on_esc (notify_window); view = notify_treeview_new (vbox); diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index c2e54929..55565955 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -174,10 +174,10 @@ tray_stop_flash (void) nets = tray_count_networks (); chans = tray_count_channels (); if (nets) - tray_set_tipf (_("Connected to %u networks and %u channels - "DISPLAY_NAME), - nets, chans); + tray_set_tipf (_("Connected to %u networks and %u channels - %s"), + nets, chans, _(DISPLAY_NAME)); else - tray_set_tipf ("%s - "DISPLAY_NAME, _("Not connected.")); + tray_set_tipf ("%s - %s", _("Not connected."), _(DISPLAY_NAME)); } if (custom_icon1) @@ -628,11 +628,12 @@ tray_hilight_cb (char *word[], void *userdata) /* FIXME: hides any previous private messages */ tray_hilight_count++; if (tray_hilight_count == 1) - tray_set_tipf (_("Highlighted message from: %s (%s) - "DISPLAY_NAME), - word[1], hexchat_get_info (ph, "channel")); + tray_set_tipf (_("Highlighted message from: %s (%s) - %s"), + word[1], hexchat_get_info (ph, "channel"), _(DISPLAY_NAME)); else - tray_set_tipf (_("%u highlighted messages, latest from: %s (%s) - "DISPLAY_NAME), - tray_hilight_count, word[1], hexchat_get_info (ph, "channel")); + tray_set_tipf (_("%u highlighted messages, latest from: %s (%s) - %s"), + tray_hilight_count, word[1], hexchat_get_info (ph, "channel"), + _(DISPLAY_NAME)); } return HEXCHAT_EAT_NONE; @@ -650,10 +651,10 @@ tray_message_cb (char *word[], void *userdata) tray_pub_count++; if (tray_pub_count == 1) - tray_set_tipf (_("Channel message from: %s (%s) - "DISPLAY_NAME), - word[1], hexchat_get_info (ph, "channel")); + tray_set_tipf (_("Channel message from: %s (%s) - %s"), + word[1], hexchat_get_info (ph, "channel"), _(DISPLAY_NAME)); else - tray_set_tipf (_("%u channel messages. - "DISPLAY_NAME), tray_pub_count); + tray_set_tipf (_("%u channel messages. - %s"), tray_pub_count, _(DISPLAY_NAME)); } return HEXCHAT_EAT_NONE; @@ -677,11 +678,11 @@ tray_priv (char *from, char *text) tray_priv_count++; if (tray_priv_count == 1) - tray_set_tipf (_("Private message from: %s (%s) - "DISPLAY_NAME), - from, network); + tray_set_tipf (_("Private message from: %s (%s) - %s"), from, + network, _(DISPLAY_NAME)); else - tray_set_tipf (_("%u private messages, latest from: %s (%s) - "DISPLAY_NAME), - tray_priv_count, from, network); + tray_set_tipf (_("%u private messages, latest from: %s (%s) - %s"), + tray_priv_count, from, network, _(DISPLAY_NAME)); } } @@ -720,11 +721,11 @@ tray_dcc_cb (char *word[], void *userdata) tray_file_count++; if (tray_file_count == 1) - tray_set_tipf (_("File offer from: %s (%s) - "DISPLAY_NAME), - word[1], network); + tray_set_tipf (_("File offer from: %s (%s) - %s"), word[1], network, + _(DISPLAY_NAME)); else - tray_set_tipf (_("%u file offers, latest from: %s (%s) - "DISPLAY_NAME), - tray_file_count, word[1], network); + tray_set_tipf (_("%u file offers, latest from: %s (%s) - %s"), + tray_file_count, word[1], network, _(DISPLAY_NAME)); } return HEXCHAT_EAT_NONE; diff --git a/src/fe-gtk/plugingui.c b/src/fe-gtk/plugingui.c index 1f24e2f6..4399cd71 100644 --- a/src/fe-gtk/plugingui.c +++ b/src/fe-gtk/plugingui.c @@ -230,6 +230,7 @@ plugingui_open (void) { GtkWidget *view; GtkWidget *vbox, *hbox; + char buf[128]; if (plugin_window) { @@ -237,8 +238,8 @@ plugingui_open (void) return; } - plugin_window = mg_create_generic_tab ("Addons", _("Plugins and Scripts - "DISPLAY_NAME), - FALSE, TRUE, plugingui_close, NULL, + g_snprintf(buf, sizeof(buf), _("Plugins and Scripts - %s"), _(DISPLAY_NAME)); + plugin_window = mg_create_generic_tab ("Addons", buf, FALSE, TRUE, plugingui_close, NULL, 700, 300, &vbox, 0); gtkutil_destroy_on_esc (plugin_window); diff --git a/src/fe-gtk/rawlog.c b/src/fe-gtk/rawlog.c index 9fa25d8b..52a77267 100644 --- a/src/fe-gtk/rawlog.c +++ b/src/fe-gtk/rawlog.c @@ -109,7 +109,7 @@ open_rawlog (struct server *serv) return; } - g_snprintf (tbuf, sizeof tbuf, _("Raw Log (%s) - "DISPLAY_NAME), serv->servername); + g_snprintf (tbuf, sizeof tbuf, _("Raw Log (%s) - %s"), serv->servername, _(DISPLAY_NAME)); serv->gui->rawlog_window = mg_create_generic_tab ("RawLog", tbuf, FALSE, TRUE, close_rawlog, serv, 640, 320, &vbox, serv); diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c index dc19ab8f..b22330ac 100644 --- a/src/fe-gtk/servlistgui.c +++ b/src/fe-gtk/servlistgui.c @@ -1707,7 +1707,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net) editwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_container_set_border_width (GTK_CONTAINER (editwindow), 4); - g_snprintf (buf, sizeof (buf), _("Edit %s - "DISPLAY_NAME), net->name); + g_snprintf (buf, sizeof (buf), _("Edit %s - %s"), net->name, _(DISPLAY_NAME)); gtk_window_set_title (GTK_WINDOW (editwindow), buf); gtk_window_set_default_size (GTK_WINDOW (editwindow), netedit_win_width, netedit_win_height); gtk_window_set_transient_for (GTK_WINDOW (editwindow), GTK_WINDOW (parent)); @@ -1970,10 +1970,12 @@ servlist_open_networks (void) GtkTreeModel *model; GtkListStore *store; GtkCellRenderer *renderer; + char buf[128]; servlist = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_container_set_border_width (GTK_CONTAINER (servlist), 4); - gtk_window_set_title (GTK_WINDOW (servlist), _("Network List - "DISPLAY_NAME)); + g_snprintf(buf, sizeof(buf), _("Network List - %s"), _(DISPLAY_NAME)); + gtk_window_set_title (GTK_WINDOW (servlist), buf); gtk_window_set_default_size (GTK_WINDOW (servlist), netlist_win_width, netlist_win_height); gtk_window_set_role (GTK_WINDOW (servlist), "servlist"); gtk_window_set_type_hint (GTK_WINDOW (servlist), GDK_WINDOW_TYPE_HINT_DIALOG); diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index a54ea602..66883a37 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -2288,8 +2288,10 @@ static GtkWidget * setup_window_open (void) { GtkWidget *wid, *win, *vbox, *hbox, *hbbox; + char buf[128]; - win = gtkutil_window_new (_("Preferences - "DISPLAY_NAME), "prefs", 0, 600, 2); + g_snprintf(buf, sizeof(buf), _("Preferences - %s"), _(DISPLAY_NAME)); + win = gtkutil_window_new (buf, "prefs", 0, 600, 2); vbox = gtk_vbox_new (FALSE, 5); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); diff --git a/src/fe-gtk/urlgrab.c b/src/fe-gtk/urlgrab.c index c2eb3b5b..fd8d8d91 100644 --- a/src/fe-gtk/urlgrab.c +++ b/src/fe-gtk/urlgrab.c @@ -187,6 +187,7 @@ void url_opengui () { GtkWidget *vbox, *hbox, *view; + char buf[128]; if (urlgrabberwindow) { @@ -194,9 +195,10 @@ url_opengui () return; } + g_snprintf(buf, sizeof(buf), _("URL Grabber - %s"), _(DISPLAY_NAME)); urlgrabberwindow = - mg_create_generic_tab ("UrlGrabber", _("URL Grabber - "DISPLAY_NAME), FALSE, - TRUE, url_closegui, NULL, 400, 256, &vbox, 0); + mg_create_generic_tab ("UrlGrabber", buf, FALSE, TRUE, url_closegui, NULL, + 400, 256, &vbox, 0); gtkutil_destroy_on_esc (urlgrabberwindow); view = url_treeview_new (vbox); g_object_set_data (G_OBJECT (urlgrabberwindow), "model", -- cgit 1.4.1