aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--src/ephy-toolbar-editor.c5
-rw-r--r--src/languages.h20
3 files changed, 34 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2fc32812d..465901932 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2006-01-25 Christian Persch <chpe@cvs.gnome.org>
+ * src/ephy-toolbar-editor.c: (ephy_toolbar_editor_constructor):
+
+ Add transient window to window group.,
+
+ * src/languages.h:
+
+ Add licence header.
+
+2006-01-25 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-net-monitor.c: (ephy_net_monitor_set_net_status),
(notify_network_managed_cb):
diff --git a/src/ephy-toolbar-editor.c b/src/ephy-toolbar-editor.c
index e0defcf44..e0ca065f3 100644
--- a/src/ephy-toolbar-editor.c
+++ b/src/ephy-toolbar-editor.c
@@ -199,9 +199,12 @@ ephy_toolbar_editor_constructor (GType type,
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_window_set_title (GTK_WINDOW (dialog), _("Toolbar Editor"));
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (priv->window));
+ gtk_window_group_add_window (ephy_gui_ensure_window_group (GTK_WINDOW (priv->window)),
+ GTK_WINDOW (dialog));
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
- gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
manager = GTK_UI_MANAGER (ephy_window_get_ui_manager (priv->window));
editor = egg_toolbar_editor_new (manager, priv->model);
diff --git a/src/languages.h b/src/languages.h
index 242cb47b8..9027d46b1 100644
--- a/src/languages.h
+++ b/src/languages.h
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2005 Christian Persch
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Id$
+ */
+
static const char languages[][7] =
{
/* If you're missing your language/locale combination, file a bug at