[gnome-builder/wip/chergert/merge-shortcuts] shortcuts: allow NULL for some instance parameters



commit 62e5cab64d203e4b57534af4b5606c89c705b459
Author: Christian Hergert <chergert redhat com>
Date:   Mon May 22 22:03:41 2017 -0700

    shortcuts: allow NULL for some instance parameters

 libide/shortcuts/ide-shortcut-manager.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/libide/shortcuts/ide-shortcut-manager.c b/libide/shortcuts/ide-shortcut-manager.c
index fbeaca9..670cad8 100644
--- a/libide/shortcuts/ide-shortcut-manager.c
+++ b/libide/shortcuts/ide-shortcut-manager.c
@@ -796,10 +796,13 @@ ide_shortcut_manager_add_action (IdeShortcutManager *self,
   IdeShortcutNodeData *data;
   GNode *parent;
 
-  g_return_if_fail (IDE_IS_SHORTCUT_MANAGER (self));
+  g_return_if_fail (!self || IDE_IS_SHORTCUT_MANAGER (self));
   g_return_if_fail (detailed_action_name != NULL);
   g_return_if_fail (title != NULL);
 
+  if (self == NULL)
+    self = ide_shortcut_manager_get_default ();
+
   section = g_intern_string (section);
   group = g_intern_string (group);
   title = g_intern_string (title);
@@ -831,10 +834,13 @@ ide_shortcut_manager_add_command (IdeShortcutManager *self,
   IdeShortcutNodeData *data;
   GNode *parent;
 
-  g_return_if_fail (IDE_IS_SHORTCUT_MANAGER (self));
+  g_return_if_fail (!self || IDE_IS_SHORTCUT_MANAGER (self));
   g_return_if_fail (command != NULL);
   g_return_if_fail (title != NULL);
 
+  if (self == NULL)
+    self = ide_shortcut_manager_get_default ();
+
   section = g_intern_string (section);
   group = g_intern_string (group);
   title = g_intern_string (title);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]