=== Release 1.9.2 ===Release192

2005-11-12  Christian Persch  <chpe@cvs.gnome.org>

	=== Release 1.9.2 ===

	* Makefile.am:

	Pass make distcheck.

	* NEWS:
	* configure.ac:

	Updated for 1.9.2.

	* lib/egg/egg-toolbars-model.c: (egg_toolbars_model_to_xml),
	(egg_toolbars_model_save), (parse_data_list), (parse_item_list),
	(parse_toolbars):
	* src/bookmarks/ephy-bookmarks-ui.c:
	(ephy_bookmarks_ui_attach_toolbar_model):

	Fix compile warnings.

10 files changed, 127 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index 8aa0105e6..db81b0a2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2005-11-12  Christian Persch  <chpe@cvs.gnome.org>
+
+	=== Release 1.9.2 ===
+
+	* Makefile.am:
+
+	Pass make distcheck.
+
+	* NEWS:
+	* configure.ac:
+
+	Updated for 1.9.2.
+
+	* lib/egg/egg-toolbars-model.c: (egg_toolbars_model_to_xml),
+	(egg_toolbars_model_save), (parse_data_list), (parse_item_list),
+	(parse_toolbars):
+	* src/bookmarks/ephy-bookmarks-ui.c:
+	(ephy_bookmarks_ui_attach_toolbar_model):
+
+	Fix compile warnings.
+
 2005-11-10  Crispin Flowerday  <gnome@flowerday.cx>
 
 	* lib/ephy-file-helpers.c
diff --git a/Makefile.am b/Makefile.am
index 136e7a458..29a48399d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,6 @@ EXTRA_DIST = 			\
 	intltool-merge.in	\
 	intltool-update.in	\
 	intltool-extract.in	\
-	po/LINGUAS		\
 	gnome-doc-utils.make	\
 	COPYING.README		\
 	HACKING			\
diff --git a/NEWS b/NEWS
index 2cc7c8572..e56e17970 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,54 @@
 ==============
