[gnome-alsamixer] Remove use of deprecated G_CONST_RETURN
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-alsamixer] Remove use of deprecated G_CONST_RETURN
- Date: Tue, 26 Jun 2012 14:10:06 +0000 (UTC)
commit 97733dc035d72e6012ad3ab3d581dbf368489bb3
Author: Bastien Nocera <hadess hadess net>
Date: Tue Jun 26 13:46:59 2012 +0100
Remove use of deprecated G_CONST_RETURN
src/gam-mixer.c | 4 ++--
src/gam-mixer.h | 4 ++--
src/gam-slider.c | 4 ++--
src/gam-slider.h | 4 ++--
src/gam-toggle.c | 4 ++--
src/gam-toggle.h | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/gam-mixer.c b/src/gam-mixer.c
index 8be4345..1195a9b 100644
--- a/src/gam-mixer.c
+++ b/src/gam-mixer.c
@@ -439,7 +439,7 @@ gam_mixer_new (GamApp *gam_app, const gchar *card_id)
NULL);
}
-G_CONST_RETURN gchar *
+const gchar *
gam_mixer_get_mixer_name (GamMixer *gam_mixer)
{
GamMixerPrivate *priv;
@@ -451,7 +451,7 @@ gam_mixer_get_mixer_name (GamMixer *gam_mixer)
return priv->mixer_name;
}
-G_CONST_RETURN gchar *
+const gchar *
gam_mixer_get_config_name (GamMixer *gam_mixer)
{
GamMixerPrivate *priv;
diff --git a/src/gam-mixer.h b/src/gam-mixer.h
index 718d053..4e6ecd3 100644
--- a/src/gam-mixer.h
+++ b/src/gam-mixer.h
@@ -57,8 +57,8 @@ struct _GamMixerClass
GType gam_mixer_get_type (void) G_GNUC_CONST;
GtkWidget *gam_mixer_new (GamApp *gam_app,
const gchar *card_id);
-G_CONST_RETURN gchar *gam_mixer_get_mixer_name (GamMixer *gam_mixer);
-G_CONST_RETURN gchar *gam_mixer_get_config_name (GamMixer *gam_mixer);
+const gchar *gam_mixer_get_mixer_name (GamMixer *gam_mixer);
+const gchar *gam_mixer_get_config_name (GamMixer *gam_mixer);
gchar *gam_mixer_get_display_name (GamMixer *gam_mixer);
void gam_mixer_set_display_name (GamMixer *gam_mixer,
const gchar *name);
diff --git a/src/gam-slider.c b/src/gam-slider.c
index 442976b..e4e4ff2 100644
--- a/src/gam-slider.c
+++ b/src/gam-slider.c
@@ -440,7 +440,7 @@ gam_slider_refresh (snd_mixer_elem_t *elem, guint mask)
g_signal_emit (gam_slider, signals[REFRESH], 0);
}
-G_CONST_RETURN gchar *
+const gchar *
gam_slider_get_name (GamSlider *gam_slider)
{
GamSliderPrivate *priv;
@@ -452,7 +452,7 @@ gam_slider_get_name (GamSlider *gam_slider)
return snd_mixer_selem_get_name (priv->elem);
}
-G_CONST_RETURN gchar *
+const gchar *
gam_slider_get_config_name (GamSlider *gam_slider)
{
GamSliderPrivate *priv;
diff --git a/src/gam-slider.h b/src/gam-slider.h
index 612447a..a7e9c5f 100644
--- a/src/gam-slider.h
+++ b/src/gam-slider.h
@@ -58,8 +58,8 @@ struct _GamSliderClass
#include "gam-mixer.h"
GType gam_slider_get_type (void) G_GNUC_CONST;
-G_CONST_RETURN gchar *gam_slider_get_name (GamSlider *gam_slider);
-G_CONST_RETURN gchar *gam_slider_get_config_name (GamSlider *gam_slider);
+const gchar *gam_slider_get_name (GamSlider *gam_slider);
+const gchar *gam_slider_get_config_name (GamSlider *gam_slider);
gchar *gam_slider_get_display_name (GamSlider *gam_slider);
void gam_slider_set_display_name (GamSlider *gam_slider,
const gchar *name);
diff --git a/src/gam-toggle.c b/src/gam-toggle.c
index cf34e27..7fcf219 100644
--- a/src/gam-toggle.c
+++ b/src/gam-toggle.c
@@ -371,7 +371,7 @@ gam_toggle_set_state (GamToggle *gam_toggle, gboolean state)
internal_state);
}
-G_CONST_RETURN gchar *
+const gchar *
gam_toggle_get_name (GamToggle *gam_toggle)
{
GamTogglePrivate *priv;
@@ -383,7 +383,7 @@ gam_toggle_get_name (GamToggle *gam_toggle)
return snd_mixer_selem_get_name (priv->elem);
}
-G_CONST_RETURN gchar *
+const gchar *
gam_toggle_get_config_name (GamToggle *gam_toggle)
{
GamTogglePrivate *priv;
diff --git a/src/gam-toggle.h b/src/gam-toggle.h
index 8a92348..6e08643 100644
--- a/src/gam-toggle.h
+++ b/src/gam-toggle.h
@@ -55,8 +55,8 @@ GtkWidget *gam_toggle_new (gpointer elem,
gboolean gam_toggle_get_state (GamToggle *gam_toggle);
void gam_toggle_set_state (GamToggle *gam_toggle,
gboolean state);
-G_CONST_RETURN gchar *gam_toggle_get_name (GamToggle *gam_toggle);
-G_CONST_RETURN gchar *gam_toggle_get_config_name (GamToggle *gam_toggle);
+const gchar *gam_toggle_get_name (GamToggle *gam_toggle);
+const gchar *gam_toggle_get_config_name (GamToggle *gam_toggle);
gchar *gam_toggle_get_display_name (GamToggle *gam_toggle);
void gam_toggle_set_display_name (GamToggle *gam_toggle,
const gchar *name);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]