GNOME.org
 

[gedit/libgpe: 78/79] Merge remote branch 'origin/master' into libgpe

commit 14bd5a95df0a048772e40f25340fb8e150218a3c
Merge: 8b9739c... 41fb213...
Author: Steve Frécinaux <code istique net>
Date:   Sun Dec 6 18:24:11 2009 +0100

    Merge remote branch 'origin/master' into libgpe
    
    Conflicts:
    	Makefile.am
    	gedit/Makefile.am
    	gedit/gedit-window.c
    	plugin-loaders/python/gedit-plugin-loader-python.c
    	plugins/indent/gedit-indent-plugin.c
    	plugins/indent/gedit-indent-plugin.h

 Makefile.am                                     |    6 +-
 NEWS                                            |   40 +
 README                                          |    6 +-
 bindings/python/gedit.override                  |    2 +-
 configure.ac                                    |   97 +-
 data/gedit.schemas.in.in                        |    2 +-
 gedit/Makefile.am                               |   38 +-
 gedit/gedit-app.c                               |   83 +-
 gedit/gedit-commands-file.c                     |   58 +-
 gedit/gedit-dirs.c                              |   83 +-
 gedit/gedit-document-loader.c                   |  144 +-
 gedit/gedit-document-loader.h                   |   21 +-
 gedit/gedit-document-saver.c                    |   41 +-
 gedit/gedit-document-saver.h                    |   13 +-
 gedit/gedit-document.c                          |  516 ++-
 gedit/gedit-document.h                          |   18 +-
 gedit/gedit-gio-document-loader.c               |  104 +-
 gedit/gedit-gio-document-saver.c                |   70 +-
 gedit/gedit-help.c                              |   15 +
 gedit/gedit-local-document-saver.c              |   64 +-
 gedit/gedit-prefs-manager.h                     |   11 +
 gedit/gedit-ui.h                                |   16 +-
 gedit/gedit-window-private.h                    |    2 +
 gedit/gedit-window.c                            |  121 +-
 gedit/gedit-window.h                            |    2 +
 gedit/gedit.c                                   |   19 +-
 gedit/osx/Makefile.am                           |   23 +
 gedit/osx/gedit-osx-delegate.h                  |   16 +
 gedit/osx/gedit-osx-delegate.m                  |   83 +
 gedit/osx/gedit-osx.c                           |   94 +
 gedit/osx/gedit-osx.h                           |   17 +
 gedit/smclient/Makefile.am                      |    2 +-
 osx/Info.plist                                  |  260 ++
 osx/dmg-data/background.png                     |  Bin 0 -> 31115 bytes
 osx/dmg-data/background.svg                     |  395 ++
 osx/gedit.bundle                                |  111 +
 osx/gedit.icns                                  |  Bin 0 -> 175597 bytes
 osx/gtkrc                                       |  428 ++
 osx/launcher.sh                                 |   58 +
 osx/makebundle.sh                               |   12 +
 osx/makedmg.sh                                  |   64 +
 osx/template.dmg                                |  Bin 0 -> 19345408 bytes
 plugins/Makefile.am                             |    2 -
 plugins/checkupdate/gedit-check-update-plugin.c |   24 +-
 plugins/externaltools/tools/ElementTree.py      | 1254 ------
 plugins/externaltools/tools/Makefile.am         |    1 -
 plugins/externaltools/tools/__init__.py         |   11 +-
 plugins/externaltools/tools/capture.py          |   14 +-
 plugins/externaltools/tools/functions.py        |   11 +-
 plugins/externaltools/tools/library.py          |   17 +-
 plugins/externaltools/tools/manager.py          |   22 +-
 plugins/filebrowser/gedit-file-browser-store.c  |   26 +-
 plugins/filebrowser/gedit-file-browser-view.c   |    2 +-
 plugins/filebrowser/gedit-file-browser-widget.c |   16 +
 plugins/indent/Makefile.am                      |   34 -
 plugins/indent/gedit-indent-plugin.c            |  333 --
 plugins/indent/gedit-indent-plugin.h            |   75 -
 plugins/indent/indent.gedit-plugin.desktop.in   |    9 -
 plugins/quickopen/quickopen/windowhelper.py     |    2 +-
 plugins/snippets/data/lang/snippets.lang        |   32 +-
 plugins/snippets/snippets/Document.py           |   40 +-
 plugins/snippets/snippets/ElementTree.py        | 1254 ------
 plugins/snippets/snippets/Exporter.py           |    2 +-
 plugins/snippets/snippets/Helper.py             |    6 +-
 plugins/snippets/snippets/Library.py            |    2 +-
 plugins/snippets/snippets/Makefile.am           |    1 -
 plugins/snippets/snippets/Placeholder.py        |    5 +-
 plugins/spell/gedit-spell-checker-language.c    |    2 +-
 plugins/spell/gedit-spell-plugin.c              |  234 +-
 po/LINGUAS                                      |    1 +
 po/POTFILES.in                                  |    3 +-
 po/POTFILES.skip                                |    1 -
 po/el.po                                        | 2306 +++++------
 po/en shaw po                                   | 5067 +++++++++++++++++++++++
 po/es.po                                        |  293 +-
 po/ro.po                                        |   92 +-
 po/sl.po                                        |  695 ++--
 po/ta.po                                        |  582 ++--
 po/zh_CN.po                                     |  196 +-
 79 files changed, 10167 insertions(+), 5655 deletions(-)
