[nautilus-python: 36/40] Merged in nautilus-3.0 branch

[Adam Plumb <adamplumb src gnome org>]

commit 7665a7ab6c5f69038e4ba782fb1d65313a25079e
Merge: 1ff65f8 110eda8
Author: Adam Plumb <adamplumb gmail com>
Date:   Tue Dec 5 18:37:37 2017 -0500

    Merged in nautilus-3.0 branch

 COPYING                                            |   41 ++--
 Makefile.am                                        |    2 +
 NEWS                                               |   23 ++
 README                                             |    7 +-
 configure.in                                       |   51 ++--
 docs/Makefile.am                                   |   38 ++-
 docs/reference/nautilus-python-column-provider.xml |   32 +-
 docs/reference/nautilus-python-column.xml          |   16 +-
 docs/reference/nautilus-python-file-info.xml       |   54 ++--
 docs/reference/nautilus-python-info-provider.xml   |   66 ++--
 .../nautilus-python-location-widget-provider.xml   |   17 +-
 docs/reference/nautilus-python-menu-item.xml       |   32 +-
 docs/reference/nautilus-python-menu-provider.xml   |  225 ++++----------
 docs/reference/nautilus-python-menu.xml            |   26 +-
 .../reference/nautilus-python-operation-result.xml |   16 +-
 .../reference/nautilus-python-overview-example.xml |   64 ++--
 .../reference/nautilus-python-overview-methods.xml |    4 +-
 docs/reference/nautilus-python-overview.xml        |   27 +-
 .../nautilus-python-property-page-provider.xml     |   45 ++--
 docs/reference/nautilus-python-property-page.xml   |   16 +-
 docs/xsl/common.xsl                                |   19 ++
 docs/xsl/devhelp.xsl                               |  154 +++++++++
 docs/xsl/fixxref.py                                |   67 ++++
 docs/xsl/html.xsl                                  |  285 +++++++++++++++++
 docs/xsl/pdf-style.xsl                             |   11 +
 docs/xsl/pdf.xsl                                   |  259 +++++++++++++++
 docs/xsl/ref-html-style.xsl                        |   54 ++++
 docs/xsl/style.css                                 |   10 +
 examples/Makefile.am                               |    4 +-
 examples/background-image.py                       |   22 +-
 examples/block-size-column.py                      |   12 +-
 examples/location-widget-provider.py               |    7 +-
 examples/md5sum-property-page.py                   |   22 +-
 examples/open-terminal.py                          |   20 +-
 examples/submenu.py                                |   33 ++-
 examples/update-file-info-async.py                 |    9 +-
 m4/python.m4                                       |    2 +-
 nautilus-python.pc.in                              |    2 +-
 src/Makefile.am                                    |   24 --
 src/nautilus-python-object.c                       |  106 ++-----
 src/nautilus-python-object.h                       |   29 +-
 src/nautilus-python.c                              |  148 +--------
 src/nautilus-python.h                              |   30 +-
 src/nautilus.defs                                  |  332 --------------------
 src/nautilus.override                              |  139 --------
 src/nautilusmodule.c                               |   55 ----
 46 files changed, 1373 insertions(+), 1284 deletions(-)
---
diff --cc NEWS
index f525275,8276feb..8ce245e
--- a/NEWS
+++ b/NEWS
@@@ -1,9 -1,23 +1,32 @@@
++<<<<<<< HEAD
 +0.7.3:
 +    - Use PyCapsule_Import for pygobject as well as pygtk
 +    - Fixed bug #644399, in the property page example plugin, get the md5sum
 +        of the file contents, not the file name
 +    - Removed extraneous .cvsignore files
 +    - Fixed the update-file-info-async example plugin
