Merge lp:~timo-jyrinki/bamf/revert-474-0.2 into lp:bamf/0.2

[Timo Jyrinki]

Revert r474 - preferable not to change dependencies in stable release (was: Enable introspection)

Revert r474 - preferable not to change dependencies in stable release (was: Enable introspection)

[Łukasz Zemczak (sil2100)]

Looks good to me. If distro says it needs reverting, let be it!

review: Approve

=== modified file 'Makefile.am.marshal'
--- Makefile.am.marshal	2012-07-01 18:12:17 +0000
+++ Makefile.am.marshal	2012-11-27 13:41:43 +0000
@@ -23,7 +23,7 @@
 EXTRA_DIST += $(glib_marshal_list)
 
 stamp-marshal: $(glib_marshal_list)
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) \
+	$(QUIET_GEN)$(GLIB_GENMARSHAL) \
 		--prefix=$(glib_marshal_prefix) \
 		--header \
 	$(srcdir)/$(glib_marshal_list) > xgen-mh \
@@ -35,7 +35,7 @@
 	@true
 
 $(marshal_c): $(marshal_h)
-	$(AM_V_GEN)(echo "#include \"$(marshal_h)\"" ; \
+	$(QUIET_GEN)(echo "#include \"$(marshal_h)\"" ; \
 	$(GLIB_GENMARSHAL) \
 		--prefix=$(glib_marshal_prefix) \
 		--body \
 
=== modified file 'configure.in'
--- configure.in	2012-11-14 06:54:12 +0000
+++ configure.in	2012-11-27 13:41:43 +0000
@@ -9,7 +9,6 @@
 AC_CONFIG_HEADERS(config.h)
 
 AM_INIT_AUTOMAKE([foreign tar-pax])
-AM_SILENT_RULES([yes])
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -106,7 +105,7 @@
 # GObject Introspection
 ###########################
 
-GOBJECT_INTROSPECTION_CHECK([0.10.2])
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
 ###########################
 # Vala API Generation
@@ -175,7 +174,6 @@
 
   Build Environment
     Install Prefix:     ${prefix}
-    Introspection:      ${enable_introspection}
     GTK+ Version:       ${with_gtk}
     Headless tests:     ${enable_headless_tests}
 
 
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-07-01 18:12:17 +0000
+++ data/Makefile.am	2012-11-27 13:41:43 +0000
@@ -4,6 +4,6 @@
 EXTRA_DIST=org.ayatana.bamf.service.in
 
 org.ayatana.bamf.service: org.ayatana.bamf.service.in
-	$(AM_V_GEN)sed "s,@LIBEXECDIR@,$(libexecdir)," $< > $@
+	sed "s,@LIBEXECDIR@,$(libexecdir)," $< > $@
 
 CLEANFILES = org.ayatana.bamf.service
 
=== removed file 'lib/libbamf/Bamf-0.2.metadata'
--- lib/libbamf/Bamf-0.2.metadata	2012-07-01 18:38:29 +0000
+++ lib/libbamf/Bamf-0.2.metadata	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-TabSource.show_tab skip
 
=== modified file 'lib/libbamf/Makefile.am'
--- lib/libbamf/Makefile.am	2012-11-27 11:39:42 +0000
+++ lib/libbamf/Makefile.am	2012-11-27 13:41:43 +0000
@@ -12,7 +12,6 @@
 EXTRA_DIST = 
 
 include $(top_srcdir)/Makefile.am.marshal
--include $(INTROSPECTION_MAKEFILE)
 
 libbamf_sources = \
   bamf-application.c \
@@ -82,7 +81,7 @@
 glib_marshal_prefix = bamf_marshal
 
 bamf-tab-source-glue.h: bamf-tab-source-glue.xml
-	$(AM_V_GEN)$(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=bamf_tab_source --mode=glib-server --output=$@ $<
+	$(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=bamf_tab_source --mode=glib-server --output=$@ $<
 
 BUILT_SOURCES += \
 	bamf-tab-source-glue.h \
@@ -106,51 +105,47 @@
 # GObject Introsepction 
 #########################
 
-INTROSPECTION_GIRS = 
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-
-if HAVE_INTROSPECTION
-
-introspection_sources = $(libbamf_la_SOURCES)
-
-Bamf-0.2.gir: libbamf.la
-Bamf_0_2_gir_INCLUDES = GObject-2.0 GLib-2.0
-Bamf_0_2_gir_CFLAGS = \
-	--c-include='libbamf/libbamf.h' \
-	$(DBUS_CFLAGS) \
-	-I$(top_srcdir)/lib \
-	-I$(top_builddir)/lib \
-	$(NULL)
-Bamf_0_2_gir_LIBS = libbamf.la
-Bamf_0_2_gir_FILES = $(introspection_sources)
-Bamf_0_2_gir_EXPORT_PACKAGES = libbamf$(VER)
-
-INTROSPECTION_GIRS += Bamf-0.2.gir
-
-girdir = $(datadir)/gir-1.0
-dist_gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
-
-endif
+#-include $(INTROSPECTION_MAKEFILE)
+#INTROSPECTION_GIRS = 
+#INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+#INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+#if HAVE_INTROSPECTION
+
+#introspection_sources = $(library_include_HEADERS)
+
+#Bamf-0.2.gir: libbamf.la
+#Bamf_0_2_gir_INCLUDES = \
+#	GObject-2.0
+#Bamf_0_2_gir_CFLAGS = --c-include='libbamf/libbamf.h' $(LIBBAMF_CFLAGS) -I$(top_srcdir)/lib -I$(top_builddir)/lib
+#Bamf_0_2_gir_LIBS = libbamf.la 
+#Bamf_0_2_gir_FILES = $(introspection_sources)
+#
+#INTROSPECTION_GIRS += Bamf-0.2.gir
+#
+#girdir = $(datadir)/gir-1.0
+#dist_gir_DATA = $(INTROSPECTION_GIRS)
+
+#typelibdir = $(libdir)/girepository-1.0
+#typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+#CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
+
+#endif
 
 #########################
 # VAPI Files
 #########################
 
-if HAVE_INTROSPECTION
-
-vapidir = $(datadir)/vala/vapi
-vapi_DATA = libbamf$(VER).vapi
-
-$(vapi_DATA): $(INTROSPECTION_GIRS)
-	$(AM_V_GEN)$(VALA_API_GEN) --library=$(@:.vapi=) $<
-
-DISTCLEANFILES += $(vapi_DATA)
-
-endif
+#if HAVE_INTROSPECTION
+
+#vapidir = $(datadir)/vala/vapi
+#vapi_DATA = Bamf-0.2.vapi
+
+#Bamf-0.2.vapi: Bamf-0.2.gir
+#	$(VALA_API_GEN) --library=Bamf-0.2 $<
+
+#CLEANFILES += $(vapi_DATA)
+
+#endif
 
 
=== modified file 'lib/libbamf/bamf-application.c'
--- lib/libbamf/bamf-application.c	2012-11-27 11:39:42 +0000
+++ lib/libbamf/bamf-application.c	2012-11-27 13:41:43 +0000
@@ -71,15 +71,6 @@
   int              show_stubs;
 };
 
-/**
- * bamf_application_get_desktop_file:
- * @application: a #BamfApplication
- *
- * Used to fetch the path to the .desktop file associated with the passed application. If
- * none exists, the result is NULL.
- *
- * Returns: A string representing the path to the desktop file.
- */
 const gchar *
 bamf_application_get_desktop_file (BamfApplication *application)
 {
@@ -119,16 +110,6 @@
   return file;
 }
 
-/**
- * bamf_application_get_applicaton_type:
- * @application: a #BamfApplication
- *
- * Used to determine what type of application a .desktop file represents. Current values are:
- *  "system" : A normal application, like firefox or evolution
- *  "web"    : A web application, like facebook or twitter
- *
- * Returns: A string
- */
 const gchar *
 bamf_application_get_application_type (BamfApplication *application)
 {
@@ -162,14 +143,6 @@
   return type;
 }
 
-/**
- * bamf_application_get_xids:
- * @application: a #BamfApplication
- *
- * Used to fetch all #BamfWindow's xids associated with the passed #BamfApplication.
- *
- * Returns: (element-type guint) (transfer full): An array of xids.
- */
 GArray *
 bamf_application_get_xids (BamfApplication *application)
 {
@@ -199,14 +172,6 @@
   return xids;
 }
 
-/**
- * bamf_application_get_windows:
- * @application: a #BamfApplication
- *
- * Used to fetch all #BamfWindow's associated with the passed #BamfApplication.
- *
- * Returns: (element-type Bamf.Window) (transfer container): A list of #BamfWindow's.
- */
 GList *
 bamf_application_get_windows (BamfApplication *application)
 {
@@ -232,14 +197,6 @@
   return windows;
 }
 
-/**
- * bamf_application_get_show_menu_stubs:
- * @application: a #BamfApplication
- *
- * Used to discover whether the application wants menu stubs shown.
- *
- * Returns: Whether the stubs should be shown.
- */
 gboolean
 bamf_application_get_show_menu_stubs (BamfApplication * application)
 {
 
=== modified file 'lib/libbamf/bamf-application.h'
--- lib/libbamf/bamf-application.h	2012-07-01 18:13:55 +0000
+++ lib/libbamf/bamf-application.h	2012-11-27 13:41:43 +0000
@@ -75,15 +75,58 @@
 
 GType             bamf_application_get_type             (void) G_GNUC_CONST;
 
+/**
+ * bamf_application_get_applicaton_type:
+ * @application: a #BamfApplication
+ *
+ * Used to determine what type of application a .desktop file represents. Current values are:
+ *  "system" : A normal application, like firefox or evolution
+ *  "web"    : A web application, like facebook or twitter
+ *
+ * Returns: A string
+ */
 const gchar     * bamf_application_get_application_type (BamfApplication *application);
 
+/**
+ * bamf_application_get_desktop_file:
+ * @application: a #BamfApplication
+ *
+ * Used to fetch the path to the .desktop file associated with the passed application. If
+ * none exists, the result is NULL.
+ *
+ * Returns: A string representing the path to the desktop file.
+ */
 const gchar     * bamf_application_get_desktop_file     (BamfApplication *application);
 
-GList           * bamf_application_get_windows          (BamfApplication *application);
-
-GArray          * bamf_application_get_xids             (BamfApplication *application);
-
-gboolean          bamf_application_get_show_menu_stubs  (BamfApplication *application);
+/**
+ * bamf_application_get_windows:
+ * @application: a #BamfApplication
+ *
+ * Used to fetch all #BamfWindow's associated with the passed #BamfApplication.
+ *
+ * Returns: (element-type Bamf.Window) (transfer container): A list of #BamfWindow's.
+ */
+GList * bamf_application_get_windows (BamfApplication *application);
+
+/**
+ * bamf_application_get_xids:
+ * @application: a #BamfApplication
+ *
+ * Used to fetch all #BamfWindow's xids associated with the passed #BamfApplication.
+ *
+ * Returns: (transfer full): An array of xids.
+ */
+GArray * bamf_application_get_xids (BamfApplication *application);
+
+/**
+ * bamf_application_get_show_stubs:
+ * @application: a #BamfApplication
+ *
+ * Used to discover whether the application wants menu stubs shown.
+ *
+ * Returns: Whether the stubs should be shown.
+ */
+gboolean bamf_application_get_show_menu_stubs (BamfApplication *application);
 
 G_END_DECLS
 
 
=== modified file 'lib/libbamf/bamf-matcher.c'
--- lib/libbamf/bamf-matcher.c	2012-11-27 11:39:42 +0000
+++ lib/libbamf/bamf-matcher.c	2012-11-27 13:41:43 +0000
@@ -346,14 +346,6 @@
 /*
  * Public Methods
  */
-
-/**
- * bamf_matcher_get_default:
- *
- * Returns the default matcher. This matcher is owned by bamf and shared between other callers.
- *
- * Returns: (transfer full): A new #BamfMatcher
- */
 BamfMatcher *
 bamf_matcher_get_default (void)
 {
@@ -363,14 +355,6 @@
   return (default_matcher = g_object_new (BAMF_TYPE_MATCHER, NULL));
 }
 
-/**
- * bamf_matcher_get_active_application:
- * @matcher: a #BamfMatcher
- *
- * Used to fetch the active #BamfApplication.
- *
- * Returns: (transfer none): The active #BamfApplication.
- */
 BamfApplication *
 bamf_matcher_get_active_application (BamfMatcher *matcher)
 {
@@ -413,14 +397,6 @@
   return BAMF_APPLICATION (view);
 }
 
-/**
- * bamf_matcher_get_active_window:
- * @matcher: a #BamfMatcher
- *
- * Used to fetch the active #BamfWindow.
- *
- * Returns: (transfer none): The active #BamfWindow.
- */
 BamfWindow *
 bamf_matcher_get_active_window (BamfMatcher *matcher)
 {
@@ -463,36 +439,16 @@
   return BAMF_WINDOW (view);
 }
 
-/**
- * bamf_matcher_get_application_for_window:
- * @matcher: a #BamfMatcher
- * @window: The window to look for
- *
- * Used to fetch the #BamfApplication containing the passed window.
- *
- * Returns: (transfer none): The #BamfApplication representing the xid passed, or NULL if none exists.
- */
+/* Looks up the window's XID and calls the application_for_xid
+   function just below here. */
 BamfApplication * 
 bamf_matcher_get_application_for_window  (BamfMatcher *matcher,
                                           BamfWindow *window)
 {
-  /* Looks up the window's XID and calls the application_for_xid
-     function just below here. */
-
 	g_return_val_if_fail(BAMF_IS_WINDOW(window), NULL);
-	return bamf_matcher_get_application_for_xid (matcher,
-	                                             bamf_window_get_xid(window));
+	return bamf_matcher_get_application_for_xid (matcher, bamf_window_get_xid(window));
 }
 
-/**
- * bamf_matcher_get_application_for_xid:
- * @matcher: a #BamfMatcher
- * @xid: The XID to search for
- *
- * Used to fetch the #BamfApplication containing the passed xid.
- *
- * Returns: (transfer none): The #BamfApplication representing the xid passed, or NULL if none exists.
- */
 BamfApplication *
 bamf_matcher_get_application_for_xid (BamfMatcher  *matcher,
                                       guint32       xid)
@@ -566,17 +522,6 @@
   return running;
 }
 
-/**
- * bamf_matcher_get_applications:
- * @matcher: a #BamfMatcher
- *
- * Used to fetch all #BamfApplication's running or not. Application authors who wish to only 
- * see running applications should use bamf_matcher_get_running_applications instead. The reason
- * this method is needed is bamf will occasionally track applications which are not currently
- * running for nefarious purposes.
- *
- * Returns: (element-type Bamf.Application) (transfer container): A list of #BamfApplication's.
- */
 GList *
 bamf_matcher_get_applications (BamfMatcher *matcher)
 {
@@ -620,14 +565,6 @@
   return result;
 }
 
-/**
- * bamf_matcher_get_windows:
- * @matcher: a #BamfMatcher
- *
- * Used to fetch all windows that BAMF knows about.
- *
- * Returns: (element-type Bamf.View) (transfer container): A list of windows.
- */
 GList *
 bamf_matcher_get_windows (BamfMatcher *matcher)
 {
@@ -671,16 +608,6 @@
   return result;
 }
 
-/**
- * bamf_matcher_get_window_stack_for_monitor:
- * @matcher: a #BamfMatcher
- * @monitor: the monitor you want the stack from, negative value to get all
- *
- * Used to fetch all windows that BAMF knows about in the requested screen,
- * in stacking bottom-to-top order.
- *
- * Returns: (element-type Bamf.View) (transfer container): A list of #BamfWindow.
- */
 GList *
 bamf_matcher_get_window_stack_for_monitor (BamfMatcher *matcher, gint monitor)
 {
@@ -726,14 +653,6 @@
   return result;
 }
 
-/**
- * bamf_matcher_register_favorites:
- * @matcher: a #BamfMatcher
- * @favorites: an array of strings, each containing an absolute path to a .desktop file
- *
- * Used to effect how bamf performs matching. Desktop files passed to this method will
- * be prefered by bamf to system desktop files.
- */
 void
 bamf_matcher_register_favorites (BamfMatcher *matcher,
                                  const gchar **favorites)
@@ -751,14 +670,6 @@
                               G_TYPE_INVALID);
 }
 
-/**
- * bamf_matcher_get_running_applications:
- * @matcher: a #BamfMatcher
- *
- * Used to fetch all #BamfApplication's which are running.
- *
- * Returns: (element-type Bamf.Application) (transfer container): A list of #BamfApplication's.
- */
 GList *
 bamf_matcher_get_running_applications (BamfMatcher *matcher)
 {
@@ -802,14 +713,6 @@
   return result;
 }
 
-/**
- * bamf_matcher_get_tabs:
- * @matcher: a #BamfMatcher
- *
- * Used to fetch all #BamfView's representing tabs. Currently unused.
- *
- * Returns: (element-type Bamf.View) (transfer container): A list of #BamfViews's.
- */
 GList *
 bamf_matcher_get_tabs (BamfMatcher *matcher)
 {
@@ -817,15 +720,6 @@
   return NULL;
 }
 
-/**
- * bamf_matcher_get_xids_for_application:
- * @matcher: a #BamfMatcher
- *
- * Used to fetch all xid's associated with an application. Useful for performing window
- * 
- *
- * Returns: (element-type guint32) (transfer full): A list of xids.
- */
 GArray *
 bamf_matcher_get_xids_for_application (BamfMatcher *matcher,
                                        const gchar *application)
@@ -834,14 +728,6 @@
   return NULL;
 }
 
