[Xfce4-commits] <garcon:jannis/basic-monitoring> Update copyrights and add garcon_menu_item_pool_clear().
Jannis Pohlmann
noreply at xfce.org
Sun Sep 5 15:32:03 CEST 2010
Updating branch refs/heads/jannis/basic-monitoring
to 9ae4e81297ec3031c17e35d7facf16da23d640be (commit)
from 2d35906e4287a17a35386d1fe01799348e3e6c22 (commit)
commit 9ae4e81297ec3031c17e35d7facf16da23d640be
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Sun Sep 5 15:30:50 2010 +0200
Update copyrights and add garcon_menu_item_pool_clear().
garcon/garcon-menu-item-pool.c | 11 ++++++++++-
garcon/garcon-menu-item-pool.h | 3 ++-
garcon/garcon-menu-item.c | 3 ++-
garcon/garcon-menu-item.h | 17 ++++++++---------
garcon/garcon-menu-separator.c | 2 +-
garcon/garcon-menu-separator.h | 17 ++++++++---------
6 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c
index 999b0f9..b91b6af 100644
--- a/garcon/garcon-menu-item-pool.c
+++ b/garcon/garcon-menu-item-pool.c
@@ -1,6 +1,6 @@
/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
- * Copyright (c) 2006-2009 Jannis Pohlmann <jannis at xfce.org>
+ * Copyright (c) 2006-2010 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -178,3 +178,12 @@ garcon_menu_item_pool_get_empty (GarconMenuItemPool *pool)
g_return_val_if_fail (GARCON_IS_MENU_ITEM_POOL (pool), TRUE);
return (g_hash_table_size (pool->priv->items) == 0);
}
+
+
+
+void
+garcon_menu_item_pool_clear (GarconMenuItemPool *pool)
+{
+ g_return_if_fail (GARCON_IS_MENU_ITEM_POOL (pool));
+ g_hash_table_remove_all (pool->priv->items);
+}
diff --git a/garcon/garcon-menu-item-pool.h b/garcon/garcon-menu-item-pool.h
index b75a13a..10fcfa4 100644
--- a/garcon/garcon-menu-item-pool.h
+++ b/garcon/garcon-menu-item-pool.h
@@ -1,6 +1,6 @@
/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
- * Copyright (c) 2006-2009 Jannis Pohlmann <jannis at xfce.org>
+ * Copyright (c) 2006-2010 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -55,6 +55,7 @@ void garcon_menu_item_pool_foreach (GarconMenuItemPool
void garcon_menu_item_pool_apply_exclude_rule (GarconMenuItemPool *pool,
GNode *node);
gboolean garcon_menu_item_pool_get_empty (GarconMenuItemPool *pool);
+void garcon_menu_item_pool_clear (GarconMenuItemPool *pool);
G_END_DECLS
diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
index f490f16..26e0d4f 100644
--- a/garcon/garcon-menu-item.c
+++ b/garcon/garcon-menu-item.c
@@ -1,6 +1,7 @@
/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
- * Copyright (c) 2006-2009 Jannis Pohlmann <jannis at xfce.org>
+ * Copyright (c) 2006-2010 Jannis Pohlmann <jannis at xfce.org>
+ * Copyright (c) 2009-2010 Nick Schermer <nick at xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/garcon/garcon-menu-item.h b/garcon/garcon-menu-item.h
index 8a59774..9ebfe01 100644
--- a/garcon/garcon-menu-item.h
+++ b/garcon/garcon-menu-item.h
@@ -1,8 +1,7 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
- * vi:set et ai sts=2 sw=2 cindent:
- *
* Copyright (c) 2006-2009 Jannis Pohlmann <jannis at xfce.org>
+ * Copyright (c) 2009 Nick Schermer <nick at xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -11,13 +10,13 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Library General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#if !defined(GARCON_INSIDE_GARCON_H) && !defined(GARCON_COMPILATION)
diff --git a/garcon/garcon-menu-separator.c b/garcon/garcon-menu-separator.c
index e7e22e5..92366c0 100644
--- a/garcon/garcon-menu-separator.c
+++ b/garcon/garcon-menu-separator.c
@@ -1,6 +1,6 @@
/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
- * Copyright (c) 2007-2009 Jannis Pohlmann <jannis at xfce.org>
+ * Copyright (c) 2007-2010 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/garcon/garcon-menu-separator.h b/garcon/garcon-menu-separator.h
index 40fdbd8..ccf238f 100644
--- a/garcon/garcon-menu-separator.h
+++ b/garcon/garcon-menu-separator.h
@@ -1,7 +1,6 @@
-/* $Id$ */
-/* vi:set et ai sw=2 sts=2: */
+/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
- * Copyright (c) 2007 Jannis Pohlmann <jannis at xfce.org>
+ * Copyright (c) 2007-2010 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -10,13 +9,13 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Library General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#if !defined(GARCON_INSIDE_GARCON_H) && !defined(GARCON_COMPILATION)
More information about the Xfce4-commits
mailing list