diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 14 | ||||
| -rw-r--r-- | src/bookmarks/ephy-new-bookmark.c | 9 | ||||
| -rw-r--r-- | src/ephy-window.c | 3 | ||||
| -rwxr-xr-x | src/pdm-dialog.c | 17 | ||||
| -rw-r--r-- | src/session.c | 10 |
5 files changed, 38 insertions, 15 deletions
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 2888950df..66454d586 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -263,6 +263,7 @@ static GtkWidget * build_editing_table (EphyBookmarksEditor *editor) { GtkWidget *table, *label, *entry; + char *str; table = gtk_table_new (2, 2, FALSE); gtk_table_set_row_spacings (GTK_TABLE (table), 6); @@ -271,7 +272,9 @@ build_editing_table (EphyBookmarksEditor *editor) label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_label_set_markup (GTK_LABEL (label), _("<b>Title:</b>")); + str = g_strconcat ("<b>", _("Title:"), "</b>", NULL); + gtk_label_set_markup (GTK_LABEL (label), str); + g_free (str); gtk_widget_show (label); entry = gtk_entry_new (); editor->priv->title_entry = entry; @@ -285,7 +288,9 @@ build_editing_table (EphyBookmarksEditor *editor) label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_label_set_markup (GTK_LABEL (label), _("<b>Keywords:</b>")); + str = g_strconcat ("<b>", _("Keywords:"), "</b>", NULL); + gtk_label_set_markup (GTK_LABEL (label), str); + g_free (str); gtk_widget_show (label); entry = ephy_keywords_entry_new (); ephy_keywords_entry_set_bookmarks (EPHY_KEYWORDS_ENTRY (entry), @@ -365,13 +370,16 @@ build_search_box (EphyBookmarksEditor *editor) GtkWidget *box; GtkWidget *label; GtkWidget *entry; + char *str; box = gtk_hbox_new (FALSE, 6); gtk_widget_show (box); label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_label_set_markup (GTK_LABEL (label), _("<b>Search:</b>")); + str = g_strconcat ("<b>", _("Search:"), "</b>", NULL); + gtk_label_set_markup (GTK_LABEL (label), str); + g_free (str); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE, 0); diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c index 2b282fd6e..e5d9c496d 100644 --- a/src/bookmarks/ephy-new-bookmark.c +++ b/src/bookmarks/ephy-new-bookmark.c @@ -175,6 +175,7 @@ static GtkWidget * build_editing_table (EphyNewBookmark *editor) { GtkWidget *table, *label, *entry; + char *str; table = gtk_table_new (2, 2, FALSE); gtk_table_set_row_spacings (GTK_TABLE (table), 6); @@ -183,7 +184,9 @@ build_editing_table (EphyNewBookmark *editor) label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_label_set_markup (GTK_LABEL (label), _("<b>Title:</b>")); + str = g_strconcat ("<b>", _("Title:"), "</b>", NULL); + gtk_label_set_markup (GTK_LABEL (label), str); + g_free (str); gtk_widget_show (label); entry = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); @@ -195,7 +198,9 @@ build_editing_table (EphyNewBookmark *editor) label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_label_set_markup (GTK_LABEL (label), _("<b>Keywords:</b>")); + str = g_strconcat ("<b>", _("Keywords:"), "</b>", NULL); + gtk_label_set_markup (GTK_LABEL (label), str); + g_free (str); gtk_widget_show (label); entry = ephy_keywords_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); diff --git a/src/ephy-window.c b/src/ephy-window.c index 311d6202c..d014e4378 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -1313,9 +1313,8 @@ ephy_window_notebook_switch_page_cb (GtkNotebook *notebook, { EphyTab *tab, *old_tab; - if (window->priv->closing) return; - g_return_if_fail (IS_EPHY_WINDOW (window)); + if (window->priv->closing) return; /* get the new tab */ tab = real_get_active_tab (window, page_num); diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index 021126424..380430911 100755 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -556,6 +556,7 @@ show_cookies_properties (PdmDialog *dialog, GtkWidget *label; GtkWidget *parent; GtkWidget *dialog_vbox; + char *str; parent = ephy_dialog_get_control (EPHY_DIALOG(dialog), PROP_DIALOG); @@ -574,7 +575,9 @@ show_cookies_properties (PdmDialog *dialog, gtk_table_set_col_spacings (GTK_TABLE(table), 10); gtk_widget_show (table); - label = gtk_label_new (_("<b>Value</b>")); + str = g_strconcat ("<b>", _("Value"), "</b>", NULL); + label = gtk_label_new (str); + g_free (str); gtk_label_set_use_markup (GTK_LABEL(label), TRUE); gtk_misc_set_alignment (GTK_MISC(label), 0, 0); gtk_widget_show (label); @@ -586,7 +589,9 @@ show_cookies_properties (PdmDialog *dialog, gtk_widget_show (label); gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1); - label = gtk_label_new (_("<b>Path</b>")); + str = g_strconcat ("<b>", _("Path"), "</b>", NULL); + label = gtk_label_new (str); + g_free (str); gtk_label_set_use_markup (GTK_LABEL(label), TRUE); gtk_misc_set_alignment (GTK_MISC(label), 0, 0); gtk_widget_show (label); @@ -598,7 +603,9 @@ show_cookies_properties (PdmDialog *dialog, gtk_widget_show (label); gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 1, 2); - label = gtk_label_new (_("<b>Secure</b>")); + str = g_strconcat ("<b>", _("Secure"), "</b>", NULL); + label = gtk_label_new (str); + g_free (str); gtk_label_set_use_markup (GTK_LABEL(label), TRUE); gtk_misc_set_alignment (GTK_MISC(label), 0, 0); gtk_widget_show (label); @@ -610,7 +617,9 @@ show_cookies_properties (PdmDialog *dialog, gtk_widget_show (label); gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 2, 3); - label = gtk_label_new (_("<b>Expire</b>")); + str = g_strconcat ("<b>", _("Expire"), "</b>", NULL); + label = gtk_label_new (str); + g_free (str); gtk_label_set_use_markup (GTK_LABEL(label), TRUE); gtk_misc_set_alignment (GTK_MISC(label), 0, 0); gtk_widget_show (label); diff --git a/src/session.c b/src/session.c index 920b49df9..927f7fd95 100644 --- a/src/session.c +++ b/src/session.c @@ -183,6 +183,7 @@ crashed_resume_dialog (Session *session) GtkWidget *vbox; GtkWidget *hbox; GtkWidget *image; + char *str; dialog = gtk_dialog_new_with_buttons (_("Crash Recovery"), NULL, @@ -215,10 +216,11 @@ crashed_resume_dialog (Session *session) gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_widget_show (label); - gtk_label_set_markup (GTK_LABEL (label), - _("<b>Epiphany appears to have crashed or been killed the last time it was run.</b>")); - gtk_box_pack_start (GTK_BOX (vbox), label, - TRUE, TRUE, 0); + str = g_strconcat ("<b>", _("Epiphany appears to have crashed or been killed the last time it was run."), + "</b>", NULL); + gtk_label_set_markup (GTK_LABEL (label), str); + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0); + g_free (str); label = gtk_label_new (_("You can recover the opened tabs and windows.")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); |