++=======
+ 1.1:
+     - Added pygobject3 compatibility.  Retained pygobject 2.28.x compatibility.
+         Updated extension examples to support pygobject3.
+     - Fixed bug #660290. Updated the FSF address
+     - Fixed bug #660288. Fix autogen warnings with additional macro ACLOCAL_AMFLAGS
+     - Fixed bug #660287. Make the docdir not hard-coded
+     - Fixed bug #660286. Fixes m4 underquoting warning
+     - Fixed bug #660283. Fixes html docs installation issue
+     - Fixed bug #653169. Upated the COPYING file with the most recent GPLv2 license
+ 
+ 1.0.0:
+     - Use the gobject instrospection dynamic bindings, breaks compatibility
+         for existing extensions.
+     - For Nautilus3, the get_toolbar_items methods have been removed. (Only reporting
+         that change, it isn't up to us).  Should still work with Nautilus 2.x annotations.
+     - No longer look in the old ~/.nautilus/python-extensions or /usr/lib/nautilus/extensions2.0/python
+         folders for extensions.  Now look in ~/.local/share/nautilus-python/extensions or
+         $XDG_DATA_DIR/nautilus-python/extensions.  Extensions should be arch-independent now.
+     - General clean up of the repository, removed old .cvsignore files
+     - Updated the gtk-doc documentation and examples to work with new dynamic bindings.
++>>>>>>> nautilus-3.0
  
  0.7.2:
      - Fix to get the PyCapsule patch to work even if there is no PyCapsule 
diff --cc src/nautilus-python.c
index 99a9098,ae26660..efa1e56
--- a/src/nautilus-python.c
+++ b/src/nautilus-python.c
@@@ -44,73 -45,13 +45,16 @@@ static GArray *all_types = NULL
  static inline gboolean 
  np_init_pygobject(void)
  {
- #ifdef Py_CAPSULE_H
-       void *capsule = PyCapsule_Import("gobject._PyGObject_API", 0);
-       if (capsule)
-       {
-               _PyGObject_API = (struct _PyGObject_Functions*)capsule;
-       }
- #endif
-     PyObject *gobject = PyImport_ImportModule("gobject");
-     if (gobject != NULL)
-     {
-         PyObject *mdict = PyModule_GetDict(gobject);
-         PyObject *cobject = PyDict_GetItemString(mdict, "_PyGObject_API");
-         if (PyCObject_Check(cobject))
-         {
-             _PyGObject_API = (struct _PyGObject_Functions *)PyCObject_AsVoidPtr(cobject);
-         }
-         else
-         {
-             PyErr_SetString(PyExc_RuntimeError,
-                             "could not find _PyGObject_API object");
-                       PyErr_Print();
-                       return FALSE;
-         }
-     }
-     else
-     {
-         PyErr_Print();
-         g_warning("could not import gobject");
+     PyObject *gobject = pygobject_init (PYGOBJECT_MAJOR_VERSION, PYGOBJECT_MINOR_VERSION, 
PYGOBJECT_MICRO_VERSION);
+ 
+     if (gobject == NULL) {
+         PyErr_Print ();
          return FALSE;
      }
-       return TRUE;
+ 
++    return TRUE;
 +}
 +
- static inline gboolean 
- np_init_pygtk(void)
- {
- #ifdef Py_CAPSULE_H
-       void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0);
-       if (capsule)
-       {
-               _PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule;
-       }
- #endif
-     PyObject *pygtk = PyImport_ImportModule("gtk._gtk");
-     if (pygtk != NULL)
-     {
-               PyObject *module_dict = PyModule_GetDict(pygtk);
-               PyObject *cobject = PyDict_GetItemString(module_dict, "_PyGtk_API");
-               if (PyCObject_Check(cobject))
-               {
-                       _PyGtk_API = (struct _PyGtk_FunctionStruct*)
-                               PyCObject_AsVoidPtr(cobject);
-               }
-               else
-               {
-                       PyErr_SetString(PyExc_RuntimeError,
-                                       "could not find _PyGtk_API object");
-                       PyErr_Print();
-                       return FALSE;
-               }
-     }
-     else
-     {
-         PyErr_Print();
-         g_warning("could not import gtk._gtk");
-         return FALSE;
-     }
        return TRUE;
  }