commit c364ed76431bd5023028287b4564b9061b82aae3
Author: scorpion <[email protected]>
Date: Sun Apr 17 19:55:41 2011 +0000
Initial migration fixes for gdk/gtk version 3.0
libgtkpod/file_convert.c | 2 +-
libgtkpod/tools.c | 2 +-
plugins/cover_display/display_coverart.c | 4 ++--
plugins/playlist_display/display_playlists.c | 2 +-
plugins/track_display/display_tracks.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/libgtkpod/file_convert.c b/libgtkpod/file_convert.c
index c67c23c..1b6c8df 100644
--- a/libgtkpod/file_convert.c
+++ b/libgtkpod/file_convert.c
@@ -296,7 +296,7 @@ void file_convert_init() {
conversion->log_window = gtkpod_builder_xml_get_widget(log_builder,
"conversion_log");
gtk_window_set_default_size(GTK_WINDOW (conversion->log_window),
prefs_get_int(FILE_CONVERT_LOG_SIZE_X), prefs_get_int(FILE_CONVERT_LOG_SIZE_Y));
- g_signal_connect_swapped (GTK_OBJECT (conversion->log_window),
"delete-event",
+ g_signal_connect_swapped (G_OBJECT (conversion->log_window),
"delete-event",
G_CALLBACK (conversion_log_window_delete),
conversion);
vbox = gtkpod_builder_xml_get_widget(log_builder, "conversion_vbox");
diff --git a/libgtkpod/tools.c b/libgtkpod/tools.c
index 8a58e9d..32fdb65 100644
--- a/libgtkpod/tools.c
+++ b/libgtkpod/tools.c
@@ -360,7 +360,7 @@ void nm_tracks_list (GList *list)
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
/* Indicate that user wants to abort */
- g_signal_connect_swapped (GTK_OBJECT (dialog), "response",
+ g_signal_connect_swapped (G_OBJECT (dialog), "response",
G_CALLBACK (normalization_abort),
&abort);
diff --git a/plugins/cover_display/display_coverart.c
b/plugins/cover_display/display_coverart.c
index ea9a05a..47dae76 100644
--- a/plugins/cover_display/display_coverart.c
+++ b/plugins/cover_display/display_coverart.c
@@ -215,7 +215,7 @@ void coverart_init_display(GtkWidget *parent, gchar
*gladepath) {
g_signal_connect (G_OBJECT (cdwidget->draw_area), "expose_event",
G_CALLBACK (on_drawing_area_exposed), NULL);
gtk_widget_add_events(cdwidget->draw_area, GDK_BUTTON_PRESS_MASK);
/* set up some callback events on the main scaled image */
- g_signal_connect(GTK_OBJECT(cdwidget->draw_area), "button-press-event",
G_CALLBACK(on_main_cover_image_clicked), NULL);
+ g_signal_connect(G_OBJECT(cdwidget->draw_area), "button-press-event",
G_CALLBACK(on_main_cover_image_clicked), NULL);
/* Dnd destinaton for foreign image files */
gtk_drag_dest_set(cdwidget->canvasbox, 0, coverart_drop_types,
TGNR(coverart_drop_types), GDK_ACTION_COPY
@@ -285,7 +285,7 @@ void coverart_block_change(gboolean val) {
if (val) {
GdkCursor *cursor = gdk_cursor_new(GDK_WATCH);
gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(gtkpod_app)), cursor);
- gdk_cursor_unref(cursor);
+ g_object_unref(cursor);
}
else
gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(gtkpod_app)), NULL);
diff --git a/plugins/playlist_display/display_playlists.c
b/plugins/playlist_display/display_playlists.c
index 9e90c23..2dcfcdc 100644
--- a/plugins/playlist_display/display_playlists.c
+++ b/plugins/playlist_display/display_playlists.c
@@ -834,7 +834,7 @@ static gboolean
on_playlist_treeview_key_release_event(GtkWidget *widget, GdkEve
/* case GDK_u: */
/* gp_do_selected_playlist (update_tracks); */
/* break; */
- case GDK_n:
+ case GDK_KEY_N:
if (itdb) {
add_new_pl_or_spl_user_name(itdb, NULL, -1);
}
diff --git a/plugins/track_display/display_tracks.c
b/plugins/track_display/display_tracks.c
index 233de7c..15cabea 100644
--- a/plugins/track_display/display_tracks.c
+++ b/plugins/track_display/display_tracks.c
@@ -2392,7 +2392,7 @@ void display_show_hide_searchbar(void) {
gtk_check_menu_item_set_active(mi, TRUE);
}
else {
- gtk_widget_hide_all(searchbar);
+ gtk_widget_hide(searchbar);
gtk_widget_show(upbutton);
gtk_widget_set_sensitive(upbutton, TRUE);
gtk_check_menu_item_set_active(mi, FALSE);
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
