[Goodies-commits] r3701 - in xfce4-places-plugin/trunk: . panel-plugin
Diego Ongaro
ongardie at xfce.org
Fri Dec 14 02:32:19 CET 2007
Author: ongardie
Date: 2007-12-14 01:32:19 +0000 (Fri, 14 Dec 2007)
New Revision: 3701
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_volumes.c
xfce4-places-plugin/trunk/panel-plugin/support.c
Log:
2007-12-13 Diego Ongaro <ongardie at gmail.com>
* model.{c,h}, support.c, model_volumes.c: add
places_bookmark_action_new() as counter-part to places_bookmark_action_free()
Modified: xfce4-places-plugin/trunk/ChangeLog
===================================================================
--- xfce4-places-plugin/trunk/ChangeLog 2007-12-14 01:19:29 UTC (rev 3700)
+++ xfce4-places-plugin/trunk/ChangeLog 2007-12-14 01:32:19 UTC (rev 3701)
@@ -2,6 +2,9 @@
* model.h, model_volumes.c, view.c: Provide visual feedback on
actions that could take a long time to return
+ * model.{c,h}, support.c, model_volumes.c: add
+ places_bookmark_action_new() as counter-part to
+ places_bookmark_action_free()
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:19:29 UTC (rev 3700)
+++ xfce4-places-plugin/trunk/panel-plugin/model.c 2007-12-14 01:32:19 UTC (rev 3701)
@@ -27,13 +27,17 @@
#include <libxfce4util/libxfce4util.h>
-inline void
-places_bookmark_action_call(PlacesBookmarkAction *act)
+/********** PlacesBookmarkAction **********/
+
+inline PlacesBookmarkAction*
+places_bookmark_action_new(gchar *label)
{
- g_assert(act != NULL);
+ PlacesBookmarkAction *action;
- if(act->action != NULL)
- act->action(act);
+ action = g_new0(PlacesBookmarkAction, 1);
+ action->label = label;
+
+ return action;
}
inline void
@@ -47,17 +51,17 @@
g_free(act);
}
-static inline void
-places_bookmark_actions_free(GList *actions)
+inline void
+places_bookmark_action_call(PlacesBookmarkAction *act)
{
- while(actions != NULL){
- if(actions->data != NULL)
- places_bookmark_action_free((PlacesBookmarkAction*) actions->data);
- actions = actions->next;
- }
- g_list_free(actions);
+ g_assert(act != NULL);
+
+ if(act->action != NULL)
+ act->action(act);
}
+/********** PlacesBookmark **********/
+
#if defined(DEBUG) && (DEBUG > 0)
static int bookmarks = 0;
#endif
@@ -77,6 +81,17 @@
return bookmark;
}
+static inline void
+places_bookmark_actions_free(GList *actions)
+{
+ while(actions != NULL){
+ if(actions->data != NULL)
+ places_bookmark_action_free((PlacesBookmarkAction*) actions->data);
+ actions = actions->next;
+ }
+ g_list_free(actions);
+}
+
inline void
places_bookmark_free(PlacesBookmark *bookmark)
{
@@ -104,6 +119,8 @@
g_free(bookmark);
}
+/********** PlacesBookmarkGroup **********/
+
inline GList*
places_bookmark_group_get_bookmarks(PlacesBookmarkGroup *pbg)
{
Modified: xfce4-places-plugin/trunk/panel-plugin/model.h
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/model.h 2007-12-14 01:19:29 UTC (rev 3700)
+++ xfce4-places-plugin/trunk/panel-plugin/model.h 2007-12-14 01:32:19 UTC (rev 3701)
@@ -35,12 +35,15 @@
void (*free) (PlacesBookmarkAction *self);
};
-inline void
-places_bookmark_action_call(PlacesBookmarkAction*);
+inline PlacesBookmarkAction*
+places_bookmark_action_new(gchar *label);
inline void
places_bookmark_action_free(PlacesBookmarkAction*);
+inline void
+places_bookmark_action_call(PlacesBookmarkAction*);
+
/* Places Bookmark */
typedef enum
Modified: xfce4-places-plugin/trunk/panel-plugin/model_volumes.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/model_volumes.c 2007-12-14 01:19:29 UTC (rev 3700)
+++ xfce4-places-plugin/trunk/panel-plugin/model_volumes.c 2007-12-14 01:32:19 UTC (rev 3701)
@@ -224,8 +224,7 @@
if(!thunar_vfs_volume_is_mounted(volume)){
g_object_ref(volume);
- action = g_new0(PlacesBookmarkAction, 1);
- action->label = _("Mount and Open");
+ action = places_bookmark_action_new(_("Mount and Open"));
action->may_block = TRUE;
action->priv = volume;
action->action = pbvol_mount_and_open;
@@ -238,8 +237,7 @@
}
g_object_ref(volume);
- action = g_new0(PlacesBookmarkAction, 1);
- action->label = _("Mount");
+ action = places_bookmark_action_new(_("Mount"));
action->may_block = TRUE;
action->priv = volume;
action->action = pbvol_mount;
@@ -260,8 +258,7 @@
if(thunar_vfs_volume_is_ejectable(volume)){
g_object_ref(volume);
- action = g_new0(PlacesBookmarkAction, 1);
- action->label = _("Eject");
+ action = places_bookmark_action_new(_("Eject"));
action->may_block = TRUE;
action->priv = volume;
action->action = pbvol_eject;
@@ -273,8 +270,7 @@
if(thunar_vfs_volume_is_mounted(volume)){
g_object_ref(volume);
- action = g_new0(PlacesBookmarkAction, 1);
- action->label = _("Unmount");
+ action = places_bookmark_action_new(_("Unmount"));
action->may_block = TRUE;
action->priv = volume;
action->action = pbvol_unmount;
Modified: xfce4-places-plugin/trunk/panel-plugin/support.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/support.c 2007-12-14 01:19:29 UTC (rev 3700)
+++ xfce4-places-plugin/trunk/panel-plugin/support.c 2007-12-14 01:32:19 UTC (rev 3701)
@@ -145,8 +145,7 @@
g_assert(bookmark != NULL);
g_assert(bookmark->uri != NULL);
- action = g_new0(PlacesBookmarkAction, 1);
- action->label = _("Open");
+ action = places_bookmark_action_new(_("Open"));
action->priv = bookmark->uri;
action->action = psupport_load_thunar_wrapper;
@@ -161,8 +160,7 @@
g_assert(bookmark != NULL);
g_assert(bookmark->uri != NULL);
- action = g_new0(PlacesBookmarkAction, 1);
- action->label = _("Open Terminal Here");
+ action = places_bookmark_action_new(_("Open Terminal Here"));
action->priv = bookmark->uri;
action->action = psupport_load_terminal_wrapper;
More information about the Goodies-commits
mailing list