diff options
author | Arx Cruz <acruz@redhat.com> | 2015-04-21 13:51:23 +0200 |
---|---|---|
committer | Arx Cruz <acruz@redhat.com> | 2015-04-21 13:51:23 +0200 |
commit | a0fa643f1c980e8a70938d977600f935b9c215f6 (patch) | |
tree | fc05bba2f68a6f6bb0accbf25405e6ee4f55d216 /src/util.h | |
parent | ba5ea0386de2a80a664fb28d3af7e8d395968314 (diff) | |
parent | c45daa96bfdc5a958cc0f2cdaf4db71ac61b8fde (diff) | |
download | zenity-a0fa643f1c980e8a70938d977600f935b9c215f6.tar.gz |
Merge branch 'jjardon/no_deprecated'
Conflicts:
src/msg.c
Diffstat (limited to 'src/util.h')
-rw-r--r-- | src/util.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -21,14 +21,14 @@ GtkBuilder* zenity_util_load_ui_file (const gchar *widge gchar * zenity_util_strip_newline (gchar *string); gboolean zenity_util_fill_file_buffer (GtkTextBuffer *buffer, const gchar *filename); -const gchar * zenity_util_stock_from_filename (const gchar *filename); +const gchar * zenity_util_icon_name_from_filename (const gchar *filename); void zenity_util_set_window_icon (GtkWidget *widget, const gchar *filename, const gchar *default_file); -void zenity_util_set_window_icon_from_stock (GtkWidget *widget, +void zenity_util_set_window_icon_from_icon_name(GtkWidget *widget, const gchar *filename, - const gchar *default_stock_id); -GdkPixbuf * zenity_util_pixbuf_new_from_file (GtkWidget *widget, + const gchar *default_icon_name); +void zenity_util_set_window_icon_from_file (GtkWidget *widget, const gchar *filename); void zenity_util_show_help (GError **error); gint zenity_util_return_exit_code (ZenityExitCode value); |