[Goodies-commits] r3702 - in xfce4-places-plugin/trunk: . panel-plugin
Diego Ongaro
ongardie at xfce.org
Fri Dec 14 03:13:10 CET 2007
Author: ongardie
Date: 2007-12-14 02:13:10 +0000 (Fri, 14 Dec 2007)
New Revision: 3702
Modified:
xfce4-places-plugin/trunk/ChangeLog
xfce4-places-plugin/trunk/panel-plugin/model.c
xfce4-places-plugin/trunk/panel-plugin/model.h
xfce4-places-plugin/trunk/panel-plugin/model_system.c
xfce4-places-plugin/trunk/panel-plugin/model_user.c
xfce4-places-plugin/trunk/panel-plugin/model_volumes.c
xfce4-places-plugin/trunk/panel-plugin/support.c
xfce4-places-plugin/trunk/panel-plugin/view.c
Log:
2007-12-13 Diego Ongaro <ongardie at gmail.com>
* model*, support.c, view.c: consistent usage of _create(),
_finalize(), _destroy() naming convention
Modified: xfce4-places-plugin/trunk/ChangeLog
===================================================================
--- xfce4-places-plugin/trunk/ChangeLog 2007-12-14 01:32:19 UTC (rev 3701)
+++ xfce4-places-plugin/trunk/ChangeLog 2007-12-14 02:13:10 UTC (rev 3702)
@@ -5,6 +5,8 @@
* model.{c,h}, support.c, model_volumes.c: add
places_bookmark_action_new() as counter-part to
places_bookmark_action_free()
+ * model*, support.c, view.c: consistent usage of _create(),
+ _finalize(), _destroy() naming convention
2007-12-10 Diego Ongaro <ongardie at gmail.com>
Modified: xfce4-places-plugin/trunk/panel-plugin/model.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/model.c 2007-12-14 01:32:19 UTC (rev 3701)
+++ xfce4-places-plugin/trunk/panel-plugin/model.c 2007-12-14 02:13:10 UTC (rev 3702)
@@ -30,7 +30,7 @@
/********** PlacesBookmarkAction **********/
inline PlacesBookmarkAction*
-places_bookmark_action_new(gchar *label)
+places_bookmark_action_create(gchar *label)
{
PlacesBookmarkAction *action;
@@ -41,14 +41,14 @@
}
inline void
-places_bookmark_action_free(PlacesBookmarkAction *act)
+places_bookmark_action_destroy(PlacesBookmarkAction *act)
{
g_assert(act != NULL);
- if(act->free != NULL)
- act->free(act);
- else
- g_free(act);
+ if(act->finalize != NULL)
+ act->finalize(act);
+
+ g_free(act);
}
inline void
@@ -82,18 +82,18 @@
}
static inline void
-places_bookmark_actions_free(GList *actions)
+places_bookmark_actions_destroy(GList *actions)
{
while(actions != NULL){
if(actions->data != NULL)
- places_bookmark_action_free((PlacesBookmarkAction*) actions->data);
+ places_bookmark_action_destroy((PlacesBookmarkAction*) actions->data);
actions = actions->next;
}
g_list_free(actions);
}
inline void
-places_bookmark_free(PlacesBookmark *bookmark)
+places_bookmark_destroy(PlacesBookmark *bookmark)
{
g_assert(bookmark != NULL);
@@ -103,20 +103,20 @@
/* don't double-free */
if(g_list_find(bookmark->actions, bookmark->primary_action) == NULL)
- places_bookmark_action_free(bookmark->primary_action);
+ places_bookmark_action_destroy(bookmark->primary_action);
bookmark->primary_action = NULL;
}
if(bookmark->actions != NULL){
- places_bookmark_actions_free(bookmark->actions);
+ places_bookmark_actions_destroy(bookmark->actions);
bookmark->actions = NULL;
}
- if(bookmark->free != NULL)
- bookmark->free(bookmark);
- else
- g_free(bookmark);
+ if(bookmark->finalize != NULL)
+ bookmark->finalize(bookmark);
+
+ g_free(bookmark);
}
/********** PlacesBookmarkGroup **********/
@@ -124,19 +124,35 @@
inline GList*
places_bookmark_group_get_bookmarks(PlacesBookmarkGroup *pbg)
{
+ g_assert(pbg->get_bookmarks != NULL);
+
return pbg->get_bookmarks(pbg);
}
inline gboolean
places_bookmark_group_changed(PlacesBookmarkGroup *pbg)
{
+ g_assert(pbg->changed != NULL);
+
return pbg->changed(pbg);
}
+inline PlacesBookmarkGroup*
+places_bookmark_group_create()
+{
+ PlacesBookmarkGroup *bookmark_group;
+ bookmark_group = g_new0(PlacesBookmarkGroup, 1);
+
+ return bookmark_group;
+}
+
inline void
-places_bookmark_group_finalize(PlacesBookmarkGroup *pbg)
+places_bookmark_group_destroy(PlacesBookmarkGroup *pbg)
{
- pbg->finalize(pbg);
+ if(pbg->finalize != NULL)
+ pbg->finalize(pbg);
+
+ g_free(pbg);
}
/* vim: set ai et tabstop=4: */
Modified: xfce4-places-plugin/trunk/panel-plugin/model.h
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/model.h 2007-12-14 01:32:19 UTC (rev 3701)
+++ xfce4-places-plugin/trunk/panel-plugin/model.h 2007-12-14 02:13:10 UTC (rev 3702)
@@ -32,14 +32,14 @@
gboolean may_block;
gpointer priv;
void (*action) (PlacesBookmarkAction *self);
- void (*free) (PlacesBookmarkAction *self);
+ void (*finalize) (PlacesBookmarkAction *self);
};
inline PlacesBookmarkAction*
-places_bookmark_action_new(gchar *label);
+places_bookmark_action_create(gchar *label);
inline void
-places_bookmark_action_free(PlacesBookmarkAction*);
+places_bookmark_action_destroy(PlacesBookmarkAction*);
inline void
places_bookmark_action_call(PlacesBookmarkAction*);
@@ -65,14 +65,14 @@
GList *actions; /* may be NULL (empty) */
gpointer priv; /* private data */
- void (*free) (PlacesBookmark *self);
+ void (*finalize) (PlacesBookmark *self);
};
inline PlacesBookmark*
places_bookmark_create(gchar *label);
inline void
-places_bookmark_free(PlacesBookmark *bookmark);
+places_bookmark_destroy(PlacesBookmark *bookmark);
/* Places Bookmark Group */
typedef struct _PlacesBookmarkGroup PlacesBookmarkGroup;
@@ -90,8 +90,11 @@
inline gboolean
places_bookmark_group_changed(PlacesBookmarkGroup*);
+inline PlacesBookmarkGroup*
+places_bookmark_group_create();
+
inline void
-places_bookmark_group_finalize(PlacesBookmarkGroup*);
+places_bookmark_group_destroy(PlacesBookmarkGroup*);
#endif
/* vim: set ai et tabstop=4: */
Modified: xfce4-places-plugin/trunk/panel-plugin/model_system.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/model_system.c 2007-12-14 01:32:19 UTC (rev 3701)
+++ xfce4-places-plugin/trunk/panel-plugin/model_system.c 2007-12-14 02:13:10 UTC (rev 3702)
@@ -54,26 +54,26 @@
} PBSysData;
static void
-pbsys_free_desktop_bookmark(PlacesBookmark *bookmark)
+pbsys_finalize_desktop_bookmark(PlacesBookmark *bookmark)
{
g_assert(bookmark != NULL);
- if(bookmark->uri != NULL)
+ if(bookmark->uri != NULL){
g_free(bookmark->uri);
-
- g_free(bookmark);
+ bookmark->uri = NULL;
+ }
}
#if TRASH
static void
-pbsys_free_trash_bookmark(PlacesBookmark *bookmark)
+pbsys_finalize_trash_bookmark(PlacesBookmark *bookmark)
{
g_assert(bookmark != NULL);
- if(bookmark->icon != NULL)
+ if(bookmark->icon != NULL){
g_free(bookmark->icon);
-
- g_free(bookmark);
+ bookmark->icon = NULL;
+ }
}
#endif
@@ -110,7 +110,7 @@
bookmark = places_bookmark_create(_("Trash"));
bookmark->uri = "trash:///";
bookmark->uri_scheme = PLACES_URI_SCHEME_TRASH;
- bookmark->free = pbsys_free_trash_bookmark;;
+ bookmark->finalize = pbsys_finalize_trash_bookmark;;
/* Try for an icon from ThunarVFS to indicate whether trash is empty or not */
@@ -135,7 +135,7 @@
bookmark = places_bookmark_create(_("Desktop"));
bookmark->uri = g_build_filename(home_dir, "Desktop", NULL);
bookmark->icon = "gnome-fs-desktop";
- bookmark->free = pbsys_free_desktop_bookmark;
+ bookmark->finalize = pbsys_finalize_desktop_bookmark;
if(g_file_test(bookmark->uri, G_FILE_TEST_IS_DIR)){
@@ -151,7 +151,7 @@
}else{
pbg_priv(bookmark_group)->desktop_exists = FALSE;
- places_bookmark_free(bookmark);
+ places_bookmark_destroy(bookmark);
}
@@ -215,13 +215,14 @@
g_free(pbg_priv(bookmark_group));
- g_free(bookmark_group);
}
PlacesBookmarkGroup*
places_bookmarks_system_create()
{
- PlacesBookmarkGroup *bookmark_group = g_new0(PlacesBookmarkGroup, 1);
+ PlacesBookmarkGroup *bookmark_group;
+
+ bookmark_group = places_bookmark_group_create();
bookmark_group->get_bookmarks = pbsys_get_bookmarks;
bookmark_group->changed = pbsys_changed;
bookmark_group->finalize = pbsys_finalize;
Modified: xfce4-places-plugin/trunk/panel-plugin/model_user.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/model_user.c 2007-12-14 01:32:19 UTC (rev 3701)
+++ xfce4-places-plugin/trunk/panel-plugin/model_user.c 2007-12-14 02:13:10 UTC (rev 3702)
@@ -77,12 +77,18 @@
}
static void
-pbuser_free_bookmark(PlacesBookmark *bookmark)
+pbuser_finalize_bookmark(PlacesBookmark *bookmark)
{
g_assert(bookmark != NULL);
- g_free(bookmark->uri);
- g_free(bookmark->label);
- g_free(bookmark);
+
+ if(bookmark->uri != NULL){
+ g_free(bookmark->uri);
+ bookmark->uri = NULL;
+ }
+ if(bookmark->label != NULL){
+ g_free(bookmark->label);
+ bookmark->label = NULL;
+ }
}
static void
@@ -96,7 +102,7 @@
DBG("destroy internal bookmarks");
while(bookmarks != NULL){
- places_bookmark_free((PlacesBookmark*) bookmarks->data);
+ places_bookmark_destroy((PlacesBookmark*) bookmarks->data);
bookmarks = bookmarks->next;
}
g_list_free(bookmarks);
@@ -164,7 +170,7 @@
bookmark->uri = path; /* uri needs to be freed */
bookmark->icon = "gnome-fs-directory";
bookmark->priv = (gpointer) pbuser_dir_exists(path);
- bookmark->free = pbuser_free_bookmark;
+ bookmark->finalize = pbuser_finalize_bookmark;
bookmarks = g_list_prepend(bookmarks, bookmark);
}
@@ -208,7 +214,7 @@
clone->uri = g_strdup(orig->uri);
clone->uri_scheme = orig->uri_scheme;
clone->icon = orig->icon;
- clone->free = pbuser_free_bookmark;
+ clone->finalize = pbuser_finalize_bookmark;
terminal = places_create_open_terminal_action(clone);
clone->actions = g_list_prepend(clone->actions, terminal);
@@ -270,7 +276,7 @@
pbg_priv(bookmark_group)->filename = NULL;
g_free(pbg_priv(bookmark_group));
- g_free(bookmark_group);
+ bookmark_group->priv = NULL;
}
@@ -279,7 +285,9 @@
PlacesBookmarkGroup*
places_bookmarks_user_create()
{
- PlacesBookmarkGroup *bookmark_group = g_new0(PlacesBookmarkGroup, 1);
+ PlacesBookmarkGroup *bookmark_group;
+
+ bookmark_group = places_bookmark_group_create();
bookmark_group->get_bookmarks = pbuser_get_bookmarks;
bookmark_group->changed = pbuser_changed;
bookmark_group->finalize = pbuser_finalize;
Modified: xfce4-places-plugin/trunk/panel-plugin/model_volumes.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/model_volumes.c 2007-12-14 01:32:19 UTC (rev 3701)
+++ xfce4-places-plugin/trunk/panel-plugin/model_volumes.c 2007-12-14 02:13:10 UTC (rev 3702)
@@ -179,22 +179,21 @@
}
static void
-pbvol_bookmark_free(PlacesBookmark *bookmark)
+pbvol_bookmark_finalize(PlacesBookmark *bookmark)
{
- if(bookmark->uri != NULL)
+ if(bookmark->uri != NULL){
g_free(bookmark->uri);
- g_free(bookmark);
+ bookmark->uri = NULL;
+ }
}
static void
-pbvol_bookmark_action_free(PlacesBookmarkAction *action){
+pbvol_bookmark_action_finalize(PlacesBookmarkAction *action){
g_assert(action != NULL && action->priv != NULL);
ThunarVfsVolume *volume = THUNAR_VFS_VOLUME(action->priv);
g_object_unref(volume);
action->priv = NULL;
-
- g_free(action);
}
static GList*
@@ -213,23 +212,23 @@
if(pbvol_show_volume(volume)){
- bookmark = places_bookmark_create((gchar*) thunar_vfs_volume_get_name(volume));
+ bookmark = places_bookmark_create((gchar*) thunar_vfs_volume_get_name(volume));
if(thunar_vfs_volume_is_mounted(volume))
bookmark->uri = thunar_vfs_path_dup_uri(thunar_vfs_volume_get_mount_point(volume));
else
bookmark->uri = NULL;
- bookmark->icon = (gchar*) thunar_vfs_volume_lookup_icon_name(volume, icon_theme);
- bookmark->free = pbvol_bookmark_free;
+ bookmark->icon = (gchar*) thunar_vfs_volume_lookup_icon_name(volume, icon_theme);
+ bookmark->finalize = pbvol_bookmark_finalize;
if(!thunar_vfs_volume_is_mounted(volume)){
g_object_ref(volume);
- action = places_bookmark_action_new(_("Mount and Open"));
- action->may_block = TRUE;
- action->priv = volume;
- action->action = pbvol_mount_and_open;
- action->free = pbvol_bookmark_action_free;
- bookmark->actions = g_list_append(bookmark->actions, action);
+ action = places_bookmark_action_create(_("Mount and Open"));
+ action->may_block = TRUE;
+ action->priv = volume;
+ action->action = pbvol_mount_and_open;
+ action->finalize = pbvol_bookmark_action_finalize;
+ bookmark->actions = g_list_append(bookmark->actions, action);
if(pbg_priv(bookmark_group)->mount_and_open_by_default){
bookmark->primary_action = action;
@@ -237,12 +236,12 @@
}
g_object_ref(volume);
- action = places_bookmark_action_new(_("Mount"));
- action->may_block = TRUE;
- action->priv = volume;
- action->action = pbvol_mount;
- action->free = pbvol_bookmark_action_free;
- bookmark->actions = g_list_append(bookmark->actions, action);
+ action = places_bookmark_action_create(_("Mount"));
+ action->may_block = TRUE;
+ action->priv = volume;
+ action->action = pbvol_mount;
+ action->finalize = pbvol_bookmark_action_finalize;
+ bookmark->actions = g_list_append(bookmark->actions, action);
}else{
@@ -258,24 +257,24 @@
if(thunar_vfs_volume_is_ejectable(volume)){
g_object_ref(volume);
- action = places_bookmark_action_new(_("Eject"));
- action->may_block = TRUE;
- action->priv = volume;
- action->action = pbvol_eject;
- action->free = pbvol_bookmark_action_free;
- bookmark->actions = g_list_append(bookmark->actions, action);
+ action = places_bookmark_action_create(_("Eject"));
+ action->may_block = TRUE;
+ action->priv = volume;
+ action->action = pbvol_eject;
+ action->finalize = pbvol_bookmark_action_finalize;
+ bookmark->actions = g_list_append(bookmark->actions, action);
}
}else{
if(thunar_vfs_volume_is_mounted(volume)){
g_object_ref(volume);
- action = places_bookmark_action_new(_("Unmount"));
- action->may_block = TRUE;
- action->priv = volume;
- action->action = pbvol_unmount;
- action->free = pbvol_bookmark_action_free;
- bookmark->actions = g_list_append(bookmark->actions, action);
+ action = places_bookmark_action_create(_("Unmount"));
+ action->may_block = TRUE;
+ action->priv = volume;
+ action->action = pbvol_unmount;
+ action->finalize = pbvol_bookmark_action_finalize;
+ bookmark->actions = g_list_append(bookmark->actions, action);
}
}
@@ -319,8 +318,8 @@
pbg_priv(bookmark_group)->volume_manager = NULL;
thunar_vfs_shutdown();
- g_free(bookmark_group->priv);
- g_free(bookmark_group);
+ g_free(pbg_priv(bookmark_group));
+ bookmark_group->priv = NULL;
}
PlacesBookmarkGroup*
@@ -329,7 +328,7 @@
const GList *volumes;
PlacesBookmarkGroup *bookmark_group;
- bookmark_group = g_new0(PlacesBookmarkGroup, 1);
+ bookmark_group = places_bookmark_group_create();
bookmark_group->get_bookmarks = pbvol_get_bookmarks;
bookmark_group->changed = pbvol_changed;
bookmark_group->finalize = pbvol_finalize;
Modified: xfce4-places-plugin/trunk/panel-plugin/support.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/support.c 2007-12-14 01:32:19 UTC (rev 3701)
+++ xfce4-places-plugin/trunk/panel-plugin/support.c 2007-12-14 02:13:10 UTC (rev 3702)
@@ -145,7 +145,7 @@
g_assert(bookmark != NULL);
g_assert(bookmark->uri != NULL);
- action = places_bookmark_action_new(_("Open"));
+ action = places_bookmark_action_create(_("Open"));
action->priv = bookmark->uri;
action->action = psupport_load_thunar_wrapper;
@@ -160,7 +160,7 @@
g_assert(bookmark != NULL);
g_assert(bookmark->uri != NULL);
- action = places_bookmark_action_new(_("Open Terminal Here"));
+ action = places_bookmark_action_create(_("Open Terminal Here"));
action->priv = bookmark->uri;
action->action = psupport_load_terminal_wrapper;
Modified: xfce4-places-plugin/trunk/panel-plugin/view.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/view.c 2007-12-14 01:32:19 UTC (rev 3701)
+++ xfce4-places-plugin/trunk/panel-plugin/view.c 2007-12-14 02:13:10 UTC (rev 3702)
@@ -175,7 +175,7 @@
do{
if(bookmark_group_li->data != NULL){
bookmark_group = (PlacesBookmarkGroup*) bookmark_group_li->data;
- places_bookmark_group_finalize(bookmark_group);
+ places_bookmark_group_destroy(bookmark_group);
}
bookmark_group_li = bookmark_group_li->next;
@@ -577,7 +577,7 @@
}
g_signal_connect_swapped(item, "destroy",
- G_CALLBACK(places_bookmark_free), bookmark);
+ G_CALLBACK(places_bookmark_destroy), bookmark);
gtk_menu_shell_append(GTK_MENU_SHELL(view->menu), item);
gtk_widget_show(item);
More information about the Goodies-commits
mailing list