-/**
- * bamf_matcher_get_application_for_desktop_file:
- * @matcher: a #BamfMatcher
- * @desktop_file_path: Path to the desktop file
- * @create_if_not_found: Create a #BamfApplication if one isn't found
- *
- * Returns: (transfer none): A #BamfApplication for given desktop file.
- */
 BamfApplication * 
 bamf_matcher_get_application_for_desktop_file (BamfMatcher *matcher,
                                                const gchar *desktop_file_path,
 
=== modified file 'lib/libbamf/bamf-matcher.h'
--- lib/libbamf/bamf-matcher.h	2012-07-01 18:13:55 +0000
+++ lib/libbamf/bamf-matcher.h	2012-11-27 13:41:43 +0000
@@ -76,34 +76,138 @@
 
 GType             bamf_matcher_get_type                 (void) G_GNUC_CONST;
 
+/**
+ * bamf_matcher_get_default:
+ * @matcher: a #BamfMatcher
+ *
+ * Returns the default matcher. This matcher is owned by bamf and shared between other callers.
+ *
+ * Returns: (transfer none): A new #BamfMatcher
+ */
 BamfMatcher     * bamf_matcher_get_default              (void);
 
+/**
+ * bamf_matcher_get_active_application:
+ * @matcher: a #BamfMatcher
+ *
+ * Used to fetch the active #BamfApplication.
+ *
+ * Returns: (transfer none): The active #BamfApplication.
+ */
 BamfApplication * bamf_matcher_get_active_application   (BamfMatcher *matcher);
 
+/**
+ * bamf_matcher_get_active_window:
+ * @matcher: a #BamfMatcher
+ *
+ * Used to fetch the active #BamfWindow.
+ *
+ * Returns: (transfer none): The active #BamfWindow.
+ */
 BamfWindow      * bamf_matcher_get_active_window        (BamfMatcher *matcher);
 
+/**
+ * bamf_matcher_get_application_for_xid:
+ * @matcher: a #BamfMatcher
+ * @xid: The XID to search for
+ *
+ * Used to fetch the #BamfApplication containing the passed xid.
+ *
+ * Returns: (transfer container): The #BamfApplication representing the xid passed, or NULL if none exists.
+ */
 BamfApplication * bamf_matcher_get_application_for_xid  (BamfMatcher *matcher,
                                                          guint32      xid);
+/**
+ * bamf_matcher_get_application_for_window:
+ * @matcher: a #BamfMatcher
+ * @window: The window to look for
+ *
+ * Used to fetch the #BamfApplication containing the passed window.
+ *
+ * Returns: (transfer container): The #BamfApplication representing the xid passed, or NULL if none exists.
+ */
 BamfApplication * bamf_matcher_get_application_for_window  (BamfMatcher *matcher,
                                                             BamfWindow *window);
 
 gboolean          bamf_matcher_application_is_running   (BamfMatcher *matcher,
                                                          const gchar *application);
 
+/**
+ * bamf_matcher_get_applications:
+ * @matcher: a #BamfMatcher
+ *
+ * Used to fetch all #BamfApplication's running or not. Application authors who wish to only 
+ * see running applications should use bamf_matcher_get_running_applications instead. The reason
+ * this method is needed is bamf will occasionally track applications which are not currently
+ * running for nefarious purposes.
+ *
+ * Returns: (element-type Bamf.Application) (transfer container): A list of #BamfApplication's.
+ */
 GList *           bamf_matcher_get_applications         (BamfMatcher *matcher);
 
+/**
+ * bamf_matcher_register_favorites:
+ * @matcher: a #BamfMatcher
+ * @favorites: an array of strings, each containing an absolute path to a .desktop file
+ *
+ * Used to effect how bamf performs matching. Desktop files passed to this method will
+ * be prefered by bamf to system desktop files.
+ */
 void              bamf_matcher_register_favorites       (BamfMatcher *matcher,
                                                          const gchar **favorites);
 
+/**
+ * bamf_matcher_get_running_applications:
+ * @matcher: a #BamfMatcher
+ *
+ * Used to fetch all #BamfApplication's which are running.
+ *
+ * Returns: (element-type Bamf.Application) (transfer container): A list of #BamfApplication's.
+ */
 GList *           bamf_matcher_get_running_applications (BamfMatcher *matcher);
 
+/**
+ * bamf_matcher_get_tabs:
+ * @matcher: a #BamfMatcher
+ *
+ * Used to fetch all #BamfView's representing tabs. Currently unused.
+ *
+ * Returns: (element-type Bamf.View) (transfer container): A list of #BamfViews's.
+ */
 GList *           bamf_matcher_get_tabs                 (BamfMatcher *matcher);
 
+/**
+ * bamf_matcher_get_applications:
+ * @matcher: a #BamfMatcher
+ *
+ * Used to fetch all xid's associated with an application. Useful for performing window
+ * 
+ *
+ * Returns: (element-type guint32) (transfer none): A list of xids.
+ */
 GArray *          bamf_matcher_get_xids_for_application (BamfMatcher *matcher,
                                                          const gchar *application);
 
+/**
+ * bamf_matcher_get_windows:
+ * @matcher: a #BamfMatcher
+ *
+ * Used to fetch all windows that BAMF knows about.
+ *
+ * Returns: (element-type Bamf.View) (transfer container): A list of windows.
+ */
 GList *           bamf_matcher_get_windows (BamfMatcher *matcher);
 
+/**
+ * bamf_matcher_get_window_stack_for_monitor:
+ * @matcher: a #BamfMatcher
+ * @monitor: the monitor you want the stack from, negative value to get all
+ *
+ * Used to fetch all windows that BAMF knows about in the requested screen,
+ * in stacking bottom-to-top order.
+ *
+ * Returns: (element-type Bamf.View) (transfer container): A list of #BamfWindow.
+ */
 GList *           bamf_matcher_get_window_stack_for_monitor (BamfMatcher *matcher,
                                                              gint monitor);
 
 
=== modified file 'lib/libbamf/bamf-view.c'
--- lib/libbamf/bamf-view.c	2012-11-27 11:39:42 +0000
+++ lib/libbamf/bamf-view.c	2012-11-27 13:41:43 +0000
@@ -142,15 +142,6 @@
   return priv->set_flags & flag;
 }
 
