[Xfce4-commits] <garcon:master> Cleanup and line-out some code.
Nick Schermer
nick at xfce.org
Sat Aug 29 19:02:09 CEST 2009
Updating branch refs/heads/master
to e213da4bb6d3345b87792b1d50263cc3b0606702 (commit)
from 2e8a4f4ff2cd09f2fe2816faf55e52b0082ddf19 (commit)
commit e213da4bb6d3345b87792b1d50263cc3b0606702
Author: Nick Schermer <nick at xfce.org>
Date: Sat Aug 29 18:27:29 2009 +0200
Cleanup and line-out some code.
garcon/garcon-menu-item.c | 28 +++--------
garcon/garcon-menu-item.h | 122 ++++++++++++++++++++++----------------------
2 files changed, 68 insertions(+), 82 deletions(-)
diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
index 8490c4b..d019b6d 100644
--- a/garcon/garcon-menu-item.c
+++ b/garcon/garcon-menu-item.c
@@ -354,19 +354,6 @@ static void
garcon_menu_item_init (GarconMenuItem *item)
{
item->priv = GARCON_MENU_ITEM_GET_PRIVATE (item);
- item->priv->file = NULL;
- item->priv->desktop_id = NULL;
- item->priv->name = NULL;
- item->priv->generic_name = NULL;
- item->priv->comment = NULL;
- item->priv->command = NULL;
- item->priv->try_exec = NULL;
- item->priv->categories = NULL;
- item->priv->icon_name = NULL;
- item->priv->only_show_in = NULL;
- item->priv->not_show_in = NULL;
- item->priv->path = NULL;
- item->priv->num_allocated = 0;
}
@@ -383,12 +370,11 @@ garcon_menu_item_finalize (GObject *object)
g_free (item->priv->command);
g_free (item->priv->try_exec);
g_free (item->priv->icon_name);
+ g_free (item->priv->path);
g_strfreev (item->priv->only_show_in);
g_strfreev (item->priv->not_show_in);
- g_free (item->priv->path);
-
g_list_foreach (item->priv->categories, (GFunc) g_free, NULL);
g_list_free (item->priv->categories);
@@ -784,12 +770,12 @@ garcon_menu_item_reload_from_file (GarconMenuItem *item,
GFile *file,
GError **error)
{
- GKeyFile *rc;
- gchar *contents;
- gsize length = 0;
- gboolean succeed;
- gchar *string;
- gboolean boolean;
+ GKeyFile *rc;
+ gchar *contents;
+ gsize length = 0;
+ gboolean succeed;
+ gchar *string;
+ gboolean boolean;
g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE);
g_return_val_if_fail (G_IS_FILE (file), FALSE);
diff --git a/garcon/garcon-menu-item.h b/garcon/garcon-menu-item.h
index d305e63..a4f543a 100644
--- a/garcon/garcon-menu-item.h
+++ b/garcon/garcon-menu-item.h
@@ -45,67 +45,67 @@ typedef struct _GarconMenuItem GarconMenuItem;
GType garcon_menu_item_get_type (void) G_GNUC_CONST;
-GarconMenuItem *garcon_menu_item_new (GFile *file) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-GarconMenuItem *garcon_menu_item_new_for_path (const gchar *filename) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-GarconMenuItem *garcon_menu_item_new_for_uri (const gchar *uri) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-
-gboolean garcon_menu_item_reload (GarconMenuItem *item,
- GError **error);
-
-gboolean garcon_menu_item_reload_from_file (GarconMenuItem *item,
- GFile *file,
- GError **error);
-
-GFile *garcon_menu_item_get_file (GarconMenuItem *item);
-
-gchar *garcon_menu_item_get_uri (GarconMenuItem *item) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-
-const gchar *garcon_menu_item_get_desktop_id (GarconMenuItem *item);
-void garcon_menu_item_set_desktop_id (GarconMenuItem *item,
- const gchar *desktop_id);
-
-const gchar *garcon_menu_item_get_command (GarconMenuItem *item);
-void garcon_menu_item_set_command (GarconMenuItem *item,
- const gchar *command);
-const gchar *garcon_menu_item_get_try_exec (GarconMenuItem *item);
-void garcon_menu_item_set_try_exec (GarconMenuItem *item,
- const gchar *try_exec);
-const gchar *garcon_menu_item_get_name (GarconMenuItem *item);
-void garcon_menu_item_set_name (GarconMenuItem *item,
- const gchar *name);
-const gchar *garcon_menu_item_get_generic_name (GarconMenuItem *item);
-void garcon_menu_item_set_generic_name (GarconMenuItem *item,
- const gchar *generic_name);
-const gchar *garcon_menu_item_get_comment (GarconMenuItem *item);
-void garcon_menu_item_set_comment (GarconMenuItem *item,
- const gchar *comment);
-const gchar *garcon_menu_item_get_icon_name (GarconMenuItem *item);
-void garcon_menu_item_set_icon_name (GarconMenuItem *item,
- const gchar *icon_name);
-const gchar *garcon_menu_item_get_path (GarconMenuItem *item);
-void garcon_menu_item_set_path (GarconMenuItem *item,
- const gchar *path);
-gboolean garcon_menu_item_requires_terminal (GarconMenuItem *item);
-void garcon_menu_item_set_requires_terminal (GarconMenuItem *item,
- gboolean requires_terminal);
-gboolean garcon_menu_item_get_no_display (GarconMenuItem *item);
-void garcon_menu_item_set_no_display (GarconMenuItem *item,
- gboolean no_display);
-gboolean garcon_menu_item_supports_startup_notification (GarconMenuItem *item);
-void garcon_menu_item_set_supports_startup_notification (GarconMenuItem *item,
- gboolean supports_startup_notification);
-GList *garcon_menu_item_get_categories (GarconMenuItem *item);
-void garcon_menu_item_set_categories (GarconMenuItem *item,
- GList *categories);
-gboolean garcon_menu_item_has_category (GarconMenuItem *item,
- const gchar *category);
-gboolean garcon_menu_item_get_show_in_environment (GarconMenuItem *item);
-gboolean garcon_menu_item_only_show_in_environment (GarconMenuItem *item);
-void garcon_menu_item_ref (GarconMenuItem *item);
-void garcon_menu_item_unref (GarconMenuItem *item);
-gint garcon_menu_item_get_allocated (GarconMenuItem *item);
-void garcon_menu_item_increment_allocated (GarconMenuItem *item);
-void garcon_menu_item_decrement_allocated (GarconMenuItem *item);
+GarconMenuItem *garcon_menu_item_new (GFile *file) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+GarconMenuItem *garcon_menu_item_new_for_path (const gchar *filename) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+GarconMenuItem *garcon_menu_item_new_for_uri (const gchar *uri) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+gboolean garcon_menu_item_reload (GarconMenuItem *item,
+ GError **error);
+
+gboolean garcon_menu_item_reload_from_file (GarconMenuItem *item,
+ GFile *file,
+ GError **error);
+
+GFile *garcon_menu_item_get_file (GarconMenuItem *item);
+
+gchar *garcon_menu_item_get_uri (GarconMenuItem *item) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+const gchar *garcon_menu_item_get_desktop_id (GarconMenuItem *item);
+void garcon_menu_item_set_desktop_id (GarconMenuItem *item,
+ const gchar *desktop_id);
+
+const gchar *garcon_menu_item_get_command (GarconMenuItem *item);
+void garcon_menu_item_set_command (GarconMenuItem *item,
+ const gchar *command);
+const gchar *garcon_menu_item_get_try_exec (GarconMenuItem *item);
+void garcon_menu_item_set_try_exec (GarconMenuItem *item,
+ const gchar *try_exec);
+const gchar *garcon_menu_item_get_name (GarconMenuItem *item);
+void garcon_menu_item_set_name (GarconMenuItem *item,
+ const gchar *name);
+const gchar *garcon_menu_item_get_generic_name (GarconMenuItem *item);
+void garcon_menu_item_set_generic_name (GarconMenuItem *item,
+ const gchar *generic_name);
+const gchar *garcon_menu_item_get_comment (GarconMenuItem *item);
+void garcon_menu_item_set_comment (GarconMenuItem *item,
+ const gchar *comment);
+const gchar *garcon_menu_item_get_icon_name (GarconMenuItem *item);
+void garcon_menu_item_set_icon_name (GarconMenuItem *item,
+ const gchar *icon_name);
+const gchar *garcon_menu_item_get_path (GarconMenuItem *item);
+void garcon_menu_item_set_path (GarconMenuItem *item,
+ const gchar *path);
+gboolean garcon_menu_item_requires_terminal (GarconMenuItem *item);
+void garcon_menu_item_set_requires_terminal (GarconMenuItem *item,
+ gboolean requires_terminal);
+gboolean garcon_menu_item_get_no_display (GarconMenuItem *item);
+void garcon_menu_item_set_no_display (GarconMenuItem *item,
+ gboolean no_display);
+gboolean garcon_menu_item_supports_startup_notification (GarconMenuItem *item);
+void garcon_menu_item_set_supports_startup_notification (GarconMenuItem *item,
+ gboolean supports_startup_notification);
+GList *garcon_menu_item_get_categories (GarconMenuItem *item);
+void garcon_menu_item_set_categories (GarconMenuItem *item,
+ GList *categories);
+gboolean garcon_menu_item_has_category (GarconMenuItem *item,
+ const gchar *category);
+gboolean garcon_menu_item_get_show_in_environment (GarconMenuItem *item);
+gboolean garcon_menu_item_only_show_in_environment (GarconMenuItem *item);
+void garcon_menu_item_ref (GarconMenuItem *item);
+void garcon_menu_item_unref (GarconMenuItem *item);
+gint garcon_menu_item_get_allocated (GarconMenuItem *item);
+void garcon_menu_item_increment_allocated (GarconMenuItem *item);
+void garcon_menu_item_decrement_allocated (GarconMenuItem *item);
G_END_DECLS
More information about the Xfce4-commits
mailing list