diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2016-03-09 17:48:24 +0100 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2016-03-10 18:15:38 +0100 |
| commit | d41f6bbba4c6affa2bae05ae424ea2c77f9278a0 (patch) | |
| tree | 2fc49c704a268f35372984d6a38b84d1f1d7b093 /src | |
| parent | e1b7496218e1847d637ec385d2c6d973109ccbbe (diff) | |
| download | nautilus-d41f6bbba4c6affa2bae05ae424ea2c77f9278a0.tar.gz | |
content-bar: use const type for content types
This fixes warnings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nautilus-window-slot.c | 4 | ||||
| -rw-r--r-- | src/nautilus-x-content-bar.c | 6 | ||||
| -rw-r--r-- | src/nautilus-x-content-bar.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c index c12453b8b..83b540513 100644 --- a/src/nautilus-window-slot.c +++ b/src/nautilus-window-slot.c @@ -1871,7 +1871,7 @@ typedef struct { } FindMountData; static void -nautilus_window_slot_show_x_content_bar (NautilusWindowSlot *slot, GMount *mount, const char **x_content_types) +nautilus_window_slot_show_x_content_bar (NautilusWindowSlot *slot, GMount *mount, const char * const *x_content_types) { GtkWidget *bar; @@ -1899,7 +1899,7 @@ found_content_type_cb (const char **x_content_types, slot = data->slot; if (x_content_types != NULL && x_content_types[0] != NULL) { - nautilus_window_slot_show_x_content_bar (slot, data->mount, x_content_types); + nautilus_window_slot_show_x_content_bar (slot, data->mount, (const char* const *) x_content_types); } slot->details->find_mount_cancellable = NULL; diff --git a/src/nautilus-x-content-bar.c b/src/nautilus-x-content-bar.c index 5f9ef40ff..71723fe96 100644 --- a/src/nautilus-x-content-bar.c +++ b/src/nautilus-x-content-bar.c @@ -80,7 +80,7 @@ content_bar_response_cb (GtkInfoBar *infobar, } static void -nautilus_x_content_bar_set_x_content_types (NautilusXContentBar *bar, const char **x_content_types) +nautilus_x_content_bar_set_x_content_types (NautilusXContentBar *bar, const char * const *x_content_types) { char *message = NULL; guint num_types; @@ -118,7 +118,7 @@ nautilus_x_content_bar_set_x_content_types (NautilusXContentBar *bar, const char message = get_message_for_content_type (bar->priv->x_content_types[0]); break; case 2: - message = get_message_for_two_content_types (bar->priv->x_content_types); + message = get_message_for_two_content_types ((const char* const *) bar->priv->x_content_types); break; default: message = g_strdup (_("Open with:")); @@ -302,7 +302,7 @@ nautilus_x_content_bar_init (NautilusXContentBar *bar) GtkWidget * nautilus_x_content_bar_new (GMount *mount, - const char **x_content_types) + const char * const *x_content_types) { return g_object_new (NAUTILUS_TYPE_X_CONTENT_BAR, "message-type", GTK_MESSAGE_QUESTION, diff --git a/src/nautilus-x-content-bar.h b/src/nautilus-x-content-bar.h index 4b0d7e674..9065e5119 100644 --- a/src/nautilus-x-content-bar.h +++ b/src/nautilus-x-content-bar.h @@ -53,7 +53,7 @@ typedef struct GType nautilus_x_content_bar_get_type (void) G_GNUC_CONST; GtkWidget *nautilus_x_content_bar_new (GMount *mount, - const char **x_content_types); + const char * const* x_content_types); G_END_DECLS |