---
diff --cc Makefile.am
index c61614f,c5dc2a5..df61aea
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,7 -1,11 +1,11 @@@
  ## Process this file with automake to produce Makefile.in
  ACLOCAL_AMFLAGS = -I m4
  
- SUBDIRS = gedit bindings pixmaps po help data plugins docs win32
 -SUBDIRS = gedit pixmaps po data plugin-loaders plugins docs win32
++SUBDIRS = gedit bindings pixmaps po data plugins docs win32
+ 
+ if !OS_OSX
+ SUBDIRS += help
+ endif
  
  distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper
  
diff --cc configure.ac
index ce01f01,6d84910..a095df9
--- a/configure.ac
+++ b/configure.ac
@@@ -246,14 -282,12 +285,14 @@@ dnl ===================================
  
  PKG_CHECK_MODULES(GEDIT, [
  	libxml-2.0 >= 2.5.0
- 	glib-2.0 >= 2.18.0
+ 	glib-2.0 >= 2.22.0
  	gthread-2.0 >= 2.13.0
- 	gio-2.0 >= 2.16.0
+ 	gio-2.0 >= 2.22.0
  	gtk+-2.0 >= 2.16.0
- 	gtksourceview-2.0 >= 2.4.0
+ 	gtksourceview-2.0 >= 2.8.0
  	gconf-2.0 >= 1.1.11
 +	libpeas-2.0 >= 2.18.0
 +	libpeasui-2.0 >= 2.18.0
  ])
  
  dnl FIXME: Remove this when removing gedit-message-area
diff --cc gedit/Makefile.am
index 9e995d5,007dbf0..3d6d9ac
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@@ -1,9 -1,13 +1,13 @@@
  ## Process this file with automake to produce Makefile.in
  SUBDIRS = dialogs smclient
  
+ if OS_OSX
+ SUBDIRS += osx
+ endif
+ 
  bin_PROGRAMS = gedit
  
 -noinst_LTLIBRARIES = libgedit.la
 +lib_LTLIBRARIES = libgedit-2.20.la
  
  INCLUDES =								\
  	-I$(top_srcdir)							\
@@@ -18,27 -23,32 +23,32 @@@
  gedit_SOURCES = \
  	gedit.c
  
- gedit_LDADD = libgedit-2.20.la $(GEDIT_LIBS) $(EGG_SMCLIENT_LIBS)
 -gedit_LDADD = libgedit.la $(GEDIT_LIBS) $(IGE_MAC_LIBS) $(EGG_SMCLIENT_LIBS)
++gedit_LDADD = libgedit-2.20.la $(GEDIT_LIBS) $(IGE_MAC_LIBS) $(EGG_SMCLIENT_LIBS)
   
  if PLATFORM_WIN32
