callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change the return types of the gchar ** getters to be more const correct.

Browse Source 
2004-11-08  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaboutdialog.[hc]: Change the return types of the
	gchar ** getters to be more const correct.  (#157566, Mariano
	Suárez-Alvarez)
This commit is contained in:
Matthias Clasen
2004-11-08 18:37:29 +00:00
committed by Matthias Clasen
parent 48afbb90e0
commit a7f30bb333
6 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2004-11-08 Matthias Clasen <mclasen@redhat.com> 2004-11-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaboutdialog.[hc]: Change the return types of the
gchar ** getters to be more const correct. (#157566, Mariano
Suárez-Alvarez)
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_init): Add * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_init): Add
uri targets before text targets, to make file dnd work uri targets before text targets, to make file dnd work
better. (#157651, Christian Persch) better. (#157651, Christian Persch)

4
ChangeLog.pre-2-10
View File

@ -1,5 +1,9 @@
2004-11-08 Matthias Clasen <mclasen@redhat.com> 2004-11-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaboutdialog.[hc]: Change the return types of the
gchar ** getters to be more const correct. (#157566, Mariano
Suárez-Alvarez)
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_init): Add * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_init): Add
uri targets before text targets, to make file dnd work uri targets before text targets, to make file dnd work
better. (#157651, Christian Persch) better. (#157651, Christian Persch)

4
ChangeLog.pre-2-6
View File

@ -1,5 +1,9 @@
2004-11-08 Matthias Clasen <mclasen@redhat.com> 2004-11-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaboutdialog.[hc]: Change the return types of the
gchar ** getters to be more const correct. (#157566, Mariano
Suárez-Alvarez)
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_init): Add * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_init): Add
uri targets before text targets, to make file dnd work uri targets before text targets, to make file dnd work
better. (#157651, Christian Persch) better. (#157651, Christian Persch)

4
ChangeLog.pre-2-8
View File

@ -1,5 +1,9 @@
2004-11-08 Matthias Clasen <mclasen@redhat.com> 2004-11-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaboutdialog.[hc]: Change the return types of the
gchar ** getters to be more const correct. (#157566, Mariano
Suárez-Alvarez)
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_init): Add * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_init): Add
uri targets before text targets, to make file dnd work uri targets before text targets, to make file dnd work
better. (#157651, Christian Persch) better. (#157651, Christian Persch)

30
gtk/gtkaboutdialog.c
View File

@ -560,13 +560,13 @@ gtk_about_dialog_set_property (GObject *object,
gtk_about_dialog_set_logo (about, g_value_get_object (value)); gtk_about_dialog_set_logo (about, g_value_get_object (value));
break; break;
case PROP_AUTHORS: case PROP_AUTHORS:
gtk_about_dialog_set_authors (about, (gchar**)g_value_get_boxed (value)); gtk_about_dialog_set_authors (about, (const gchar**)g_value_get_boxed (value));
break; break;
case PROP_DOCUMENTERS: case PROP_DOCUMENTERS:
gtk_about_dialog_set_documenters (about, (gchar**)g_value_get_boxed (value)); gtk_about_dialog_set_documenters (about, (const gchar**)g_value_get_boxed (value));
break; break;
case PROP_ARTISTS: case PROP_ARTISTS:
gtk_about_dialog_set_artists (about, (gchar**)g_value_get_boxed (value)); gtk_about_dialog_set_artists (about, (const gchar**)g_value_get_boxed (value));
break; break;
case PROP_TRANSLATOR_CREDITS: case PROP_TRANSLATOR_CREDITS:
gtk_about_dialog_set_translator_credits (about, g_value_get_string (value)); gtk_about_dialog_set_translator_credits (about, g_value_get_string (value));
@ -1114,7 +1114,7 @@ gtk_about_dialog_set_website_label (GtkAboutDialog *about,
* *
* Since: 2.6 * Since: 2.6
**/ **/
gchar ** G_CONST_RETURN gchar * G_CONST_RETURN *
gtk_about_dialog_get_authors (GtkAboutDialog *about) gtk_about_dialog_get_authors (GtkAboutDialog *about)
{ {
GtkAboutDialogPrivate *priv; GtkAboutDialogPrivate *priv;
@ -1123,7 +1123,7 @@ gtk_about_dialog_get_authors (GtkAboutDialog *about)
priv = (GtkAboutDialogPrivate *)about->private_data; priv = (GtkAboutDialogPrivate *)about->private_data;
return priv->authors; return (const gchar * const *) priv->authors;
} }
/** /**
@ -1138,7 +1138,7 @@ gtk_about_dialog_get_authors (GtkAboutDialog *about)
**/ **/
void void
gtk_about_dialog_set_authors (GtkAboutDialog *about, gtk_about_dialog_set_authors (GtkAboutDialog *about,
gchar **authors) const gchar **authors)
{ {
GtkAboutDialogPrivate *priv; GtkAboutDialogPrivate *priv;
gchar **tmp; gchar **tmp;
@ -1148,7 +1148,7 @@ gtk_about_dialog_set_authors (GtkAboutDialog *about,
priv = (GtkAboutDialogPrivate *)about->private_data; priv = (GtkAboutDialogPrivate *)about->private_data;
tmp = priv->authors; tmp = priv->authors;
priv->authors = g_strdupv (authors); priv->authors = g_strdupv ((gchar **)authors);
g_strfreev (tmp); g_strfreev (tmp);
if (priv->authors != NULL) if (priv->authors != NULL)
@ -1170,7 +1170,7 @@ gtk_about_dialog_set_authors (GtkAboutDialog *about,
* *
* Since: 2.6 * Since: 2.6
**/ **/
gchar ** G_CONST_RETURN gchar * G_CONST_RETURN *
gtk_about_dialog_get_documenters (GtkAboutDialog *about) gtk_about_dialog_get_documenters (GtkAboutDialog *about)
{ {
GtkAboutDialogPrivate *priv; GtkAboutDialogPrivate *priv;
@ -1179,7 +1179,7 @@ gtk_about_dialog_get_documenters (GtkAboutDialog *about)
priv = (GtkAboutDialogPrivate *)about->private_data; priv = (GtkAboutDialogPrivate *)about->private_data;
return priv->documenters; return (const gchar * const *)priv->documenters;
} }
/** /**
@ -1194,7 +1194,7 @@ gtk_about_dialog_get_documenters (GtkAboutDialog *about)
**/ **/
void void
gtk_about_dialog_set_documenters (GtkAboutDialog *about, gtk_about_dialog_set_documenters (GtkAboutDialog *about,
gchar **documenters) const gchar **documenters)
{ {
GtkAboutDialogPrivate *priv; GtkAboutDialogPrivate *priv;
gchar **tmp; gchar **tmp;
@ -1204,7 +1204,7 @@ gtk_about_dialog_set_documenters (GtkAboutDialog *about,
priv = (GtkAboutDialogPrivate *)about->private_data; priv = (GtkAboutDialogPrivate *)about->private_data;
tmp = priv->documenters; tmp = priv->documenters;
priv->documenters = g_strdupv (documenters); priv->documenters = g_strdupv ((gchar **)documenters);
g_strfreev (tmp); g_strfreev (tmp);
if (priv->documenters != NULL) if (priv->documenters != NULL)
@ -1226,7 +1226,7 @@ gtk_about_dialog_set_documenters (GtkAboutDialog *about,
* *
* Since: 2.6 * Since: 2.6
**/ **/
gchar ** G_CONST_RETURN gchar * G_CONST_RETURN *
gtk_about_dialog_get_artists (GtkAboutDialog *about) gtk_about_dialog_get_artists (GtkAboutDialog *about)
{ {
GtkAboutDialogPrivate *priv; GtkAboutDialogPrivate *priv;
@ -1235,7 +1235,7 @@ gtk_about_dialog_get_artists (GtkAboutDialog *about)
priv = (GtkAboutDialogPrivate *)about->private_data; priv = (GtkAboutDialogPrivate *)about->private_data;
return priv->artists; return (const gchar * const *)priv->artists;
} }
/** /**
@ -1250,7 +1250,7 @@ gtk_about_dialog_get_artists (GtkAboutDialog *about)
**/ **/
void void
gtk_about_dialog_set_artists (GtkAboutDialog *about, gtk_about_dialog_set_artists (GtkAboutDialog *about,
gchar **artists) const gchar **artists)
{ {
GtkAboutDialogPrivate *priv; GtkAboutDialogPrivate *priv;
gchar **tmp; gchar **tmp;
@ -1260,7 +1260,7 @@ gtk_about_dialog_set_artists (GtkAboutDialog *about,
priv = (GtkAboutDialogPrivate *)about->private_data; priv = (GtkAboutDialogPrivate *)about->private_data;
tmp = priv->artists; tmp = priv->artists;
priv->artists = g_strdupv (artists); priv->artists = g_strdupv ((gchar **)artists);
g_strfreev (tmp); g_strfreev (tmp);
if (priv->artists != NULL) if (priv->artists != NULL)

12
gtk/gtkaboutdialog.h
View File

@ -85,15 +85,15 @@ void gtk_about_dialog_set_website (GtkAboutDialog
G_CONST_RETURN gchar *gtk_about_dialog_get_website_label (GtkAboutDialog *about); G_CONST_RETURN gchar *gtk_about_dialog_get_website_label (GtkAboutDialog *about);
void gtk_about_dialog_set_website_label (GtkAboutDialog *about, void gtk_about_dialog_set_website_label (GtkAboutDialog *about,
const gchar *website_label); const gchar *website_label);
gchar **gtk_about_dialog_get_authors (GtkAboutDialog *about); G_CONST_RETURN gchar * G_CONST_RETURN * gtk_about_dialog_get_authors (GtkAboutDialog *about);
void gtk_about_dialog_set_authors (GtkAboutDialog *about, void gtk_about_dialog_set_authors (GtkAboutDialog *about,
gchar **authors); const gchar **authors);
gchar **gtk_about_dialog_get_documenters (GtkAboutDialog *about); G_CONST_RETURN gchar * G_CONST_RETURN * gtk_about_dialog_get_documenters (GtkAboutDialog *about);
void gtk_about_dialog_set_documenters (GtkAboutDialog *about, void gtk_about_dialog_set_documenters (GtkAboutDialog *about,
gchar **documenters); const gchar **documenters);
gchar ** gtk_about_dialog_get_artists (GtkAboutDialog *about); G_CONST_RETURN gchar * G_CONST_RETURN * gtk_about_dialog_get_artists (GtkAboutDialog *about);
void gtk_about_dialog_set_artists (GtkAboutDialog *about, void gtk_about_dialog_set_artists (GtkAboutDialog *about,
gchar **artists); const gchar **artists);
G_CONST_RETURN gchar *gtk_about_dialog_get_translator_credits (GtkAboutDialog *about); G_CONST_RETURN gchar *gtk_about_dialog_get_translator_credits (GtkAboutDialog *about);
void gtk_about_dialog_set_translator_credits (GtkAboutDialog *about, void gtk_about_dialog_set_translator_credits (GtkAboutDialog *about,
const gchar *translator_credits); const gchar *translator_credits);