-/**
- * bamf_view_get_children:
- * @view: a #BamfView
- *
- * Note: Makes sever dbus calls the first time this is called on a view. Dbus messaging is reduced afterwards.
- *
- * Returns: (element-type Bamf.View) (transfer container): Returns a list of #BamfView which must be
- *           freed after usage. Elements of the list are owned by bamf and should not be unreffed.
- */
 GList *
 bamf_view_get_children (BamfView *view)
 {
@@ -233,12 +224,6 @@
   return result;
 }
 
-/**
- * bamf_view_is_closed:
- * @view: a #BamfView
- *
- * Determines if the view is closed or not.
- */
 gboolean
 bamf_view_is_closed (BamfView *view)
 {
@@ -247,12 +232,6 @@
   return view->priv->is_closed;
 }
 
-/**
- * bamf_view_is_active:
- * @view: a #BamfView
- *
- * Determines if the view is currently active and focused by the user. Useful for an active window indicator. 
- */
 gboolean
 bamf_view_is_active (BamfView *view)
 {
@@ -265,14 +244,7 @@
 
 }
 
-/**
- * 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.
- */
-gboolean
+gboolean          
 bamf_view_user_visible (BamfView *self)
 {
   g_return_val_if_fail (BAMF_IS_VIEW (self), FALSE);
@@ -281,12 +253,6 @@
 
 }
 