- gedit_LDFLAGS = -Wl,--export-all-symbols -mwindows -Wl,--out-implib,libgedit-$(GEDIT_API_VERSION).a
+ gedit_LDFLAGS = -Wl,--export-all-symbols -Wl,--out-implib,libgedit-$(GEDIT_API_VERSION).a
+ if OS_WIN32
+ gedit_LDFLAGS += -mwindows
+ endif
  else
 -gedit_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
 +gedit_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[^_].*"
  endif
  
- if PLATFORM_OSX
- gedit_LDFLAGS += -framework Carbon
- endif
- 
 -libgedit_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
 +libgedit_2_20_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[^_].*"
  
 -libgedit_la_LIBADD = \
 +libgedit_2_20_la_LIBADD = \
  	dialogs/libdialogs.la		\
  	smclient/libeggsmclient.la
  
  # GEDIT_LIBS must be the last to ensure correct order on some platforms
 -libgedit_la_LIBADD += $(GEDIT_LIBS)
 +libgedit_2_20_la_LIBADD += $(GEDIT_LIBS)
  
+ if OS_OSX
+ gedit_LDFLAGS += -framework Carbon
+ 
 -libgedit_la_LIBADD += osx/libosx.la
++libgedit_2_20_la_LIBADD += osx/libosx.la
+ endif
+ 
  BUILT_SOURCES = 			\
  	gedit-enum-types.c		\
  	gedit-enum-types.h		\
@@@ -169,6 -188,10 +181,10 @@@ libgedit_2_20_la_SOURCES = 			
  	$(NOINST_H_FILES)		\
  	$(INST_H_FILES)
  
+ if OS_WIN32
 -libgedit_la_SOURCES += gedit-metadata-manager.c 
++libgedit_2_20_la_SOURCES += gedit-metadata-manager.c 
+ endif
+ 
  gedit-enum-types.h: gedit-enum-types.h.template $(INST_H_FILES) $(GLIB_MKENUMS)
  	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gedit-enum-types.h.template $(INST_H_FILES)) > $@
  
diff --cc gedit/gedit-window.c
index bf1a7e6,976061a..096cb8f
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@@ -3302,29 -3349,14 +3349,14 @@@ notebook_tab_removed (GeditNotebook *no
  		}
  	}
  
- 	/* Set sensitivity */
+ 	update_sensitivity_according_to_open_tabs (window);
+ 
  	if (window->priv->num_tabs == 0)
  	{
- 		if (gtk_action_group_get_sensitive (window->priv->action_group))
- 			gtk_action_group_set_sensitive (window->priv->action_group,
- 							FALSE);
- 
- 		action = gtk_action_group_get_action (window->priv->action_group,
- 						      "ViewHighlightMode");
- 		gtk_action_set_sensitive (action, FALSE);
- 
 -		gedit_plugins_engine_update_plugins_ui (gedit_plugins_engine_get_default (),
 -							 window);
 +		peas_engine_update_plugins_ui (gedit_plugins_engine_get_default (),
 +					      G_OBJECT (window));
  	}
  
- 	if (window->priv->num_tabs <= 1)
- 	{
- 		action = gtk_action_group_get_action (window->priv->action_group,
- 						     "DocumentsMoveToNewWindow");
- 		gtk_action_set_sensitive (action,
- 					  FALSE);
- 	}
- 
  	update_window_state (window);
  
  	g_signal_emit (G_OBJECT (window), signals[TAB_REMOVED], 0, tab);	
diff --cc plugins/spell/gedit-spell-plugin.c
index c37f96b,9d7ad04..3a27c93
--- a/plugins/spell/gedit-spell-plugin.c
+++ b/plugins/spell/gedit-spell-plugin.c
@@@ -32,10 -32,8 +32,9 @@@
  #include <gmodule.h>
  
  #include <gedit/gedit-debug.h>
- #include <gedit/gedit-metadata-manager.h>
  #include <gedit/gedit-prefs-manager.h>
  #include <gedit/gedit-statusbar.h>
 +#include <gedit/gedit-window.h>
  
  #include "gedit-spell-checker.h"
  #include "gedit-spell-checker-dialog.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]