[perl-Gtk2] GtkIconTheme: a few undef fixes
- From: Torsten Schönfeld <tsch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [perl-Gtk2] GtkIconTheme: a few undef fixes
- Date: Sun, 16 May 2010 11:26:15 +0000 (UTC)
commit a8850f1938d4e0c32a11438a2ea705a0019bbb58
Author: Quentin Sculo <squentin free fr>
Date: Thu May 13 22:24:03 2010 +0200
GtkIconTheme: a few undef fixes
also add a small comment for gtk_icon_theme_set_custom_theme
t/GtkIconTheme.t | 1 +
xs/GtkIconTheme.xs | 13 +++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/t/GtkIconTheme.t b/t/GtkIconTheme.t
index ba0120c..6c785ec 100644
--- a/t/GtkIconTheme.t
+++ b/t/GtkIconTheme.t
@@ -90,6 +90,7 @@ is_deeply ([$icon_theme->get_search_path], \ paths);
# cannot call set_custom_theme on a default theme
$icon_theme = Gtk2::IconTheme->new;
$icon_theme->set_custom_theme ('crazy custom theme');
+$icon_theme->set_custom_theme (undef);
# Ignore result. Might be anything, including undef.
$icon_theme->get_example_icon_name;
diff --git a/xs/GtkIconTheme.xs b/xs/GtkIconTheme.xs
index 6bfa719..e94c712 100644
--- a/xs/GtkIconTheme.xs
+++ b/xs/GtkIconTheme.xs
@@ -72,7 +72,12 @@ void gtk_icon_theme_append_search_path (GtkIconTheme *icon_theme, GPerlFilename_
## void gtk_icon_theme_prepend_search_path (GtkIconTheme *icon_theme, const gchar *path);
void gtk_icon_theme_prepend_search_path (GtkIconTheme *icon_theme, GPerlFilename_const path);
-void gtk_icon_theme_set_custom_theme (GtkIconTheme *icon_theme, const gchar *theme_name);
+=for apidoc
+
+Cannot be used on a C<Gtk2::IconTheme> returned by Gtk2::IconTheme->get_default or Gtk2::IconTheme->get_for_screen.
+
+=cut
+void gtk_icon_theme_set_custom_theme (GtkIconTheme *icon_theme, const gchar_ornull *theme_name);
gboolean gtk_icon_theme_has_icon (GtkIconTheme *icon_theme, const gchar *icon_name);
@@ -106,7 +111,7 @@ gtk_icon_theme_list_icons (GtkIconTheme * icon_theme, const gchar_ornull * conte
g_list_free (list);
## char * gtk_icon_theme_get_example_icon_name (GtkIconTheme *icon_theme);
-gchar_own * gtk_icon_theme_get_example_icon_name (GtkIconTheme *icon_theme);
+gchar_own_ornull * gtk_icon_theme_get_example_icon_name (GtkIconTheme *icon_theme);
gboolean gtk_icon_theme_rescan_if_needed (GtkIconTheme *icon_theme);
@@ -189,7 +194,7 @@ MODULE = Gtk2::IconTheme PACKAGE = Gtk2::IconInfo PREFIX = gtk_icon_info_
gint gtk_icon_info_get_base_size (GtkIconInfo *icon_info);
-const gchar *gtk_icon_info_get_filename (GtkIconInfo *icon_info);
+const gchar_ornull *gtk_icon_info_get_filename (GtkIconInfo *icon_info);
GdkPixbuf_ornull * gtk_icon_info_get_builtin_pixbuf (GtkIconInfo *icon_info);
@@ -242,7 +247,7 @@ gtk_icon_info_get_attach_points (GtkIconInfo *icon_info)
g_free (points);
}
-const gchar *gtk_icon_info_get_display_name (GtkIconInfo *icon_info);
+const gchar_ornull *gtk_icon_info_get_display_name (GtkIconInfo *icon_info);
#if GTK_CHECK_VERSION (2, 14, 0)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]