summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2012-08-27 23:56:50 +0800
committerJavier Jardón <jjardon@gnome.org>2012-08-27 23:56:50 +0800
commitcbc1c00f27777400e80582c1264e3061786e6845 (patch)
treed20c0bd7eb66f2d38c8f4cc725d23cc71a6eb3b0
parent66760265da91255cc61bbfef12405477f773b8c3 (diff)
downloadlibwnck-cbc1c00f27777400e80582c1264e3061786e6845.tar.gz
Add deprecation attributes to deprecated functions
This is using the newly introduce G_DEPRECATED macros from GLib. Traditional deprecation guards are still in place. Fix https://bugzilla.gnome.org/show_bug.cgi?id=671772
-rw-r--r--configure.ac10
-rw-r--r--libwnck/class-group.h1
-rw-r--r--libwnck/screen.h2
3 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 53d8d59..a7516b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,9 +142,13 @@ AC_SUBST(XRES_PACKAGE)
AC_SUBST(XLIB_CFLAGS)
AC_SUBST(XLIB_LIBS)
-PKG_CHECK_MODULES(LIBWNCK, gtk+-3.0 >= 3.4.0 glib-2.0 >= 2.16.0 gobject-2.0 >= 2.13.0 $STARTUP_NOTIFICATION_PACKAGE $XRES_PACKAGE)
-AC_SUBST(LIBWNCK_LIBS)
-AC_SUBST(LIBWNCK_CFLAGS)
+PKG_CHECK_MODULES([LIBWNCK],[
+ gtk+-3.0 >= 3.4
+ glib-2.0 >= 2.32
+ gobject-2.0 >= 2.13.0
+ $STARTUP_NOTIFICATION_PACKAGE
+ $XRES_PACKAGE
+])
GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
AC_SUBST(GLIB_GENMARSHAL)
diff --git a/libwnck/class-group.h b/libwnck/class-group.h
index ab77ec2..d7b6f34 100644
--- a/libwnck/class-group.h
+++ b/libwnck/class-group.h
@@ -85,6 +85,7 @@ GdkPixbuf *wnck_class_group_get_icon (WnckClassGroup *class_group);
GdkPixbuf *wnck_class_group_get_mini_icon (WnckClassGroup *class_group);
#ifndef WNCK_DISABLE_DEPRECATED
+G_DEPRECATED_FOR(wnck_class_group_get_id)
const char * wnck_class_group_get_res_class (WnckClassGroup *class_group);
#endif
diff --git a/libwnck/screen.h b/libwnck/screen.h
index 28d38d0..cf10557 100644
--- a/libwnck/screen.h
+++ b/libwnck/screen.h
@@ -235,10 +235,12 @@ int wnck_screen_try_set_workspace_layout (WnckScreen *screen,
void wnck_screen_release_workspace_layout (WnckScreen *screen,
int current_token);
#ifndef WNCK_DISABLE_DEPRECATED
+G_DEPRECATED
void wnck_screen_calc_workspace_layout (WnckScreen *screen,
int num_workspaces,
int space_index,
WnckWorkspaceLayout *layout);
+G_DEPRECATED
void wnck_screen_free_workspace_layout (WnckWorkspaceLayout *layout);
#endif /* WNCK_DISABLE_DEPRECATED */