+Epiphany 1.9.2
+==============
+
+Changes:
+
+	* Fix download window type hint
+	* Allow compilation against xulrunner
+	* Fix some memleaks [#320901]
+	* Scroll the view so the selected cert is visible [#320758]
+	* String cleanup
+	* Add status text to the find toolbar, reverse Next/Previous button order
+	* Use a gtk stock cursor instead of our own, un-themed one in toolbar editor
+	* Show drag icon with page title + URL when dragging from the drag handle
+	* Simplify context menu code [#320520]
+	* Fix error page title capitalisation, and chanage the icon on the netOffline error page
+	* Remove spinner from fullscreen toolbars file
+	* Portability and gcc 2.95 fixes
+	* Get the window name from the popup-blocked event
+	* Use curly quotes
+	* Use the history window as parent for the new-bookmark dialogue [#320329]
+	* Fix string capitalisation [#320330]
+	* Remove glade callbacks
+	* Use G_MODULE_BIND_LAZY when dlopening modules
+	* Fixes for new toolbar code [#320169, #319536]
+	* Skip spinner update when we're not loaded [#320079]
+	* Change downloader and pdm dialogue titles [#319843]
+	* Fix middle button activate of actions [#319529]
+
+Contributors to this release:
+Emmanuele Bassi, Piers Cornwell, Peter Harvey, 
+Philip Langdale, Bastien Nocera, Robert O'Callahan, 
+Christian Persch, Jean François Rameau, Raphael Slinckx.
+
+Updated translations:
+
+	* Ales Nyakhaychyk (be)
+	* Miloslav Trmac (cs)
+	* Adam Weinberger (en_CA)
+	* Francisco Javier F. Serrador (es)
+	* Ivar Smolin (et)
+	* Takeshi AIHANA (ja)
+	* Erdal Ronahi (ku)
+	* Žygimantas Beručka (lt)
+	* Reinout van Schouwen (nl)
+	* Afonso Celso Medina (pt_BR)
+	* Marcel Telka (sk)
+	* Liu Songhe (zh_CN)
+
+
+==============
 Epiphany 1.9.1
 ==============
 
diff --git a/configure.ac b/configure.ac
index 6c3437873..4493aed7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl You should have received a copy of the GNU General Public License along
 dnl with this program; if not, write to the Free Software Foundation, Inc.,
 dnl 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
-AC_INIT([GNOME Web Browser],[1.9.1.90],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
+AC_INIT([GNOME Web Browser],[1.9.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
 
 GNOME_COMMON_INIT
 
diff --git a/doc/reference/tmpl/EphySingle.sgml b/doc/reference/tmpl/EphySingle.sgml
index 5ecfb7239..d745e9084 100644
--- a/doc/reference/tmpl/EphySingle.sgml
+++ b/doc/reference/tmpl/EphySingle.sgml
@@ -22,8 +22,9 @@ EphySingle
 
 </para>
 
-@aOwner: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@aOwner: 
 
 
 <!-- ##### FUNCTION Detach ##### -->
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index 868790a54..602b2b182 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -294,6 +294,9 @@ be done by casting).
 @: 
 @:
 @: 
+@:
+@: 
+@: 
 @: 
 
 <!-- ##### SIGNAL EphyEmbed::ge-search-key-press ##### -->
diff --git a/doc/reference/tmpl/ephy-glade.sgml b/doc/reference/tmpl/ephy-glade.sgml
index 9179aaaec..96c99456f 100644
--- a/doc/reference/tmpl/ephy-glade.sgml
+++ b/doc/reference/tmpl/ephy-glade.sgml
@@ -23,16 +23,3 @@ After retrieving a #GladeXML object from ephy_glade_widget_new(), regular
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION ephy_glade_widget_new ##### -->
-<para>
-
-</para>
-
-@file: 
-@widget_name: 
-@root: 
-@data: 
-@domain: 
-@Returns: 
-
-
diff --git a/doc/reference/tmpl/epiphany-unused.sgml b/doc/reference/tmpl/epiphany-unused.sgml
index 8a864ea77..848a0013f 100644
--- a/doc/reference/tmpl/epiphany-unused.sgml
+++ b/doc/reference/tmpl/epiphany-unused.sgml
@@ -299,6 +299,18 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
 
 @Returns: 
 
+<!-- ##### FUNCTION ephy_glade_widget_new ##### -->
+<para>
+
+</para>
+
+@file: 
+@widget_name: 
+@root: 
+@data: 
+@domain: 
+@Returns: 
+
 <!-- ##### FUNCTION ephy_node_db_get_by_name ##### -->
 <para>
 
diff --git a/lib/egg/egg-toolbars-model.c b/lib/egg/egg-toolbars-model.c
index a00c75328..257baf0d4 100755
--- a/lib/egg/egg-toolbars-model.c
+++ b/lib/egg/egg-toolbars-model.c
@@ -111,17 +111,18 @@ egg_toolbars_model_to_xml (EggToolbarsModel *model)
   tl = model->priv->toolbars;
 
   xmlIndentTreeOutput = TRUE;
-  doc = xmlNewDoc ("1.0");
-  doc->children = xmlNewDocNode (doc, NULL, "toolbars", NULL);
+  doc = xmlNewDoc ((const xmlChar*) "1.0");
+  doc->children = xmlNewDocNode (doc, NULL, (const xmlChar*) "toolbars", NULL);
 
   for (l1 = tl->children; l1 != NULL; l1 = l1->next)
     {
       xmlNodePtr tnode;
       EggToolbarsToolbar *toolbar = l1->data;
 
-      tnode = xmlNewChild (doc->children, NULL, "toolbar", NULL);
-      xmlSetProp (tnode, "name", toolbar->name);
-      xmlSetProp (tnode, "hidden", (toolbar->flags&EGG_TB_MODEL_HIDDEN)?"true":"false");
+      tnode = xmlNewChild (doc->children, NULL, (const xmlChar*) "toolbar", NULL);
+      xmlSetProp (tnode, (const xmlChar*) "name", (const xmlChar*) toolbar->name);
+      xmlSetProp (tnode, (const xmlChar*) "hidden",
+		  (toolbar->flags&EGG_TB_MODEL_HIDDEN) ? (const xmlChar*) "true" : (const xmlChar*) "false");
 
       for (l2 = l1->children; l2 != NULL; l2 = l2->next)
 	{
@@ -130,12 +131,12 @@ egg_toolbars_model_to_xml (EggToolbarsModel *model)
 
           if (strcmp (item->name, "_separator") == 0)
             {
-              node = xmlNewChild (tnode, NULL, "separator", NULL);
+              node = xmlNewChild (tnode, NULL, (const xmlChar*) "separator", NULL);
               continue;
             }
           
-          node = xmlNewChild (tnode, NULL, "toolitem", NULL);
-          xmlSetProp (node, "name", item->name);
+          node = xmlNewChild (tnode, NULL, (const xmlChar*) "toolitem", NULL);
+          xmlSetProp (node, (const xmlChar*) "name", (const xmlChar*) item->name);
 
           /* Add 'data' nodes for each data type which can be written out for this
            * item. Only write types which can be used to restore the data. */
@@ -150,11 +151,11 @@ egg_toolbars_model_to_xml (EggToolbarsModel *model)
                   tmp = type->get_data (type, item->name);
                   if (tmp != NULL)
                     {
-                      dnode = xmlNewTextChild (node, NULL, "data", tmp);
+                      dnode = xmlNewTextChild (node, NULL, (const xmlChar*) "data", (const xmlChar*) tmp);
                       g_free (tmp);
                       
                       tmp = gdk_atom_name (type->type);
-                      xmlSetProp (dnode, "type", tmp);
+                      xmlSetProp (dnode, (const xmlChar*) "type", (const xmlChar*) tmp);
                       g_free (tmp);
                     }
                 }
@@ -233,7 +234,7 @@ egg_toolbars_model_save (EggToolbarsModel *model,
 
   doc = egg_toolbars_model_to_xml (model);
   root = xmlDocGetRootElement (doc);
-  xmlSetProp (root, "version", version);
+  xmlSetProp (root, (const xmlChar*) "version", (const xmlChar*) version);
   safe_save_xml (xml_file, doc);
   xmlFreeDoc (doc);
 }
@@ -471,15 +472,15 @@ parse_data_list (EggToolbarsModel *model,
   char *name = NULL;
   while (child && name == NULL)
     {
-      if (xmlStrEqual (child->name, "data"))
+      if (xmlStrEqual (child->name, (const xmlChar*) "data"))
         {
-          xmlChar *type = xmlGetProp (child, "type");
+          xmlChar *type = xmlGetProp (child, (const xmlChar*) "type");
           xmlChar *data = xmlNodeGetContent (child);
   
           if (type != NULL)
             {
-              GdkAtom atom = gdk_atom_intern (type, TRUE);
-              name = egg_toolbars_model_get_name (model, atom, data, create);
+              GdkAtom atom = gdk_atom_intern ((const char*) type, TRUE);
+              name = egg_toolbars_model_get_name (model, atom, (const char*) data, create);
             }
           
           xmlFree (type);
@@ -499,7 +500,7 @@ parse_item_list (EggToolbarsModel *model,
 {
   while (child)
     {
-      if (xmlStrEqual (child->name, "toolitem"))
+      if (xmlStrEqual (child->name, (const xmlChar*) "toolitem"))
 	{
           char *name;
 
@@ -514,15 +515,15 @@ parse_item_list (EggToolbarsModel *model,
           /* If that fails, try to use the name. */
           if (name == NULL)
             {
-              xmlChar *type = xmlGetProp (child, "type");
-              xmlChar *data = xmlGetProp (child, "name");
-              GdkAtom  atom = type ? gdk_atom_intern (type, TRUE) : GDK_NONE;
+              xmlChar *type = xmlGetProp (child, (const xmlChar*) "type");
+              xmlChar *data = xmlGetProp (child, (const xmlChar*) "name");
+              GdkAtom  atom = type ? gdk_atom_intern ((const char*) type, TRUE) : GDK_NONE;
               
               /* If an old format, try to use it. */
-              name = egg_toolbars_model_get_name (model, atom, data, FALSE);
+              name = egg_toolbars_model_get_name (model, atom, (const char*) data, FALSE);
               if (name == NULL)
                 {
-                  name = egg_toolbars_model_get_name (model, atom, data, TRUE);
+                  name = egg_toolbars_model_get_name (model, atom, (const char*) data, TRUE);
                 }
               
               xmlFree (type);
@@ -535,7 +536,7 @@ parse_item_list (EggToolbarsModel *model,
               g_free (name);
             }
 	}
-      else if (xmlStrEqual (child->name, "separator"))
+      else if (xmlStrEqual (child->name, (const xmlChar*) "separator"))
 	{
           egg_toolbars_model_add_item (model, position, -1, "_separator");
 	}
@@ -550,24 +551,24 @@ parse_toolbars (EggToolbarsModel *model,
 {
   while (child)
     {
-      if (xmlStrEqual (child->name, "toolbar"))
+      if (xmlStrEqual (child->name, (const xmlChar*) "toolbar"))
 	{
 	  xmlChar *string;
 	  int position;
           EggTbModelFlags flags;
 
-	  string = xmlGetProp (child, "name");
-	  position = egg_toolbars_model_add_toolbar (model, -1, string);
+	  string = xmlGetProp (child, (const xmlChar*) "name");
+	  position = egg_toolbars_model_add_toolbar (model, -1, (const char*) string);
           flags = egg_toolbars_model_get_flags (model, position);
 	  xmlFree (string);
 
-	  string = xmlGetProp (child, "hidden");
-          if (string && xmlStrEqual (string, "true"))
+	  string = xmlGetProp (child, (const xmlChar*) "hidden");
+          if (string && xmlStrEqual (string, (const xmlChar*) "true"))
             flags |= EGG_TB_MODEL_HIDDEN;
 	  xmlFree (string);
 
-	  string = xmlGetProp (child, "style");
-	  if (string && xmlStrEqual (string, "icons-only"))
+	  string = xmlGetProp (child, (const xmlChar*) "style");
+	  if (string && xmlStrEqual (string, (const xmlChar*) "icons-only"))
             flags |= EGG_TB_MODEL_ICONS;
 	  xmlFree (string);
 
diff --git a/src/bookmarks/ephy-bookmarks-ui.c b/src/bookmarks/ephy-bookmarks-ui.c
index 0b97a8fa8..0083fb4e5 100644
--- a/src/bookmarks/ephy-bookmarks-ui.c
+++ b/src/bookmarks/ephy-bookmarks-ui.c
@@ -502,10 +502,14 @@ bookmark_new_name (EggToolbarsItemType *type,
 void
 ephy_bookmarks_ui_attach_toolbar_model (EggToolbarsModel *model)
 {
-  	eb = ephy_shell_get_bookmarks (ephy_shell);        
-	EphyNode *bookmarks = ephy_bookmarks_get_bookmarks (eb);
-	EphyNode *topics = ephy_bookmarks_get_keywords (eb);
-	GList *types = egg_toolbars_model_get_types (model);
+	EphyNode *bookmarks;
+	EphyNode *topics;
+	GList *types;
+
+	eb = ephy_shell_get_bookmarks (ephy_shell);        
+	bookmarks = ephy_bookmarks_get_bookmarks (eb);
+	topics = ephy_bookmarks_get_keywords (eb);
+	types = egg_toolbars_model_get_types (model);
 
 	topic_type.type = gdk_atom_intern (EPHY_DND_TOPIC_TYPE, TRUE);
 	topic_type.has_data = topic_has_data;