aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog16
-rw-r--r--configure.in4
-rw-r--r--embed/mozilla/PromptService.cpp4
-rw-r--r--embed/mozilla/mozilla-embed-persist.cpp2
-rw-r--r--lib/toolbar/ephy-tbi-zoom.c2
-rw-r--r--lib/widgets/ephy-notebook.c4
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c14
-rw-r--r--src/bookmarks/ephy-new-bookmark.c9
-rw-r--r--src/ephy-window.c3
-rwxr-xr-xsrc/pdm-dialog.c17
-rw-r--r--src/session.c10
11 files changed, 63 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 11511c7f3..bcee893e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2003-01-04 Marco Pesenti Gritti <marco@it.gnome.org>
+
+ * configure.in:
+ * embed/mozilla/PromptService.cpp:
+ * embed/mozilla/mozilla-embed-persist.cpp:
+ * lib/toolbar/ephy-tbi-zoom.c: (ephy_tbi_zoom_get_widget_impl):
+ * lib/widgets/ephy-notebook.c: (tab_build_label):
+ * src/bookmarks/ephy-bookmarks-editor.c: (build_editing_table),
+ (build_search_box):
+ * src/bookmarks/ephy-new-bookmark.c: (build_editing_table):
+ * src/ephy-window.c: (ephy_window_notebook_switch_page_cb):
+ * src/pdm-dialog.c: (show_cookies_properties):
+ * src/session.c: (crashed_resume_dialog):
+
+ Remove unnecessary markup from translations.
+
2003-01-02 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/ephy-string.c: (ephy_str_replace_substring):
diff --git a/configure.in b/configure.in
index bc20dcb7a..163345eb6 100644
--- a/configure.in
+++ b/configure.in
@@ -16,6 +16,7 @@ OAF_REQUIRED=0.6.5
ORBIT_REQUIRED=0.5.7
MOZILLA_REQUIRED=1.1
SCROLLKEEPER_REQUIRED=0.1.4
+LIBBONOBOUI_REQUIRED=2.1.1
AC_SUBST(SCROLLKEEPER_REQUIRED)
AC_SUBST(GNOME_VFS_REQUIRED)
@@ -24,6 +25,7 @@ AC_SUBST(ORBIT_REQUIRED)
AC_SUBST(LIBGLADE_REQUIRED)
AC_SUBST(GNOME_LIBS_REQUIRED)
AC_SUBST(MOZILLA_REQUIRED)
+AC_SUBST(LIBBONOBOUI_REQUIRED)
AC_ENABLE_SHARED(yes)
AC_ENABLE_STATIC(no)
@@ -89,7 +91,7 @@ if test "x${nautilus_prefix}" != "x"; then
fi
fi
-PKG_CHECK_MODULES(EPIPHANY_DEPENDENCY, gtk+-2.0 libxml-2.0 libgnomeui-2.0 libglade-2.0 bonobo-activation-2.0 ORBit-2.0 libglade-2.0 gnome-vfs-2.0 gnome-vfs-module-2.0 gconf-2.0 $nautilusview_pkgs)
+PKG_CHECK_MODULES(EPIPHANY_DEPENDENCY, gtk+-2.0 libxml-2.0 libgnomeui-2.0 libglade-2.0 bonobo-activation-2.0 libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED ORBit-2.0 libglade-2.0 gnome-vfs-2.0 gnome-vfs-module-2.0 gconf-2.0 $nautilusview_pkgs)
AC_SUBST(EPIPHANY_DEPENDENCY_CFLAGS)
AC_SUBST(EPIPHANY_DEPENDENCY_LIBS)
diff --git a/embed/mozilla/PromptService.cpp b/embed/mozilla/PromptService.cpp
index c9244dd32..9b3aefc63 100644
--- a/embed/mozilla/PromptService.cpp
+++ b/embed/mozilla/PromptService.cpp
@@ -227,8 +227,6 @@ NS_IMETHODIMP CPromptService::AddButton (GtkWidget *dialog,
const char *btitle;
const nsACString &utf8string = NS_ConvertUCS2toUTF8 (title);
- g_print ("%d", type);
-
switch (type)
{
case BUTTON_TITLE_OK:
@@ -715,7 +713,7 @@ set_check_button_size_to_label (GtkWidget *check_button,
if (r.width <= label_r.width) return;
- gtk_widget_set_size_request (label, r.width, 0);
+ gtk_widget_set_size_request (label, r.width, -1);
}
/**
diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index abfcacd57..c0c8cb06e 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -167,7 +167,7 @@ impl_save (EphyEmbedPersist *persist)
if (embed)
{
- wrapper = (EphyWrapper *) mozilla_embed_get_galeon_wrapper (MOZILLA_EMBED(embed));
+ wrapper = (EphyWrapper *) mozilla_embed_get_galeon_wrapper (MOZILLA_EMBED(embed));
wrapper->GetDOMWindow (getter_AddRefs (parent));
}
diff --git a/lib/toolbar/ephy-tbi-zoom.c b/lib/toolbar/ephy-tbi-zoom.c
index 216cdc473..e7846f954 100644
--- a/lib/toolbar/ephy-tbi-zoom.c
+++ b/lib/toolbar/ephy-tbi-zoom.c
@@ -172,7 +172,7 @@ ephy_tbi_zoom_get_widget_impl (EphyTbItem *i)
if (!p->widget)
{
- p->widget = gtk_spin_button_new_with_range (1, 999, 10);
+ p->widget = gtk_spin_button_new_with_range (10, 990, 10);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (p->widget), 100);
g_object_ref (p->widget);
gtk_object_sink (GTK_OBJECT (p->widget));
diff --git a/lib/widgets/ephy-notebook.c b/lib/widgets/ephy-notebook.c
index c03dc878a..45dc54958 100644
--- a/lib/widgets/ephy-notebook.c
+++ b/lib/widgets/ephy-notebook.c
@@ -653,7 +653,9 @@ tab_build_label (EphyNotebook *nb, GtkWidget *child)
gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
- hbox = gtk_hbox_new (FALSE, 0);
+ /* set hbox spacing and label padding (see below) so that there's an
+ * equal amount of space around the label */
+ hbox = gtk_hbox_new (FALSE, 4);
/* setup close button */
close_button = gtk_button_new ();
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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 06:02:03 +0800