-/**
- * bamf_view_is_running:
- * @view: a #BamfView
- *
- * Determines if the view is currently running. Useful for a running window indicator. 
- */
 gboolean
 bamf_view_is_running (BamfView *self)
 {
@@ -298,12 +264,6 @@
   return bamf_view_get_boolean (self, "IsRunning", BAMF_VIEW_RUNNING_FLAG);
 }
 
-/**
- * bamf_view_is_urgent:
- * @view: a #BamfView
- *
- * Determines if the view is currently requiring attention. Useful for a running window indicator. 
- */
 gboolean
 bamf_view_is_urgent (BamfView *self)
 {
@@ -376,12 +336,6 @@
     g_object_unref (view);
 }
 
-/**
- * bamf_view_get_icon:
- * @view: a #BamfView
- *
- * Gets the icon of a view. This icon is used to visually represent the view. 
- */
 gchar *
 bamf_view_get_icon (BamfView *self)
 {
@@ -420,12 +374,6 @@
   return icon;
 }
 
-/**
- * bamf_view_get_name:
- * @view: a #BamfView
- *
- * Gets the name of a view. This name is a short name best used to represent the view with text. 
- */
 gchar *
 bamf_view_get_name (BamfView *self)
 {
@@ -473,15 +421,6 @@
   return FALSE;
 }
 
