Merge lp:~ricotz/bamf/replace-user-visible into lp:bamf/0.4

[Rico Tzschichholz]

libbamf: add bamf_view_is_user_visible ()

This makes the gir/vala api nicer and avoids a conlict with the property.
Mark bamf_view_user_visible as deprecated using glib 2.32 macro

This makes the gir/vala api nicer and avoids a conflict with the property.
Mark bamf_view_user_visible as deprecated using glib 2.32 macro

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified.

review: Needs Fixing (continuous-integration)

=== modified file 'configure.in'
--- configure.in	2012-10-08 10:24:47 +0000
+++ configure.in	2012-10-27 07:44:19 +0000
@@ -57,7 +57,7 @@
 #
 # glib
 #
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28.0 gio-2.0 >= 2.30.0 gio-unix-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32.0 gio-2.0 >= 2.30.0 gio-unix-2.0)
 
 #
 # gdbus-codegen

=== modified file 'lib/libbamf/bamf-view.c'
--- lib/libbamf/bamf-view.c	2012-10-08 16:34:51 +0000
+++ lib/libbamf/bamf-view.c	2012-10-27 07:44:19 +0000
@@ -267,19 +267,35 @@
 }
 
 /**
- * bamf_view_user_visible:
- * @view: a #BamfView
- *
- * Returns: a boolean useful for determining if a particular view is "user visible". User visible
- * is a concept relating to whether or not a window should be shown in a launcher tasklist.
+ * bamf_view_is_user_visible:
+ * @view: a #BamfView
+ *
+ * Returns: a boolean useful for determining if a particular view is "user visible". User visible
+ * is a concept relating to whether or not a window should be shown in a launcher tasklist.
+ *
+ * Since: 0.4.0
+ */
+gboolean
+bamf_view_is_user_visible (BamfView *self)
+{
+  g_return_val_if_fail (BAMF_IS_VIEW (self), FALSE);
+  
+  return bamf_view_get_boolean (self, "UserVisible", BAMF_VIEW_VISIBLE_FLAG);
+}
+
+/**
+ * bamf_view_user_visible: (skip)
+ * @view: a #BamfView
+ *
+ * Returns: a boolean useful for determining if a particular view is "user visible". User visible
+ * is a concept relating to whether or not a window should be shown in a launcher tasklist.
+ *
+ * Deprecated: 0.4.0
  */
 gboolean
 bamf_view_user_visible (BamfView *self)
 {
-  g_return_val_if_fail (BAMF_IS_VIEW (self), FALSE);
-  
-  return bamf_view_get_boolean (self, "UserVisible", BAMF_VIEW_VISIBLE_FLAG);
-
+  return bamf_view_is_user_visible (self);
 }
 
 /**
@@ -706,7 +722,7 @@
         break;
       
       case PROP_USER_VISIBLE:
-        g_value_set_boolean (value, bamf_view_user_visible (self));
+        g_value_set_boolean (value, bamf_view_is_user_visible (self));
         break;
       
       default:
@@ -827,7 +843,7 @@
   priv = view->priv;
   priv->checked_flags = 0x0;
 
-  if (bamf_view_user_visible (view))
+  if (bamf_view_is_user_visible (view))
     {
       g_signal_emit (G_OBJECT(view), view_signals[VISIBLE_CHANGED], 0, TRUE);
       g_object_notify (G_OBJECT (view), "user-visible");

=== modified file 'lib/libbamf/bamf-view.h'
--- lib/libbamf/bamf-view.h	2012-10-08 11:41:04 +0000
+++ lib/libbamf/bamf-view.h	2012-10-27 07:44:19 +0000
@@ -116,10 +116,13 @@
 
 gboolean   bamf_view_is_urgent     (BamfView *view);
 
+gboolean   bamf_view_is_user_visible  (BamfView *view);
+
 gchar    * bamf_view_get_name      (BamfView *view);
 
 gchar    * bamf_view_get_icon      (BamfView *view);
 
+GLIB_DEPRECATED
 gboolean   bamf_view_user_visible  (BamfView *view);
 
 const gchar    * bamf_view_get_view_type (BamfView *view);

=== modified file 'tests/functional/alt-tabber.c'
--- tests/functional/alt-tabber.c	2011-01-26 14:15:59 +0000
+++ tests/functional/alt-tabber.c	2012-10-27 07:44:19 +0000
@@ -58,7 +58,7 @@
   {
     app = BAMF_APPLICATION (l->data);
     
-    if (!bamf_view_user_visible (BAMF_VIEW (app)))
+    if (!bamf_view_is_user_visible (BAMF_VIEW (app)))
       continue;
 
     gtk_tree_store_append (store, &position, NULL);
@@ -75,7 +75,7 @@
         {
           window = BAMF_WINDOW (c->data);
 
-          if (!bamf_view_user_visible (BAMF_VIEW (window)))
+          if (!bamf_view_is_user_visible (BAMF_VIEW (window)))
             continue;
 
           const gchar *name = bamf_view_get_name (BAMF_VIEW (window));