[Xfce4-commits] <pyxfce:master> remove 'xfce-panel-enums.h' usage, part 2.

[Danny Milosavljevic]

Updating branch refs/heads/master
         to e8ae0bda3e33f0bde4ae46fc45848f575c3679aa (commit)
       from f85ff6131fd35e2d759e221aa01572db37d62c9d (commit)

commit e8ae0bda3e33f0bde4ae46fc45848f575c3679aa
Author: Danny Milosavljevic <dannym at xfce.org>
Date:   Sun Dec 26 20:01:29 2010 +0100

    remove 'xfce-panel-enums.h' usage, part 2.

 panel/enum_types.c        |   16 +++++++---------
 panel/enum_types.override |    2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/panel/enum_types.c b/panel/enum_types.c
index 8dc519f..79feb24 100644
--- a/panel/enum_types.c
+++ b/panel/enum_types.c
@@ -7,7 +7,7 @@
 #line 6 "enum_types.override"
 #include "pygobject.h"
 #include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-enums.h>
+#include <libxfce4panel/libxfce4panel-enum-types.h>
 
 extern PyTypeObject PyGtkWidget_Type;
 
@@ -27,8 +27,8 @@ static PyTypeObject *_PyGObject_Type;
 
 /* ----------- functions ----------- */
 
-PyMethodDef pyenum_types_functions[] = {
-    { NULL, NULL, 0 }
+const PyMethodDef pyenum_types_functions[] = {
+    { NULL, NULL, 0, NULL }
 };
 
 /* initialise stuff extension classes */
@@ -38,20 +38,18 @@ pyenum_types_register_classes(PyObject *d)
     PyObject *module;
 
     if ((module = PyImport_ImportModule("gobject")) != NULL) {
-        PyObject *moddict = PyModule_GetDict(module);
-
-        _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
+        _PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "GObject");
         if (_PyGObject_Type == NULL) {
             PyErr_SetString(PyExc_ImportError,
                 "cannot import name GObject from gobject");
-            return;
+            return ;
         }
     } else {
         PyErr_SetString(PyExc_ImportError,
             "could not import gobject");
-        return;
+        return ;
     }
 
 
-#line 57 "enum_types.c"
+#line 55 "enum_types.c"
 }
diff --git a/panel/enum_types.override b/panel/enum_types.override
index 79dca0a..096d70e 100644
--- a/panel/enum_types.override
+++ b/panel/enum_types.override
@@ -5,7 +5,7 @@
 headers
 #include "pygobject.h"
 #include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-enums.h>
+#include <libxfce4panel/libxfce4panel-enum-types.h>
 
 extern PyTypeObject PyGtkWidget_Type;