diff options
author | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-07-08 18:56:13 +0800 |
---|---|---|
committer | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-08-05 22:55:12 +0800 |
commit | a3faa867baeb51bb55e04fb507aaa45038f760a5 (patch) | |
tree | 3f548604cd6a9bb43838a433348fc1ad185d7827 /libempathy-gtk | |
parent | f8c37da731af9f6cd74e7a0ef08fa02059d981ac (diff) | |
download | gsoc2013-empathy-a3faa867baeb51bb55e04fb507aaa45038f760a5.tar gsoc2013-empathy-a3faa867baeb51bb55e04fb507aaa45038f760a5.tar.gz gsoc2013-empathy-a3faa867baeb51bb55e04fb507aaa45038f760a5.tar.bz2 gsoc2013-empathy-a3faa867baeb51bb55e04fb507aaa45038f760a5.tar.lz gsoc2013-empathy-a3faa867baeb51bb55e04fb507aaa45038f760a5.tar.xz gsoc2013-empathy-a3faa867baeb51bb55e04fb507aaa45038f760a5.tar.zst gsoc2013-empathy-a3faa867baeb51bb55e04fb507aaa45038f760a5.zip |
Fix constness of various variables and parameters
Diffstat (limited to 'libempathy-gtk')
-rw-r--r-- | libempathy-gtk/empathy-individual-store.c | 4 | ||||
-rw-r--r-- | libempathy-gtk/empathy-ui-utils.c | 6 | ||||
-rw-r--r-- | libempathy-gtk/empathy-ui-utils.h | 2 | ||||
-rw-r--r-- | libempathy-gtk/empathy-video-src.c | 4 | ||||
-rw-r--r-- | libempathy-gtk/totem-subtitle-encoding.c | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c index 89cbc062a..2f530069c 100644 --- a/libempathy-gtk/empathy-individual-store.c +++ b/libempathy-gtk/empathy-individual-store.c @@ -781,7 +781,7 @@ individual_store_remove_individual_and_disconnect ( static void individual_store_members_changed_cb (EmpathyIndividualManager *manager, - gchar *message, + const gchar *message, GList *added, GList *removed, guint reason, @@ -902,7 +902,7 @@ individual_store_member_renamed_cb (EmpathyIndividualManager *manager, FolksIndividual *old_individual, FolksIndividual *new_individual, guint reason, - gchar *message, + const gchar *message, EmpathyIndividualStore *self) { EmpathyIndividualStorePriv *priv; diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 703d3e37c..46a26d8f7 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -129,9 +129,9 @@ empathy_builder_get_file (const gchar *filename, } void -empathy_builder_connect (GtkBuilder *gui, - gpointer user_data, - gchar *first_object, +empathy_builder_connect (GtkBuilder *gui, + gpointer user_data, + const gchar *first_object, ...) { va_list args; diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h index 87c17b333..9c3ec6517 100644 --- a/libempathy-gtk/empathy-ui-utils.h +++ b/libempathy-gtk/empathy-ui-utils.h @@ -61,7 +61,7 @@ GtkBuilder * empathy_builder_get_file (const gchar *filen ...); void empathy_builder_connect (GtkBuilder *gui, gpointer user_data, - gchar *first_object, + const gchar *first_object, ...); GtkWidget *empathy_builder_unref_and_keep_widget (GtkBuilder *gui, GtkWidget *root); diff --git a/libempathy-gtk/empathy-video-src.c b/libempathy-gtk/empathy-video-src.c index 96324e06c..aa4d35ac2 100644 --- a/libempathy-gtk/empathy-video-src.c +++ b/libempathy-gtk/empathy-video-src.c @@ -29,8 +29,8 @@ G_DEFINE_TYPE(EmpathyGstVideoSrc, empathy_video_src, GST_TYPE_BIN) /* Keep in sync with EmpathyGstVideoSrcChannel */ -static gchar *channel_names[NR_EMPATHY_GST_VIDEO_SRC_CHANNELS] = { "contrast", - "brightness", "gamma" }; +static const gchar *channel_names[NR_EMPATHY_GST_VIDEO_SRC_CHANNELS] = { + "contrast", "brightness", "gamma" }; /* signal enum */ #if 0 diff --git a/libempathy-gtk/totem-subtitle-encoding.c b/libempathy-gtk/totem-subtitle-encoding.c index 285c5acf3..f376ea728 100644 --- a/libempathy-gtk/totem-subtitle-encoding.c +++ b/libempathy-gtk/totem-subtitle-encoding.c @@ -147,8 +147,8 @@ typedef struct { int index; gboolean valid; - char *charset; - char *name; + const char *charset; + const char *name; } SubtitleEncoding; @@ -483,7 +483,7 @@ static GtkTreeModel * subtitle_encoding_create_store (void) { gchar *label; - gchar *lastlang = ""; + const gchar *lastlang = ""; GtkTreeIter iter, iter2; GtkTreeStore *store; int i; |