cleanup

[platform/upstream/glib.git] / gio / gcontenttype.h

diff --git a/gio/gcontenttype.h b/gio/gcontenttype.h
index 95c9475..647c7d7 100644 (file)
--- a/gio/gcontenttype.h
+++ b/gio/gcontenttype.h
@@ -13,43 +13,57 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_CONTENT_TYPE_H__
+#define __G_CONTENT_TYPE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_CONTENT_TYPE_H__
-#define __G_CONTENT_TYPE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
 
-gboolean g_content_type_equals            (const char   *type1,
-                                          const char   *type2);
-gboolean g_content_type_is_a              (const char   *type,
-                                          const char   *supertype);
-gboolean g_content_type_is_unknown        (const char   *type);
-char *   g_content_type_get_description   (const char   *type);
-char *   g_content_type_get_mime_type     (const char   *type);
-GIcon *  g_content_type_get_icon          (const char   *type);
-gboolean g_content_type_can_be_executable (const char   *type);
+GLIB_AVAILABLE_IN_ALL
+gboolean g_content_type_equals            (const gchar  *type1,
+                                           const gchar  *type2);
+GLIB_AVAILABLE_IN_ALL
+gboolean g_content_type_is_a              (const gchar  *type,
+                                           const gchar  *supertype);
+GLIB_AVAILABLE_IN_ALL
+gboolean g_content_type_is_unknown        (const gchar  *type);
+GLIB_AVAILABLE_IN_ALL
+gchar *  g_content_type_get_description   (const gchar  *type);
+GLIB_AVAILABLE_IN_ALL
+gchar *  g_content_type_get_mime_type     (const gchar  *type);
+GLIB_AVAILABLE_IN_ALL
+GIcon *  g_content_type_get_icon          (const gchar  *type);
+GLIB_AVAILABLE_IN_2_34
+GIcon *  g_content_type_get_symbolic_icon (const gchar  *type);
+GLIB_AVAILABLE_IN_2_34
+gchar *  g_content_type_get_generic_icon_name (const gchar  *type);
+
+GLIB_AVAILABLE_IN_ALL
+gboolean g_content_type_can_be_executable (const gchar  *type);
 
-char *   g_content_type_from_mime_type    (const char   *mime_type);
+GLIB_AVAILABLE_IN_ALL
+gchar *  g_content_type_from_mime_type    (const gchar  *mime_type);
 
-char *   g_content_type_guess             (const char   *filename,
-                                          const guchar *data,
-                                          gsize         data_size,
-                                          gboolean     *result_uncertain);
+GLIB_AVAILABLE_IN_ALL
+gchar *  g_content_type_guess             (const gchar  *filename,
+                                           const guchar *data,
+                                           gsize         data_size,
+                                           gboolean     *result_uncertain);
 
-char **  g_content_type_guess_for_tree    (GFile        *root);
+GLIB_AVAILABLE_IN_ALL
+gchar ** g_content_type_guess_for_tree    (GFile        *root);
 
+GLIB_AVAILABLE_IN_ALL
 GList *  g_content_types_get_registered   (void);
 
 G_END_DECLS