Commit bc6e3e3f authored by Paolo Borelli's avatar Paolo Borelli Committed by Paolo Borelli

merge gnome-2-6 branch fixes into HEAD.

2004-06-25  Paolo Borelli  <pborelli@katamail.com>

	* merge gnome-2-6 branch fixes into HEAD.
parent 6d4f0350
2004-06-25 Paolo Borelli <pborelli@katamail.com>
* merge gnome-2-6 branch fixes into HEAD.
2004-06-25 Paolo Borelli <pborelli@katamail.com>
* configure.in:
* README:
* NEWS: release 2.6.2
2004-05-29 Christian Rose <menthos@menthos.com>
* configure.in: Added "tk" to ALL_LINGUAS.
......
============
gedit 2.6.2
============
Fixes
=====
- Bug #143410 (problem with GOK and Find dialog) (padraig.obriain@sun.com)
- Bug #144525 (include config.h) (Takao Fujiwara)
- Update recent-files stuff (Frederic Crozat)
New and updated translations
============================
- Evgeni Boevski (bg)
- Jordi Mallach (ca)
- Gurban Mühemmet Tewekgeli (tk)
- Ahmad Riza H Nst (id)
- Raphael Higino (pt_BR)
============
gedit 2.6.1
============
Fixes
=====
- Bug #137329 (Wrong filename got after Save as) (Paolo Maggi)
- Bug #138051 (Reproducible search/replace dialog application lockup) (Paolo M.)
- Fixed some mem leaks (Paolo Borelli)
- Enabled vfs file choosing (Paolo M.)
- Bug #137805 (Text area unfocused after opening) (Paolo M.)
- Set the window type of the tag list window to UTILITY (Rob Adams)
- The indent plugin now does not indent empty lines (Paolo B.)
New and updated translations
============================
- Adam Weinberger (en_CA)
- Aleix Badia i Bosch (ca)
- Amanpreet Singh Alam (pa)
- Christophe Merlet (RedFox) (fr)
- Gareth Owen (en_GB)
- Helgi Þormar Þorbjörnsson (is)
- John C Barstow (mi)
- Robert Sedak (hr)
- Laszlo Dvornik (hu)
- Pablo Saratxaga (wa)
- Zuza Software Foundation (af)
============
gedit 2.6.0
============
......
General Information
===================
This is version 2.6.0 of gedit. gedit is a small and lightweight UTF-8 text
This is version 2.6.2 of gedit. gedit is a small and lightweight UTF-8 text
editor for the GNOME environment.
Designed for the X Window System, it uses the GTK+ 2.2 and GNOME 2.4 libraries.
Designed for the X Window System, it uses the GTK+ 2.4 and GNOME 2.6 libraries.
Complete GNOME integration is featured, with support for Drag and Drop (DnD)
between Nautilus (the GNOME file manager) and the use of the GNOME help system,
the GNOME Virtual File System and the GNOME print framework.
......@@ -60,12 +60,12 @@ Information about gedit mailing lists can be found at
Installation
============
gedit requires GTK+-2.3.x, GtkSourceView 0.9.0 and GNOME 2.5.x libraries.
gedit requires GTK+-2.4.x, GtkSourceView 1.0.0 and GNOME 2.6.x libraries.
Simple install procedure:
% gzip -cd gedit-2.5.91.tar.gz | tar xvf - # unpack the sources
% cd gedit-2.5.91 # change to the toplevel directory
% gzip -cd gedit-2.6.1.tar.gz | tar xvf - # unpack the sources
% cd gedit-2.6.1 # change to the toplevel directory
% ./configure # run the `configure' script
% make # build gedit
[ Become root if necessary ]
......
......@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
AC_INIT(gedit, 2.6.0, http://bugzilla.gnome.org/enter_bug.cgi?product=gedit)
AC_INIT(gedit, 2.6.2, http://bugzilla.gnome.org/enter_bug.cgi?product=gedit)
AC_CONFIG_SRCDIR(gedit/gedit2.c)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
......@@ -68,9 +68,9 @@ AC_SUBST(PSPELL_LIBS)
dnl
dnl Start of pkg-config checks
dnl
PKG_CHECK_MODULES(GEDIT, libgnomeui-2.0 >= 2.5.0 libglade-2.0 >= 2.0.0
eel-2.0 >= 2.5.0 gtksourceview-1.0 >= 0.9.0
libgnomeprintui-2.2 >= 2.5.0)
PKG_CHECK_MODULES(GEDIT, libgnomeui-2.0 >= 2.6.0 libglade-2.0 >= 2.3.6
eel-2.0 >= 2.6.0 gtksourceview-1.0 >= 1.0.0
libgnomeprintui-2.2 >= 2.6.0)
GEDIT_LIBS="${GEDIT_LIBS}"
AC_SUBST(GEDIT_LIBS)
AC_SUBST(GEDIT_CFLAGS)
......
2004-06-25 Paolo Borelli <pborelli@katamail.com>
* dialogs/replace.glade2: fix bug #143410.
Patch by <padraig.obriain@sun.com>
2004-06-25 Paolo Borelli <pborelli@katamail.com>
* gedit-encodings-option-menu.c: include config.h, patch from
Takao Fujiwara. Fixes 144525.
2004-06-11 Kaushal Kumar <kaushal.kumar@wipro.com>
Patch by: Archana Shah <archana.shah@wipro.com>
......@@ -11,6 +21,40 @@
Fixes bug #143688.
2004-04-27 Paolo Maggi <paolo.maggi@polito.it>
* bonobo-mdi.c (book_add_view): calls set_active_view (fixes
bug #137805: Text area unfocused after opening)
(bonobo_mdi_set_active_view): removed unused window variable
(bonobo_mdi_add_views): sets as active the last added view
2004-04-27 Paolo Maggi <paolo.maggi@polito.it>
* dialogs/gedit-preferences-dialog.c (get_selected_style)
(style_button_toggled): check if style = NULL
* gedit-file-selector-util.c (create_gtk_selector)
(run_file_selector) (gedit_file_selector_open)
(gedit_file_selector_open_multi) (gedit_file_selector_save):
really fixes bug #137329: Wrong filename got after Save as
* gedit-file-selector-util.h (gedit_file_selector_save): added
untitled_name parameter
* gedit-file.c (gedit_file_save_as): use the new gedit_file_selector_save
prototype
2004-04-17 Paolo Maggi <paolo.maggi@polito.it>
* gedit-file-selector-util.c (create_gtk_selector): try to call
gtk_file_chooser_set_filename before calling gtk_file_chooser_set_current_name
(run_file_selector): Enable vfs file choosing
* gedit-file.c (gedit_file_save_as): does not convert "Untitled" to
current locale (fixes bug #137329: Wrong filename got after Save as)
2004-04-05 Paolo Borelli <pborelli@katamail.com>
* gedit-file.c: s/definitively/permanently, from cs_is@yahoo.com.
......
......@@ -996,7 +996,10 @@ book_add_view (BonoboMDI *mdi, GtkNotebook *book, GtkWidget *view, gboolean set_
gtk_notebook_append_page (book, view, title);
if (set_page && (g_list_length (book->children) > 1))
{
set_page_by_widget (book, view);
set_active_view (mdi, view);
}
gedit_debug (DEBUG_MDI, "END");
}
......@@ -1478,8 +1481,6 @@ set_active_view (BonoboMDI *mdi, GtkWidget *view)
void
bonobo_mdi_set_active_view (BonoboMDI *mdi, GtkWidget *view)
{
GtkWindow *window;
gedit_debug (DEBUG_MDI, "");
g_return_if_fail (mdi != NULL);
......@@ -1489,8 +1490,6 @@ bonobo_mdi_set_active_view (BonoboMDI *mdi, GtkWidget *view)
set_page_by_widget (GTK_NOTEBOOK (view->parent), view);
window = GTK_WINDOW (bonobo_mdi_get_window_from_view (view));
set_active_view (mdi, view);
gedit_debug (DEBUG_MDI, "END");
......@@ -1597,7 +1596,7 @@ bonobo_mdi_add_views (BonoboMDI *mdi, GSList *children)
if (bonobo_mdi_add_view_real (mdi,
BONOBO_MDI_CHILD (children->data),
(i == 0)))
(children->next == NULL)))
{
++i;
}
......
......@@ -852,6 +852,9 @@ get_selected_style (GeditPreferencesDialog *dlg)
style = gtk_source_language_get_tag_style (lang, id);
def_style = gtk_source_language_get_tag_default_style (lang, id);
if (style == NULL)
return def_style;
style->is_default = TRUE;
def_style->is_default = TRUE;
......@@ -947,6 +950,10 @@ style_button_toggled (GtkToggleButton *button,
lang = get_selected_language (dlg);
style = gtk_source_language_get_tag_style (lang, id);
if (style == NULL)
{
style = gtk_source_tag_style_new ();
}
new_style = gtk_source_tag_style_copy (style);
......
......@@ -109,7 +109,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">search_for_text_entry</property>
<property name="mnemonic_widget">search_for_text_entry_list</property>
</widget>
<packing>
<property name="left_attach">0</property>
......@@ -134,7 +134,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">replace_with_text_entry</property>
<property name="mnemonic_widget">replace_with_text_entry_list</property>
</widget>
<packing>
<property name="left_attach">0</property>
......
......@@ -27,6 +27,10 @@
* See the ChangeLog files for a list of changes.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
......
......@@ -3,7 +3,7 @@
* gedit-file-selector-util.c
* This file is part of gedit
*
* Copyright (C) 2001-2002 Paolo Maggi
* Copyright (C) 2001-2004 Paolo Maggi
*
* 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
......@@ -22,7 +22,7 @@
*/
/*
* Modified by the gedit Team, 1998-2002. See the AUTHORS file for a
* Modified by the gedit Team, 2001-2004. See the AUTHORS file for a
* list of people on the gedit Team.
* See the ChangeLog files for a list of changes.
*/
......@@ -337,6 +337,7 @@ create_gtk_selector (GtkWindow *parent,
const char *title,
const char *default_path,
const char *default_filename,
const char *untitled_name,
gboolean use_encoding,
const GeditEncoding *encoding)
{
......@@ -415,12 +416,36 @@ create_gtk_selector (GtkWindow *parent,
encoding);
}
if (default_path)
gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (filesel), default_path);
if (default_filename)
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filesel), default_filename);
if (mode != FILESEL_SAVE)
{
if (default_path != NULL)
gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (filesel), default_path);
}
else
{
if (default_filename == NULL)
{
if (default_path != NULL)
{
gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (filesel), default_path);
}
g_return_val_if_fail (untitled_name != NULL, GTK_WINDOW (filesel));
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filesel), untitled_name);
}
else
{
if (default_path != NULL)
{
gchar *uri;
uri = g_strconcat (default_path, "/", default_filename, NULL);
gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (filesel), uri);
g_free (uri);
}
}
}
if (mode == FILESEL_OPEN_MULTI)
gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (filesel), TRUE);
......@@ -435,6 +460,7 @@ run_file_selector (GtkWindow *parent,
const char *title,
const char *default_path,
const char *default_filename,
const char *untitled_name,
const GeditEncoding **encoding)
{
......@@ -447,12 +473,16 @@ run_file_selector (GtkWindow *parent,
title,
default_path,
default_filename,
untitled_name,
(encoding != NULL),
(encoding != NULL) ? *encoding : NULL);
SET_MODE (dialog, mode);
SET_ENABLE_VFS (dialog, enable_vfs);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog),
!enable_vfs);
gtk_window_set_modal (dialog, TRUE);
gtk_widget_show_all (GTK_WIDGET (dialog));
......@@ -502,7 +532,7 @@ gedit_file_selector_open (GtkWindow *parent,
{
return run_file_selector (parent, enable_vfs, FILESEL_OPEN,
title ? title : _("Select a file to open"),
default_path, NULL, encoding);
default_path, NULL, NULL, encoding);
}
/**
......@@ -528,7 +558,7 @@ gedit_file_selector_open_multi (GtkWindow *parent,
{
return run_file_selector (parent, enable_vfs, FILESEL_OPEN_MULTI,
title ? title : _("Select files to open"),
default_path, NULL, encoding);
default_path, NULL, NULL, encoding);
}
/**
......@@ -538,6 +568,7 @@ gedit_file_selector_open_multi (GtkWindow *parent,
* @title: optional window title to use
* @default_path: optional directory to start in (must be an URI)
* @default_filename: optional file name to default to
* @untitled_name: optional untitled name (valid UTF-8)
*
* Creates and shows a modal save file dialog, waiting for the user to
* select a file or cancel before returning.
......@@ -551,9 +582,13 @@ gedit_file_selector_save (GtkWindow *parent,
const char *title,
const char *default_path,
const char *default_filename,
const char *untitled_name,
const GeditEncoding **encoding)
{
g_return_val_if_fail (((default_filename != NULL) && (untitled_name == NULL)) ||
((default_filename == NULL) && (untitled_name != NULL)), NULL);
return run_file_selector (parent, enable_vfs, FILESEL_SAVE,
title ? title : _("Select a filename to save"),
default_path, default_filename, encoding);
default_path, default_filename, untitled_name, encoding);
}
......@@ -69,6 +69,7 @@ char *gedit_file_selector_save (GtkWindow *parent,
const char *title,
const char *default_path,
const char *default_filename,
const char *untitled_name,
const GeditEncoding **encoding);
G_END_DECLS
......
......@@ -338,8 +338,8 @@ gedit_file_save_as (GeditMDIChild *child)
GeditDocument *doc;
GtkWidget *view;
gchar *fname = NULL;
gchar *untitled_name = NULL;
gchar *path = NULL;
gchar *raw_uri = NULL;
const GeditEncoding *encoding;
gedit_debug (DEBUG_FILE, "");
......@@ -361,37 +361,42 @@ gedit_file_save_as (GeditMDIChild *child)
bonobo_mdi_set_active_view (BONOBO_MDI (gedit_mdi), view);
}
raw_uri = gedit_document_get_raw_uri (doc);
if (gedit_document_is_untitled (doc))
{
char *tmpstr;
path = (gedit_default_path != NULL) ?
g_strdup (gedit_default_path) : NULL;
tmpstr = gedit_document_get_uri (doc);
fname = g_filename_from_utf8 (tmpstr, -1, NULL, NULL, NULL);
if (!fname)
/* FIXME: should fname remain NULL in this case? - Paolo */
fname = g_strdup ("Untitled"); /* Use ASCII */
g_free (tmpstr);
untitled_name = gedit_document_get_uri (doc);
if (untitled_name == NULL)
untitled_name = g_strdup ("Untitled"); /* Use ASCII */
g_return_val_if_fail (untitled_name != NULL, FALSE);
}
else
{
g_return_val_if_fail (raw_uri != NULL, FALSE);
gchar *raw_uri = gedit_document_get_raw_uri (doc);
fname = eel_uri_get_basename (raw_uri);
g_return_val_if_fail (raw_uri != NULL, FALSE);
if (gedit_utils_uri_has_file_scheme (raw_uri))
{
fname = eel_uri_get_basename (raw_uri);
g_return_val_if_fail (fname != NULL, FALSE);
path = get_dirname_from_uri (raw_uri);
}
else
{
untitled_name = gedit_document_get_short_name (doc);
g_return_val_if_fail (untitled_name != NULL, FALSE);
path = (gedit_default_path != NULL) ?
g_strdup (gedit_default_path) : NULL;
}
g_free (raw_uri);
}
g_return_val_if_fail (fname != NULL, FALSE);
encoding = gedit_document_get_encoding (doc);
file = gedit_file_selector_save (
......@@ -400,13 +405,12 @@ gedit_file_save_as (GeditMDIChild *child)
_("Save as..."),
path,
fname,
untitled_name,
&encoding);
g_free (raw_uri);
g_free (fname);
if (path != NULL)
g_free (path);
g_free (untitled_name);
g_free (path);
if (file != NULL)
{
......
......@@ -10,9 +10,9 @@ It will probably crash and you will lose your data.
If you are looking for a stable release of gedit, either download
it from:
http://ftp.gnome.org/pub/gnome/sources/gedit/2.4/
http://ftp.gnome.org/pub/gnome/sources/gedit/2.6/
Or checkout the gnome-2-4 branch of the gedit module from gnome CVS.
Or checkout the gnome-2-6 branch of the gedit module from gnome CVS.
Thanks,
The gedit team
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment