[Spice-commits] gtk/channel-main.c gtk/spice-audio.c gtk/spice-widget.c

[Marc-André Lureau]

 gtk/channel-main.c |    9 +++++----
 gtk/spice-audio.c  |    2 +-
 gtk/spice-widget.c |    4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 4f767d4a69b4f8b3b4c9660f8608528ab081a467
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Nov 9 00:40:33 2011 +0100

    Use correct GLib macros

diff --git a/gtk/channel-main.c b/gtk/channel-main.c
index fa46323..90eb0fd 100644
--- a/gtk/channel-main.c
+++ b/gtk/channel-main.c
@@ -15,6 +15,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#include "glib-compat.h"
 #include "spice-client.h"
 #include "spice-common.h"
 #include "spice-marshal.h"
@@ -1666,7 +1667,7 @@ void spice_main_set_display(SpiceMainChannel *channel, int id,
  *
  * Deprecated: 0.6: use spice_main_clipboard_selection_grab() instead.
  **/
-GLIB_DEPRECATED_FOR(spice_main_clipboard_selection_grab)
+G_GNUC_DEPRECATED_FOR(spice_main_clipboard_selection_grab)
 void spice_main_clipboard_grab(SpiceMainChannel *channel, guint32 *types, int ntypes)
 {
     spice_main_clipboard_selection_grab(channel, VD_AGENT_CLIPBOARD_SELECTION_CLIPBOARD, types, ntypes);
@@ -1702,7 +1703,7 @@ void spice_main_clipboard_selection_grab(SpiceMainChannel *channel, guint select
  *
  * Deprecated: 0.6: use spice_main_clipboard_selection_release() instead.
  **/
-GLIB_DEPRECATED_FOR(spice_main_clipboard_selection_release)
+G_GNUC_DEPRECATED_FOR(spice_main_clipboard_selection_release)
 void spice_main_clipboard_release(SpiceMainChannel *channel)
 {
     spice_main_clipboard_selection_release(channel, VD_AGENT_CLIPBOARD_SELECTION_CLIPBOARD);
@@ -1743,7 +1744,7 @@ void spice_main_clipboard_selection_release(SpiceMainChannel *channel, guint sel
  *
  * Deprecated: 0.6: use spice_main_clipboard_selection_notify() instead.
  **/
-GLIB_DEPRECATED_FOR(spice_main_clipboard_selection_notify)
+G_GNUC_DEPRECATED_FOR(spice_main_clipboard_selection_notify)
 void spice_main_clipboard_notify(SpiceMainChannel *channel,
                                  guint32 type, const guchar *data, size_t size)
 {
@@ -1783,7 +1784,7 @@ void spice_main_clipboard_selection_notify(SpiceMainChannel *channel, guint sele
  *
  * Deprecated: 0.6: use spice_main_clipboard_selection_request() instead.
  **/
-GLIB_DEPRECATED_FOR(spice_main_clipboard_selection_request)
+G_GNUC_DEPRECATED_FOR(spice_main_clipboard_selection_request)
 void spice_main_clipboard_request(SpiceMainChannel *channel, guint32 type)
 {
     spice_main_clipboard_selection_request(channel, VD_AGENT_CLIPBOARD_SELECTION_CLIPBOARD, type);
diff --git a/gtk/spice-audio.c b/gtk/spice-audio.c
index b51fa51..b1741e5 100644
--- a/gtk/spice-audio.c
+++ b/gtk/spice-audio.c
@@ -73,7 +73,7 @@ static void spice_audio_init(SpiceAudio *self G_GNUC_UNUSED)
  * Returns: a new #SpiceAudio instance or %NULL if no backend or failed.
  * Deprecated: 0.8: Use spice_audio_get() instead
  **/
-GLIB_DEPRECATED_FOR(spice_audio_get)
+G_GNUC_DEPRECATED_FOR(spice_audio_get)
 SpiceAudio *spice_audio_new(SpiceSession *session, GMainContext *context,
                             const char *name)
 {
diff --git a/gtk/spice-widget.c b/gtk/spice-widget.c
index 3589833..cec9aaa 100644
--- a/gtk/spice-widget.c
+++ b/gtk/spice-widget.c
@@ -1657,7 +1657,7 @@ void spice_display_mouse_ungrab(SpiceDisplay *display)
  *
  * Deprecated: 0.8: Use spice_gtk_session_copy_to_guest() instead
  **/
-GLIB_DEPRECATED_FOR(spice_gtk_session_copy_to_guest)
+G_GNUC_DEPRECATED_FOR(spice_gtk_session_copy_to_guest)
 void spice_display_copy_to_guest(SpiceDisplay *display)
 {
     SpiceDisplayPrivate *d = SPICE_DISPLAY_GET_PRIVATE(display);
@@ -1675,7 +1675,7 @@ void spice_display_copy_to_guest(SpiceDisplay *display)
  *
  * Deprecated: 0.8: Use spice_gtk_session_paste_from_guest() instead
  **/
-GLIB_DEPRECATED_FOR(spice_gtk_session_paste_from_guest)
+G_GNUC_DEPRECATED_FOR(spice_gtk_session_paste_from_guest)
 void spice_display_paste_from_guest(SpiceDisplay *display)
 {
     SpiceDisplayPrivate *d = SPICE_DISPLAY_GET_PRIVATE(display);