commit a2cf371e8cea62e67cf4e1e8af3c951996e41819
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Sun Aug 29 21:07:55 2010 +0100
Stop warning about losing qualifiers from guchar* to gchar*
plugins/playlist_display/display_playlists.c | 25 ++++++++++++++++++-------
plugins/track_display/display_tracks.c | 13 ++++++++-----
2 files changed, 26 insertions(+), 12 deletions(-)
---
diff --git a/plugins/playlist_display/display_playlists.c
b/plugins/playlist_display/display_playlists.c
index e3619c2..81ddb94 100644
--- a/plugins/playlist_display/display_playlists.c
+++ b/plugins/playlist_display/display_playlists.c
@@ -590,6 +590,8 @@ static void pm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
position = pm_get_position_for_playlist(pl);
+ gchar *data_copy = g_strdup(gtk_selection_data_get_data(data));
+
/* printf("position: %d\n", position); */
switch (info) {
case DND_GTKPOD_TRACKLIST:
@@ -597,6 +599,7 @@ static void pm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
sscanf(gtk_selection_data_get_data(data), "%p", &tr_s);
if (!tr_s) {
gtk_drag_finish(dc, FALSE, FALSE, time);
+ g_free(data_copy);
g_return_if_reached ();
}
@@ -610,12 +613,12 @@ static void pm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
if ((pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE) || (pos ==
GTK_TREE_VIEW_DROP_INTO_OR_AFTER)) { /* drop into existing playlist */
/* copy files from iPod if necessary */
- GList *trackglist =
exporter->transfer_track_names_between_itdbs(tr_s->itdb, pl->itdb,
gtk_selection_data_get_data(data));
+ GList *trackglist =
exporter->transfer_track_names_between_itdbs(tr_s->itdb, pl->itdb, data_copy);
if (trackglist) {
add_trackglist_to_playlist(pl, trackglist);
g_list_free(trackglist);
trackglist = NULL;
-
pm_tm_tracks_moved_or_copied(gtk_selection_data_get_data(data), del_src);
+ pm_tm_tracks_moved_or_copied(data_copy, del_src);
gtk_drag_finish(dc, TRUE, del_src, time);
}
else {
@@ -632,12 +635,12 @@ static void pm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
if (plitem) {
/* copy files from iPod if necessary */
- GList *trackglist =
exporter->transfer_track_names_between_itdbs(tr_s->itdb, pl->itdb,
gtk_selection_data_get_data(data));
+ GList *trackglist =
exporter->transfer_track_names_between_itdbs(tr_s->itdb, pl->itdb, data_copy);
if (trackglist) {
add_trackglist_to_playlist(plitem, trackglist);
g_list_free(trackglist);
trackglist = NULL;
-
pm_tm_tracks_moved_or_copied(gtk_selection_data_get_data(data), del_src);
+ pm_tm_tracks_moved_or_copied(data_copy, del_src);
gtk_drag_finish(dc, TRUE, del_src, time);
}
else {
@@ -654,16 +657,16 @@ static void pm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
case DND_TEXT_URI_LIST:
case DND_TEXT_PLAIN:
if ((pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE) || (pos ==
GTK_TREE_VIEW_DROP_INTO_OR_AFTER)) { /* drop into existing playlist */
- add_text_plain_to_playlist(pl->itdb, pl,
gtk_selection_data_get_data(data), 0, NULL, NULL);
+ add_text_plain_to_playlist(pl->itdb, pl, data_copy, 0, NULL, NULL);
gdk_drag_status(dc, GDK_ACTION_COPY, time);
gtk_drag_finish(dc, TRUE, FALSE, time);
}
else { /* drop between playlists */
Playlist *plitem;
if (pos == GTK_TREE_VIEW_DROP_AFTER)
- plitem = add_text_plain_to_playlist(pl->itdb, NULL,
gtk_selection_data_get_data(data), position + 1, NULL, NULL);
+ plitem = add_text_plain_to_playlist(pl->itdb, NULL, data_copy,
position + 1, NULL, NULL);
else
- plitem = add_text_plain_to_playlist(pl->itdb, NULL,
gtk_selection_data_get_data(data), position, NULL, NULL);
+ plitem = add_text_plain_to_playlist(pl->itdb, NULL, data_copy,
position, NULL, NULL);
if (plitem) {
gdk_drag_status(dc, GDK_ACTION_COPY, time);
@@ -680,6 +683,7 @@ static void pm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
sscanf(gtk_selection_data_get_data(data), "%p", &pl_s);
if (!pl_s) {
gtk_drag_finish(dc, FALSE, FALSE, time);
+ g_free(data_copy);
g_return_if_reached ();
}
@@ -687,6 +691,7 @@ static void pm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
if (gdk_drag_context_get_selected_action(dc) == 0) {
gtk_drag_finish(dc, FALSE, FALSE, time);
+ g_free(data_copy);
return;
}
@@ -719,6 +724,7 @@ static void pm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
if (prefs_get_int("pm_sort") != SORT_NONE) {
gtkpod_statusbar_message(_("Can't reorder sorted
treeview."));
gtk_drag_finish(dc, FALSE, FALSE, time);
+ g_free(data_copy);
return;
}
gtk_tree_store_move_before(GTK_TREE_STORE (model),
&iter_s, &iter_d);
@@ -729,6 +735,7 @@ static void pm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
if (prefs_get_int("pm_sort") != SORT_NONE) {
gtkpod_statusbar_message(_("Can't reorder sorted
treeview."));
gtk_drag_finish(dc, FALSE, FALSE, time);
+ g_free(data_copy);
return;
}
gtk_tree_store_move_after(GTK_TREE_STORE (model), &iter_s,
&iter_d);
@@ -745,6 +752,7 @@ static void pm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
break;
default:
gtk_drag_finish(dc, FALSE, FALSE, time);
+ g_free(data_copy);
g_return_if_reached ();
}
}
@@ -758,6 +766,7 @@ static void pm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
pl_d = gp_playlist_add_new(pl->itdb, pl_s->name, FALSE,
position);
if (pos == GTK_TREE_VIEW_DROP_AFTER)
pl_d = gp_playlist_add_new(pl->itdb, pl_s->name, FALSE,
position + 1);
+ g_free(data_copy);
g_return_if_fail (pl_d);
/* copy files from iPod if necessary */
@@ -799,6 +808,8 @@ static void pm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
break;
}
+ g_free(data_copy);
+
/* display if any duplicates were skipped */
gp_duplicate_remove(NULL, NULL);
}
diff --git a/plugins/track_display/display_tracks.c
b/plugins/track_display/display_tracks.c
index ba743af..f188da1 100644
--- a/plugins/track_display/display_tracks.c
+++ b/plugins/track_display/display_tracks.c
@@ -549,15 +549,16 @@ static void tm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
}
}
+ gchar *data_copy = g_strdup(gtk_selection_data_get_data(data));
switch (info) {
case DND_GTKPOD_TM_PATHLIST:
g_return_if_fail (path);
- result = tm_move_pathlist(gtk_selection_data_get_data(data), path,
pos);
+ result = tm_move_pathlist(data_copy, path, pos);
gdk_drag_status(dc, GDK_ACTION_MOVE, time);
gtk_drag_finish(dc, TRUE, FALSE, time);
break;
case DND_TEXT_PLAIN:
- result = tm_add_filelist(gtk_selection_data_get_data(data), path, pos);
+ result = tm_add_filelist(data_copy, path, pos);
gdk_drag_status(dc, gdk_drag_context_get_suggested_action(dc), time);
if (gdk_drag_context_get_selected_action(dc) == GDK_ACTION_MOVE)
gtk_drag_finish(dc, TRUE, TRUE, time);
@@ -565,7 +566,7 @@ static void tm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
gtk_drag_finish(dc, TRUE, FALSE, time);
break;
case DND_TEXT_URI_LIST:
- result = tm_add_filelist(gtk_selection_data_get_data(data), path, pos);
+ result = tm_add_filelist(data_copy, path, pos);
gdk_drag_status(dc, gdk_drag_context_get_suggested_action(dc), time);
if (gdk_drag_context_get_selected_action(dc) == GDK_ACTION_MOVE)
gtk_drag_finish(dc, TRUE, TRUE, time);
@@ -578,6 +579,8 @@ static void tm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
/* puts ("tm_drag_data_received(): should not be reached"); */
break;
}
+ g_free(data_copy);
+
if (path)
gtk_tree_path_free(path);
}
@@ -1452,7 +1455,7 @@ void tm_stop_editing(gboolean cancel) {
gtk_tree_view_get_cursor(track_treeview, NULL, &col);
if (col) {
GList *cells;
-
+
/* Before removing the widget we set multi_edit to FALSE. That
way at most one entry will be changed (this also doesn't
seem to work the way intended) */
@@ -2189,7 +2192,7 @@ static GtkTreeViewColumn *tm_add_column(TM_item tm_item,
gint pos) {
gtk_widget_set_tooltip_text(label, gettext (get_tm_tooltip(tm_item)));
gtk_tree_view_column_set_widget(col, label);
}
-
+
return col;
}
------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users
worldwide. Take advantage of special opportunities to increase revenue and
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
