This is an automated email from the git hooks/post-receive script. eric pushed a commit to branch master in repository xfce/xfdesktop.
commit 6c8f56c4ec06c8bc333d3d17bdd91eb7dd5a8dff Author: Eric Koegel <eric.koe...@gmail.com> Date: Sun Mar 30 10:37:21 2014 +0300 G_CONST_RETURN has been deprecated --- settings/main.c | 2 +- src/xfce-backdrop.c | 2 +- src/xfce-backdrop.h | 2 +- src/xfdesktop-icon.c | 4 ++-- src/xfdesktop-icon.h | 8 ++++---- src/xfdesktop-regular-file-icon.c | 8 ++++---- src/xfdesktop-special-file-icon.c | 8 ++++---- src/xfdesktop-volume-icon.c | 8 ++++---- src/xfdesktop-window-icon.c | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/settings/main.c b/settings/main.c index bd82249..7a80c19 100644 --- a/settings/main.c +++ b/settings/main.c @@ -1982,7 +1982,7 @@ xfdesktop_settings_response(GtkWidget *dialog, gint response_id, gpointer user_d gint width, height; /* don't save the state for full-screen windows */ - state = gdk_window_get_state(GTK_WIDGET(dialog)->window); + state = gdk_window_get_state(gtk_widget_get_window(dialog)); if ((state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) == 0) { /* save window size */ diff --git a/src/xfce-backdrop.c b/src/xfce-backdrop.c index 36f0a60..324680f 100644 --- a/src/xfce-backdrop.c +++ b/src/xfce-backdrop.c @@ -1042,7 +1042,7 @@ xfce_backdrop_set_image_filename(XfceBackdrop *backdrop, const gchar *filename) g_signal_emit(G_OBJECT(backdrop), backdrop_signals[BACKDROP_CHANGED], 0); } -G_CONST_RETURN gchar * +const gchar * xfce_backdrop_get_image_filename(XfceBackdrop *backdrop) { g_return_val_if_fail(XFCE_IS_BACKDROP(backdrop), NULL); diff --git a/src/xfce-backdrop.h b/src/xfce-backdrop.h index 3077a75..364b916 100644 --- a/src/xfce-backdrop.h +++ b/src/xfce-backdrop.h @@ -123,7 +123,7 @@ XfceBackdropImageStyle xfce_backdrop_get_image_style void xfce_backdrop_set_image_filename (XfceBackdrop *backdrop, const gchar *filename); -G_CONST_RETURN gchar *xfce_backdrop_get_image_filename +const gchar *xfce_backdrop_get_image_filename (XfceBackdrop *backdrop); void xfce_backdrop_set_cycle_backdrop (XfceBackdrop *backdrop, diff --git a/src/xfdesktop-icon.c b/src/xfdesktop-icon.c index 4d58855..127d8ca 100644 --- a/src/xfdesktop-icon.c +++ b/src/xfdesktop-icon.c @@ -218,7 +218,7 @@ xfdesktop_icon_peek_pixbuf(XfdesktopIcon *icon, } /*< required >*/ -G_CONST_RETURN gchar * +const gchar * xfdesktop_icon_peek_label(XfdesktopIcon *icon) { XfdesktopIconClass *klass; @@ -323,7 +323,7 @@ xfdesktop_icon_peek_tooltip_pixbuf(XfdesktopIcon *icon, } /*< optional >*/ -G_CONST_RETURN gchar * +const gchar * xfdesktop_icon_peek_tooltip(XfdesktopIcon *icon) { XfdesktopIconClass *klass; diff --git a/src/xfdesktop-icon.h b/src/xfdesktop-icon.h index 577b123..c1df1d8 100644 --- a/src/xfdesktop-icon.h +++ b/src/xfdesktop-icon.h @@ -64,7 +64,7 @@ struct _XfdesktopIconClass /*< virtual functions >*/ GdkPixbuf *(*peek_pixbuf)(XfdesktopIcon *icon, gint width, gint height); - G_CONST_RETURN gchar *(*peek_label)(XfdesktopIcon *icon); + const gchar *(*peek_label)(XfdesktopIcon *icon); GdkDragAction (*get_allowed_drag_actions)(XfdesktopIcon *icon); @@ -72,7 +72,7 @@ struct _XfdesktopIconClass gboolean (*do_drop_dest)(XfdesktopIcon *icon, XfdesktopIcon *src_icon, GdkDragAction action); GdkPixbuf *(*peek_tooltip_pixbuf)(XfdesktopIcon *icon, gint width, gint height); - G_CONST_RETURN gchar *(*peek_tooltip)(XfdesktopIcon *icon); + const gchar *(*peek_tooltip)(XfdesktopIcon *icon); gchar *(*get_identifier)(XfdesktopIcon *icon); @@ -90,11 +90,11 @@ GType xfdesktop_icon_get_type(void) G_GNUC_CONST; GdkPixbuf *xfdesktop_icon_peek_pixbuf(XfdesktopIcon *icon, gint width, gint height); -G_CONST_RETURN gchar *xfdesktop_icon_peek_label(XfdesktopIcon *icon); +const gchar *xfdesktop_icon_peek_label(XfdesktopIcon *icon); GdkPixbuf *xfdesktop_icon_peek_tooltip_pixbuf(XfdesktopIcon *icon, gint width, gint height); -G_CONST_RETURN gchar *xfdesktop_icon_peek_tooltip(XfdesktopIcon *icon); +const gchar *xfdesktop_icon_peek_tooltip(XfdesktopIcon *icon); /* returns a unique identifier for the icon, free when done using it */ gchar *xfdesktop_icon_get_identifier(XfdesktopIcon *icon); diff --git a/src/xfdesktop-regular-file-icon.c b/src/xfdesktop-regular-file-icon.c index 4de99cf..58afcb8 100644 --- a/src/xfdesktop-regular-file-icon.c +++ b/src/xfdesktop-regular-file-icon.c @@ -79,11 +79,11 @@ static void xfdesktop_regular_file_icon_delete_thumbnail_file(XfdesktopIcon *ico static GdkPixbuf *xfdesktop_regular_file_icon_peek_pixbuf(XfdesktopIcon *icon, gint width, gint height); -static G_CONST_RETURN gchar *xfdesktop_regular_file_icon_peek_label(XfdesktopIcon *icon); +static const gchar *xfdesktop_regular_file_icon_peek_label(XfdesktopIcon *icon); static gchar *xfdesktop_regular_file_icon_get_identifier(XfdesktopIcon *icon); static GdkPixbuf *xfdesktop_regular_file_icon_peek_tooltip_pixbuf(XfdesktopIcon *icon, gint width, gint height); -static G_CONST_RETURN gchar *xfdesktop_regular_file_icon_peek_tooltip(XfdesktopIcon *icon); +static const gchar *xfdesktop_regular_file_icon_peek_tooltip(XfdesktopIcon *icon); static GdkDragAction xfdesktop_regular_file_icon_get_allowed_drag_actions(XfdesktopIcon *icon); static GdkDragAction xfdesktop_regular_file_icon_get_allowed_drop_actions(XfdesktopIcon *icon, GdkDragAction *suggested_action); @@ -525,7 +525,7 @@ xfdesktop_regular_file_icon_peek_tooltip_pixbuf(XfdesktopIcon *icon, return tooltip_pix; } -static G_CONST_RETURN gchar * +static const gchar * xfdesktop_regular_file_icon_peek_label(XfdesktopIcon *icon) { XfdesktopRegularFileIcon *regular_file_icon = XFDESKTOP_REGULAR_FILE_ICON(icon); @@ -697,7 +697,7 @@ xfdesktop_regular_file_icon_do_drop_dest(XfdesktopIcon *icon, return result; } -static G_CONST_RETURN gchar * +static const gchar * xfdesktop_regular_file_icon_peek_tooltip(XfdesktopIcon *icon) { XfdesktopRegularFileIcon *regular_file_icon = XFDESKTOP_REGULAR_FILE_ICON(icon); diff --git a/src/xfdesktop-special-file-icon.c b/src/xfdesktop-special-file-icon.c index a6ae54a..f694257 100644 --- a/src/xfdesktop-special-file-icon.c +++ b/src/xfdesktop-special-file-icon.c @@ -70,11 +70,11 @@ static void xfdesktop_special_file_icon_finalize(GObject *obj); static GdkPixbuf *xfdesktop_special_file_icon_peek_pixbuf(XfdesktopIcon *icon, gint width, gint height); -static G_CONST_RETURN gchar *xfdesktop_special_file_icon_peek_label(XfdesktopIcon *icon); +static const gchar *xfdesktop_special_file_icon_peek_label(XfdesktopIcon *icon); static gchar *xfdesktop_special_file_icon_get_identifier(XfdesktopIcon *icon); static GdkPixbuf *xfdesktop_special_file_icon_peek_tooltip_pixbuf(XfdesktopIcon *icon, gint width, gint height); -static G_CONST_RETURN gchar *xfdesktop_special_file_icon_peek_tooltip(XfdesktopIcon *icon); +static const gchar *xfdesktop_special_file_icon_peek_tooltip(XfdesktopIcon *icon); static GdkDragAction xfdesktop_special_file_icon_get_allowed_drag_actions(XfdesktopIcon *icon); static GdkDragAction xfdesktop_special_file_icon_get_allowed_drop_actions(XfdesktopIcon *icon, GdkDragAction *suggested_action); @@ -285,7 +285,7 @@ xfdesktop_special_file_icon_peek_tooltip_pixbuf(XfdesktopIcon *icon, return tooltip_pix; } -static G_CONST_RETURN gchar * +static const gchar * xfdesktop_special_file_icon_peek_label(XfdesktopIcon *icon) { XfdesktopSpecialFileIcon *special_file_icon = XFDESKTOP_SPECIAL_FILE_ICON(icon); @@ -446,7 +446,7 @@ xfdesktop_special_file_icon_do_drop_dest(XfdesktopIcon *icon, return result; } -static G_CONST_RETURN gchar * +static const gchar * xfdesktop_special_file_icon_peek_tooltip(XfdesktopIcon *icon) { XfdesktopSpecialFileIcon *special_file_icon = XFDESKTOP_SPECIAL_FILE_ICON(icon); diff --git a/src/xfdesktop-volume-icon.c b/src/xfdesktop-volume-icon.c index f5e8c71..9203eef 100644 --- a/src/xfdesktop-volume-icon.c +++ b/src/xfdesktop-volume-icon.c @@ -76,11 +76,11 @@ static void xfdesktop_volume_icon_finalize(GObject *obj); static GdkPixbuf *xfdesktop_volume_icon_peek_pixbuf(XfdesktopIcon *icon, gint width, gint height); -static G_CONST_RETURN gchar *xfdesktop_volume_icon_peek_label(XfdesktopIcon *icon); +static const gchar *xfdesktop_volume_icon_peek_label(XfdesktopIcon *icon); static gchar *xfdesktop_volume_icon_get_identifier(XfdesktopIcon *icon); static GdkPixbuf *xfdesktop_volume_icon_peek_tooltip_pixbuf(XfdesktopIcon *icon, gint width, gint height); -static G_CONST_RETURN gchar *xfdesktop_volume_icon_peek_tooltip(XfdesktopIcon *icon); +static const gchar *xfdesktop_volume_icon_peek_tooltip(XfdesktopIcon *icon); static GdkDragAction xfdesktop_volume_icon_get_allowed_drag_actions(XfdesktopIcon *icon); static GdkDragAction xfdesktop_volume_icon_get_allowed_drop_actions(XfdesktopIcon *icon, GdkDragAction *suggested_action); @@ -306,7 +306,7 @@ xfdesktop_volume_icon_peek_tooltip_pixbuf(XfdesktopIcon *icon, return tooltip_pix; } -G_CONST_RETURN gchar * +const gchar * xfdesktop_volume_icon_peek_label(XfdesktopIcon *icon) { XfdesktopVolumeIcon *volume_icon = XFDESKTOP_VOLUME_ICON(icon); @@ -456,7 +456,7 @@ xfdesktop_volume_icon_do_drop_dest(XfdesktopIcon *icon, return result; } -static G_CONST_RETURN gchar * +static const gchar * xfdesktop_volume_icon_peek_tooltip(XfdesktopIcon *icon) { XfdesktopVolumeIcon *volume_icon = XFDESKTOP_VOLUME_ICON(icon); diff --git a/src/xfdesktop-window-icon.c b/src/xfdesktop-window-icon.c index 77e8cc3..bde7951 100644 --- a/src/xfdesktop-window-icon.c +++ b/src/xfdesktop-window-icon.c @@ -43,7 +43,7 @@ static void xfdesktop_window_icon_finalize(GObject *obj); static GdkPixbuf *xfdesktop_window_icon_peek_pixbuf(XfdesktopIcon *icon, gint width, gint height); -static G_CONST_RETURN gchar *xfdesktop_window_icon_peek_label(XfdesktopIcon *icon); +static const gchar *xfdesktop_window_icon_peek_label(XfdesktopIcon *icon); static gchar *xfdesktop_window_icon_get_identifier(XfdesktopIcon *icon); static gboolean xfdesktop_window_icon_activated(XfdesktopIcon *icon); @@ -156,7 +156,7 @@ xfdesktop_window_icon_peek_pixbuf(XfdesktopIcon *icon, return pix; } -static G_CONST_RETURN gchar * +static const gchar * xfdesktop_window_icon_peek_label(XfdesktopIcon *icon) { XfdesktopWindowIcon *window_icon = XFDESKTOP_WINDOW_ICON(icon); -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits