Merge branch 'master' of https://github.com/mate-desktop/mate-control-center

1 files changed, 74 insertions, 54 deletions

diff --git a/capplets/default-applications/mate-da-item.h b/capplets/default-applications/mate-da-item.h
index 81223f4e..b6a3b573 100644
--- a/capplets/default-applications/mate-da-item.h
+++ b/capplets/default-applications/mate-da-item.h
@@ -23,59 +23,79 @@
 
 #include <glib.h>
 
-typedef struct _MateDAItem MateDAItem;
-
-typedef struct _MateDAWebItem MateDAWebItem;
-typedef struct _MateDATermItem MateDATermItem;
-typedef struct _MateDASimpleItem MateDASimpleItem;
-typedef struct _MateDAVisualItem MateDAVisualItem;
-typedef struct _MateDAMobilityItem MateDAMobilityItem;
-
-struct _MateDAItem {
-    gchar *name;
-    gchar *executable;
-    gchar *command;
-    gchar *icon_name;
-    gchar *icon_path;
-};
-
-struct _MateDAWebItem {
-    MateDAItem generic;
-    gboolean run_in_terminal;
-    gboolean netscape_remote;
-    gchar *tab_command;
-    gchar *win_command;
-};
-
-struct _MateDASimpleItem {
-    MateDAItem generic;
-    gboolean run_in_terminal;
-};
-
-struct _MateDATermItem {
-    MateDAItem generic;
-    gchar *exec_flag;
-};
-
-struct _MateDAVisualItem {
-    MateDAItem generic;
-    gboolean run_at_startup;
-};
-
-struct _MateDAMobilityItem {
-    MateDAItem generic;
-    gboolean run_at_startup;
-};
-
-MateDAWebItem* mate_da_web_item_new (void);
-MateDATermItem* mate_da_term_item_new (void);
-MateDASimpleItem* mate_da_simple_item_new (void);
-MateDAVisualItem* mate_da_visual_item_new (void);
-MateDAMobilityItem* mate_da_mobility_item_new (void);
-void mate_da_web_item_free (MateDAWebItem *item);
-void mate_da_term_item_free (MateDATermItem *item);
-void mate_da_simple_item_free (MateDASimpleItem *item);
-void mate_da_visual_item_free (MateDAVisualItem *item);
-void mate_da_mobility_item_free (MateDAMobilityItem *item);
+typedef struct _MateDAItem {
+	gchar* name;
+	gchar* executable;
+	gchar* command;
+	gchar* icon_name;
+	gchar* icon_path;
+} MateDAItem;
+
+typedef struct _MateDAWebItem {
+	MateDAItem generic;
+	gboolean run_in_terminal;
+	gboolean netscape_remote;
+	gchar* tab_command;
+	gchar* win_command;
+} MateDAWebItem;
+
+typedef struct _MateDASimpleItem {
+	MateDAItem generic;
+	gboolean run_in_terminal;
+} MateDASimpleItem;
+
+typedef struct _MateDAImageItem {
+	MateDAItem generic;
+	gboolean run_in_terminal;
+} MateDAImageItem;
+
+typedef struct _MateDATextItem {
+	MateDAItem generic;
+	gboolean run_in_terminal;
+} MateDATextItem;
+
+typedef struct _MateDAFileItem {
+	MateDAItem generic;
+	gboolean run_in_terminal;
+} MateDAFileItem;
+
+typedef struct _MateDATermItem {
+	MateDAItem generic;
+	gchar* exec_flag;
+} MateDATermItem;
+
+typedef struct _MateDAVisualItem {
+	MateDAItem generic;
+	gboolean run_at_startup;
+} MateDAVisualItem;
+
+typedef struct _MateDAMobilityItem {
+	MateDAItem generic;
+	gboolean run_at_startup;
+} MateDAMobilityItem;
+
+MateDAWebItem* mate_da_web_item_new(void);
+void mate_da_web_item_free(MateDAWebItem* item);
+
+MateDATermItem* mate_da_term_item_new(void);
+void mate_da_term_item_free(MateDATermItem* item);
+
+MateDASimpleItem* mate_da_simple_item_new(void);
+void mate_da_simple_item_free(MateDASimpleItem* item);
+
+MateDAVisualItem* mate_da_visual_item_new(void);
+void mate_da_visual_item_free(MateDAVisualItem* item);
+
+MateDAImageItem* mate_da_image_item_new(void);
+void mate_da_image_item_free(MateDAImageItem* item);
+
+MateDATextItem* mate_da_text_item_new(void);
+void mate_da_text_item_free(MateDATextItem* item);
+
+MateDAFileItem* mate_da_file_item_new(void);
+void mate_da_file_item_free(MateDAFileItem* item);
+
+MateDAMobilityItem* mate_da_mobility_item_new(void);
+void mate_da_mobility_item_free(MateDAMobilityItem* item);
 
 #endif