[Xfce4-commits] <xfce4-panel:devel> Merge branch 'master' of git at git.xfce.org:nick/xfce4-panel

[Nick Schermer]

Updating branch refs/heads/devel
         to c656f23226dcbc6c4a36ca46eb536006e3df4f4d (commit)
       from fab9466550ad134e068ecde9e6bda72570c3229e (commit)

commit c656f23226dcbc6c4a36ca46eb536006e3df4f4d
Merge: fab9466550ad134e068ecde9e6bda72570c3229e 28526cf4dfc9d6c9a577dff4fff44b21d52479aa
Author: Nick Schermer <nick at xfce.org>
Date:   Sat May 30 20:47:29 2009 +0200

    Merge branch 'master' of git at git.xfce.org:nick/xfce4-panel
    
    Conflicts:
    	panel/panel-module-factory.h
    	panel/panel-module.h

commit 28526cf4dfc9d6c9a577dff4fff44b21d52479aa
Author: Nick Schermer <nick at xfce.org>
Date:   Sun May 31 08:54:15 2009 +0200

    Set function types in panel headers.

 panel/panel-itembar.h         |    2 +-
 panel/panel-module-factory.h  |    4 ++--
 panel/panel-module.h          |   18 +++++++++++-------
 panel/panel-plugin-external.h |    2 +-
 panel/panel-window.h          |    2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/panel/panel-itembar.h b/panel/panel-itembar.h
index 3bdc7f8..cc4b6a6 100644
--- a/panel/panel-itembar.h
+++ b/panel/panel-itembar.h
@@ -40,7 +40,7 @@ typedef struct _PanelItembarChild PanelItembarChild;
 
 GType           panel_itembar_get_type              (void) G_GNUC_CONST;
 
-GtkWidget      *panel_itembar_new                   (void);
+GtkWidget      *panel_itembar_new                   (void) G_GNUC_MALLOC;
 
 void            panel_itembar_set_sensitive         (PanelItembar   *itembar,
                                                      gboolean        sensitive);
diff --git a/panel/panel-module-factory.h b/panel/panel-module-factory.h
index 0b27f00..61fae84 100644
--- a/panel/panel-module-factory.h
+++ b/panel/panel-module-factory.h
@@ -45,7 +45,7 @@ PanelModuleFactory *panel_module_factory_get                 (void);
 
 void                panel_module_factory_force_all_external  (void);
 
-gboolean            panel_module_factory_has_launcher        (PanelModuleFactory  *factory);
+gboolean            panel_module_factory_has_launcher        (PanelModuleFactory  *factory) G_GNUC_PURE;
 
 void                panel_module_factory_emit_unique_changed (PanelModule         *module);
 
@@ -61,7 +61,7 @@ GtkWidget          *panel_module_factory_new_plugin          (PanelModuleFactory
                                                               const gchar         *name,
                                                               GdkScreen           *screen,
                                                               gint                 unique_id,
-                                                              gchar              **arguments);
+                                                              gchar              **arguments) G_GNUC_MALLOC;
 
 G_END_DECLS
 
diff --git a/panel/panel-module.h b/panel/panel-module.h
index b42c7ef..80f3265 100644
--- a/panel/panel-module.h
+++ b/panel/panel-module.h
@@ -41,29 +41,33 @@ typedef struct _PanelModule      PanelModule;
 GType        panel_module_get_type                 (void) G_GNUC_CONST;
 
 PanelModule *panel_module_new_from_desktop_file    (const gchar             *filename,
+<<<<<<< HEAD:panel/panel-module.h
                                                     const gchar             *name,
                                                     gboolean                 force_external);
+=======
+                                                    const gchar             *name) G_GNUC_MALLOC;
+>>>>>>> 28526cf4dfc9d6c9a577dff4fff44b21d52479aa:panel/panel-module.h
 
 GtkWidget   *panel_module_new_plugin               (PanelModule             *module,
                                                     GdkScreen               *screen,
                                                     gint                     unique_id,
-                                                    gchar                  **arguments);
+                                                    gchar                  **arguments) G_GNUC_MALLOC;
 
-const gchar *panel_module_get_name                 (PanelModule             *module);
+const gchar *panel_module_get_name                 (PanelModule             *module) G_GNUC_PURE;
 
-const gchar *panel_module_get_filename             (PanelModule             *module);
+const gchar *panel_module_get_filename             (PanelModule             *module) G_GNUC_PURE;
 
-const gchar *panel_module_get_display_name         (PanelModule             *module);
+const gchar *panel_module_get_display_name         (PanelModule             *module) G_GNUC_PURE;
 
-const gchar *panel_module_get_comment              (PanelModule             *module);
+const gchar *panel_module_get_comment              (PanelModule             *module) G_GNUC_PURE;
 
-const gchar *panel_module_get_icon_name            (PanelModule             *module);
+const gchar *panel_module_get_icon_name            (PanelModule             *module) G_GNUC_PURE;
 
 PanelModule *panel_module_get_from_plugin_provider (XfcePanelPluginProvider *provider);
 
 gboolean     panel_module_is_valid                 (PanelModule             *module);
 
-gboolean     panel_module_is_usable                (PanelModule             *module);
+gboolean     panel_module_is_usable                (PanelModule             *module) G_GNUC_PURE;
 
 G_END_DECLS
 
diff --git a/panel/panel-plugin-external.h b/panel/panel-plugin-external.h
index d0230a6..f74d020 100644
--- a/panel/panel-plugin-external.h
+++ b/panel/panel-plugin-external.h
@@ -41,7 +41,7 @@ GType      panel_plugin_external_get_type             (void) G_GNUC_CONST;
 
 GtkWidget *panel_plugin_external_new                  (PanelModule          *module,
                                                        gint                  unique_id,
-                                                       gchar               **arguments);
+                                                       gchar               **arguments) G_GNUC_MALLOC;
 
 void       panel_plugin_external_set_background_alpha (PanelPluginExternal  *external,
                                                        gint                  percentage);
diff --git a/panel/panel-window.h b/panel/panel-window.h
index 21dfe68..69851c5 100644
--- a/panel/panel-window.h
+++ b/panel/panel-window.h
@@ -36,7 +36,7 @@ typedef struct _PanelWindow      PanelWindow;
 
 GType      panel_window_get_type         (void) G_GNUC_CONST;
 
-GtkWidget *panel_window_new              (void);
+GtkWidget *panel_window_new              (void) G_GNUC_MALLOC;
 
 void       panel_window_set_povider_info (PanelWindow *window,
                                           GtkWidget   *provider);