[gedit] Fix bad typo in the menu extesion gobject macros



commit 5bbb3da0a27d0cfffa516ec007cbee18bad42b55
Author: Paolo Borelli <pborelli gnome org>
Date:   Sat Mar 1 12:16:03 2014 +0100

    Fix bad typo in the menu extesion gobject macros
    
    Also make new() public since plugins may want to use this to provide an
    extension mechanism for their own menus (e.g. the file browser context
    menu)

 gedit/gedit-app.c            |    2 +-
 gedit/gedit-menu-extension.c |   10 ++++++----
 gedit/gedit-menu-extension.h |   19 ++++++++++---------
 3 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index dbdba3a..e310b79 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -1682,7 +1682,7 @@ _gedit_app_extend_menu (GeditApp    *app,
                }
        }
 
-       return section != NULL ? _gedit_menu_extension_new (G_MENU (section)) : NULL;
+       return section != NULL ? gedit_menu_extension_new (G_MENU (section)) : NULL;
 }
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-menu-extension.c b/gedit/gedit-menu-extension.c
index d7f1c5d..435bb95 100644
--- a/gedit/gedit-menu-extension.c
+++ b/gedit/gedit-menu-extension.c
@@ -128,9 +128,9 @@ gedit_menu_extension_init (GeditMenuExtension *menu)
 }
 
 GeditMenuExtension *
-_gedit_menu_extension_new (GMenu *menu)
+gedit_menu_extension_new (GMenu *menu)
 {
-       return g_object_new (GEDIT_TYPE_MENU, "menu", menu, NULL);
+       return g_object_new (GEDIT_TYPE_MENU_EXTENSION, "menu", menu, NULL);
 }
 
 void
@@ -139,7 +139,7 @@ gedit_menu_extension_append_menu_item (GeditMenuExtension *menu,
 {
        GeditMenuExtensionPrivate *priv;
 
-       g_return_if_fail (GEDIT_IS_MENU (menu));
+       g_return_if_fail (GEDIT_IS_MENU_EXTENSION (menu));
        g_return_if_fail (G_IS_MENU_ITEM (item));
 
        priv = gedit_menu_extension_get_instance_private (menu);
@@ -157,7 +157,7 @@ gedit_menu_extension_prepend_menu_item (GeditMenuExtension *menu,
 {
        GeditMenuExtensionPrivate *priv;
 
-       g_return_if_fail (GEDIT_IS_MENU (menu));
+       g_return_if_fail (GEDIT_IS_MENU_EXTENSION (menu));
        g_return_if_fail (G_IS_MENU_ITEM (item));
 
        priv = gedit_menu_extension_get_instance_private (menu);
@@ -175,6 +175,8 @@ gedit_menu_extension_remove_items (GeditMenuExtension *menu)
        GeditMenuExtensionPrivate *priv;
        gint i, n_items;
 
+       g_return_if_fail (GEDIT_IS_MENU_EXTENSION (menu));
+
        priv = gedit_menu_extension_get_instance_private (menu);
 
        n_items = g_menu_model_get_n_items (G_MENU_MODEL (priv->menu));
diff --git a/gedit/gedit-menu-extension.h b/gedit/gedit-menu-extension.h
index 039c965..bc1454c 100644
--- a/gedit/gedit-menu-extension.h
+++ b/gedit/gedit-menu-extension.h
@@ -18,7 +18,6 @@
  * along with gedit. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #ifndef __GEDIT_MENU_EXTENSION_H__
 #define __GEDIT_MENU_EXTENSION_H__
 
@@ -27,13 +26,13 @@
 
 G_BEGIN_DECLS
 
-#define GEDIT_TYPE_MENU                                (gedit_menu_extension_get_type ())
-#define GEDIT_MENU_EXTENSION(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEDIT_TYPE_MENU, 
GeditMenuExtension))
-#define GEDIT_MENU_EXTENSION_CONST(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEDIT_TYPE_MENU, 
GeditMenuExtension const))
-#define GEDIT_MENU_EXTENSION_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GEDIT_TYPE_MENU, 
GeditMenuExtensionClass))
-#define GEDIT_IS_MENU(obj)                     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEDIT_TYPE_MENU))
-#define GEDIT_IS_MENU_CLASS(klass)             (G_TYPE_CHECK_CLASS_TYPE ((klass), GEDIT_TYPE_MENU))
-#define GEDIT_MENU_EXTENSION_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GEDIT_TYPE_MENU, 
GeditMenuExtensionClass))
+#define GEDIT_TYPE_MENU_EXTENSION              (gedit_menu_extension_get_type ())
+#define GEDIT_MENU_EXTENSION(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GEDIT_TYPE_MENU_EXTENSION, GeditMenuExtension))
+#define GEDIT_MENU_EXTENSION_CONST(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GEDIT_TYPE_MENU_EXTENSION, GeditMenuExtension const))
+#define GEDIT_MENU_EXTENSION_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GEDIT_TYPE_MENU_EXTENSION, 
GeditMenuExtensionClass))
+#define GEDIT_IS_MENU_EXTENSION(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
GEDIT_TYPE_MENU_EXTENSION))
+#define GEDIT_IS_MENU_EXTENSION_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GEDIT_TYPE_MENU_EXTENSION))
+#define GEDIT_MENU_EXTENSION_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GEDIT_TYPE_MENU_EXTENSION, 
GeditMenuExtensionClass))
 
 typedef struct _GeditMenuExtension      GeditMenuExtension;
 typedef struct _GeditMenuExtensionClass         GeditMenuExtensionClass;
@@ -50,7 +49,7 @@ struct _GeditMenuExtensionClass
 
 GType                     gedit_menu_extension_get_type            (void) G_GNUC_CONST;
 
-GeditMenuExtension      *_gedit_menu_extension_new                 (GMenu                *menu);
+GeditMenuExtension       *gedit_menu_extension_new                 (GMenu                *menu);
 
 void                      gedit_menu_extension_append_menu_item    (GeditMenuExtension   *menu,
                                                                     GMenuItem            *item);
@@ -63,3 +62,5 @@ void                      gedit_menu_extension_remove_items        (GeditMenuExt
 G_END_DECLS
 
 #endif /* __GEDIT_MENU_EXTENSION_H__ */
+
+/* ex:set ts=8 noet: */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]