-/**
- * bamf_view_get_view_type:
- * @view: a #BamfView
- *
- * The view type of a window is a short string used to represent all views of the same class. These
- * descriptions should not be used to do casting as they are not considered stable.
- *
- * Virtual: view_type
- */
 const gchar *
 bamf_view_get_view_type (BamfView *self)
 {
 
=== modified file 'lib/libbamf/bamf-view.h'
--- lib/libbamf/bamf-view.h	2012-07-01 18:13:55 +0000
+++ lib/libbamf/bamf-view.h	2012-11-27 13:41:43 +0000
@@ -106,22 +106,83 @@
 
 GType      bamf_view_get_type             (void) G_GNUC_CONST;
 
+/**
+ * bamf_view_get_children:
+ * @view: a #BamfView
+ *
+ * Note: Makes sever dbus calls the first time this is called on a view. Dbus messaging is reduced afterwards.
+ *
+ * Returns: (element-type Bamf.View) (transfer container): Returns a list of #BamfView which must be
+ *           freed after usage. Elements of the list are owned by bamf and should not be unreffed.
+ */
 GList    * bamf_view_get_children  (BamfView *view);
 
+/**
+ * bamf_view_is_active:
+ * @view: a #BamfView
+ *
+ * Determines if the view is closed or not.
+ */
 gboolean   bamf_view_is_closed     (BamfView *view);
 
+/**
+ * bamf_view_is_active:
+ * @view: a #BamfView
+ *
+ * Determines if the view is currently active and focused by the user. Useful for an active window indicator. 
+ */
 gboolean   bamf_view_is_active     (BamfView *view);
 
+/**
+ * bamf_view_is_running:
+ * @view: a #BamfView
+ *
+ * Determines if the view is currently running. Useful for a running window indicator. 
+ */
 gboolean   bamf_view_is_running    (BamfView *view);
 
+/**
+ * bamf_view_is_running:
+ * @view: a #BamfView
+ *
+ * Determines if the view is currently requiring attention. Useful for a running window indicator. 
+ */
 gboolean   bamf_view_is_urgent     (BamfView *view);
 
+/**
+ * bamf_view_get_name:
+ * @view: a #BamfView
+ *
+ * Gets the name of a view. This name is a short name best used to represent the view with text. 
+ */
 gchar    * bamf_view_get_name      (BamfView *view);
 
+/**
+ * bamf_view_get_icon:
+ * @view: a #BamfView
+ *
+ * Gets the icon of a view. This icon is used to visually represent the view. 
+ */
 gchar    * bamf_view_get_icon      (BamfView *view);
 
+/**
+ * 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.
+ */
 gboolean   bamf_view_user_visible  (BamfView *view);
 
+/**
+ * bamf_view_get_view_type:
+ * @view: a #BamfView
+ *
+ * The view type of a window is a short string used to represent all views of the same class. These
+ * descriptions should not be used to do casting as they are not considered stable.
+ *
+ * Returns: (transfer full): A gchar*
+ */
 const gchar    * bamf_view_get_view_type (BamfView *view);
 
 void bamf_view_set_sticky (BamfView *view, gboolean value);
 
=== modified file 'lib/libbamf/bamf-window.c'
--- lib/libbamf/bamf-window.c	2012-11-27 11:39:42 +0000
+++ lib/libbamf/bamf-window.c	2012-11-27 13:41:43 +0000
@@ -75,13 +75,6 @@
   return self->priv->last_active;
 }
 
-/**
- * bamf_window_get_transient:
- * @self: a #BamfWindow
- *
- * Returns: (transfer none) (nullable): A transient for this #BamfWindow.
- */
-
 BamfWindow * bamf_window_get_transient (BamfWindow *self)
 {
   BamfWindowPrivate *priv;