DBus Menu

Merge lp:~charlesk/libdbusmenu/constify-dbusmenu-menuitem-getters into lp:libdbusmenu/12.10

  1. constify-dbusmenu-menuitem-getters
  2. Merge into trunk.12.10
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 416
Merged at revision: 421
Proposed branch: lp:~charlesk/libdbusmenu/constify-dbusmenu-menuitem-getters
Merge into: lp:libdbusmenu/12.10
Diff against target: 89 lines (+13/-13)
2 files modified
libdbusmenu-glib/menuitem.c (+7/-7)
libdbusmenu-glib/menuitem.h (+6/-6)
To merge this branch: bzr merge lp:~charlesk/libdbusmenu/constify-dbusmenu-menuitem-getters
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+103506@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c 2012-03-08 15:44:05 +0000
+++ libdbusmenu-glib/menuitem.c 2012-04-25 15:45:37 +0000
@@ -463,7 +463,7 @@
463/* A helper function to get the type of the menuitem, this might463/* A helper function to get the type of the menuitem, this might
464 be a candidate for optimization in the future. */464 be a candidate for optimization in the future. */
465static const gchar *465static const gchar *
466menuitem_get_type (DbusmenuMenuitem * mi)466menuitem_get_type (const DbusmenuMenuitem * mi)
467{467{
468 DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);468 DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
469 GVariant * currentval = (GVariant *)g_hash_table_lookup(priv->properties, DBUSMENU_MENUITEM_PROP_TYPE);469 GVariant * currentval = (GVariant *)g_hash_table_lookup(priv->properties, DBUSMENU_MENUITEM_PROP_TYPE);
@@ -1287,7 +1287,7 @@
1287 * is not set or is not a string.1287 * is not set or is not a string.
1288 */1288 */
1289const gchar *1289const gchar *
1290dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property)1290dbusmenu_menuitem_property_get (const DbusmenuMenuitem * mi, const gchar * property)
1291{1291{
1292 GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);1292 GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);
1293 if (variant == NULL) return NULL;1293 if (variant == NULL) return NULL;
@@ -1307,7 +1307,7 @@
1307 * Return value: (transfer none): A GVariant for the property.1307 * Return value: (transfer none): A GVariant for the property.
1308 */1308 */
1309GVariant *1309GVariant *
1310dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * property)1310dbusmenu_menuitem_property_get_variant (const DbusmenuMenuitem * mi, const gchar * property)
1311{1311{
1312 g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), NULL);1312 g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), NULL);
1313 g_return_val_if_fail(property != NULL, NULL);1313 g_return_val_if_fail(property != NULL, NULL);
@@ -1334,7 +1334,7 @@
1334 * Return value: The value of the property or #FALSE.1334 * Return value: The value of the property or #FALSE.
1335 */1335 */
1336gboolean1336gboolean
1337dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * property)1337dbusmenu_menuitem_property_get_bool (const DbusmenuMenuitem * mi, const gchar * property)
1338{1338{
1339 GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);1339 GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);
1340 if (variant == NULL) return FALSE;1340 if (variant == NULL) return FALSE;
@@ -1368,7 +1368,7 @@
1368 * Return value: The value of the property or zero.1368 * Return value: The value of the property or zero.
1369 */1369 */
1370gint1370gint
1371dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * property)1371dbusmenu_menuitem_property_get_int (const DbusmenuMenuitem * mi, const gchar * property)
1372{1372{
1373 GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);1373 GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);
1374 if (variant == NULL) return 0;1374 if (variant == NULL) return 0;
@@ -1401,7 +1401,7 @@
1401 * is not set or is not a byte array.1401 * is not set or is not a byte array.
1402 */1402 */
1403const guchar *1403const guchar *
1404dbusmenu_menuitem_property_get_byte_array (DbusmenuMenuitem * mi, const gchar * property, gsize * nelements)1404dbusmenu_menuitem_property_get_byte_array (const DbusmenuMenuitem * mi, const gchar * property, gsize * nelements)
1405{1405{
1406 GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);1406 GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);
1407 if (variant == NULL) {1407 if (variant == NULL) {
@@ -1423,7 +1423,7 @@
1423 * Return value: A boolean checking to see if the property is available1423 * Return value: A boolean checking to see if the property is available
1424 */1424 */
1425gboolean1425gboolean
1426dbusmenu_menuitem_property_exist (DbusmenuMenuitem * mi, const gchar * property)1426dbusmenu_menuitem_property_exist (const DbusmenuMenuitem * mi, const gchar * property)
1427{1427{
1428 g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE);1428 g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE);
1429 g_return_val_if_fail(property != NULL, FALSE);1429 g_return_val_if_fail(property != NULL, FALSE);
14301430
=== modified file 'libdbusmenu-glib/menuitem.h'
--- libdbusmenu-glib/menuitem.h 2012-01-26 19:50:22 +0000
+++ libdbusmenu-glib/menuitem.h 2012-04-25 15:45:37 +0000
@@ -498,12 +498,12 @@
498gboolean dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * property, const gboolean value);498gboolean dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * property, const gboolean value);
499gboolean dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * property, const gint value);499gboolean dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * property, const gint value);
500gboolean dbusmenu_menuitem_property_set_byte_array (DbusmenuMenuitem * mi, const gchar * property, const guchar * value, gsize nelements);500gboolean dbusmenu_menuitem_property_set_byte_array (DbusmenuMenuitem * mi, const gchar * property, const guchar * value, gsize nelements);
501const gchar * dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property);501const gchar * dbusmenu_menuitem_property_get (const DbusmenuMenuitem * mi, const gchar * property);
502GVariant * dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * property);502GVariant * dbusmenu_menuitem_property_get_variant (const DbusmenuMenuitem * mi, const gchar * property);
503gboolean dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * property);503gboolean dbusmenu_menuitem_property_get_bool (const DbusmenuMenuitem * mi, const gchar * property);
504gint dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * property);504gint dbusmenu_menuitem_property_get_int (const DbusmenuMenuitem * mi, const gchar * property);
505const guchar * dbusmenu_menuitem_property_get_byte_array (DbusmenuMenuitem * mi, const gchar * property, gsize * nelements);505const guchar * dbusmenu_menuitem_property_get_byte_array (const DbusmenuMenuitem * mi, const gchar * property, gsize * nelements);
506gboolean dbusmenu_menuitem_property_exist (DbusmenuMenuitem * mi, const gchar * property);506gboolean dbusmenu_menuitem_property_exist (const DbusmenuMenuitem * mi, const gchar * property);
507GList * dbusmenu_menuitem_properties_list (DbusmenuMenuitem * mi) G_GNUC_WARN_UNUSED_RESULT;507GList * dbusmenu_menuitem_properties_list (DbusmenuMenuitem * mi) G_GNUC_WARN_UNUSED_RESULT;
508GHashTable * dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi);508GHashTable * dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi);
509void dbusmenu_menuitem_property_remove (DbusmenuMenuitem * mi, const gchar * property);509void dbusmenu_menuitem_property_remove (DbusmenuMenuitem * mi, const gchar * property);

Subscribers

People subscribed via source and target branches

to all changes: