summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/gtkui/callbacks.c2
-rw-r--r--plugins/gtkui/ddblistview.c65
-rw-r--r--plugins/gtkui/ddblistview.h2
-rw-r--r--plugins/gtkui/ddbtabstrip.c14
-rw-r--r--plugins/gtkui/ddbvolumebar.c6
-rw-r--r--plugins/gtkui/gdkdrawing.c2
-rw-r--r--plugins/gtkui/gtkui.c10
-rw-r--r--plugins/gtkui/interface.c2
-rw-r--r--plugins/gtkui/mainplaylist.c2
-rw-r--r--plugins/gtkui/plcommon.c20
-rw-r--r--plugins/gtkui/prefwin.c2
-rw-r--r--plugins/gtkui/search.c6
12 files changed, 63 insertions, 70 deletions
diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c
index f537b1e3..86850a27 100644
--- a/plugins/gtkui/callbacks.c
+++ b/plugins/gtkui/callbacks.c
@@ -632,7 +632,7 @@ on_mainwin_configure_event (GtkWidget *widget,
#else
GdkWindowState window_state = gdk_window_get_state (G_OBJECT (widget));
#endif
- if (!(window_state & GDK_WINDOW_STATE_MAXIMIZED) && GTK_WIDGET_VISIBLE (widget)) {
+ if (!(window_state & GDK_WINDOW_STATE_MAXIMIZED) && gtk_widget_get_visible (widget)) {
int x, y;
int w, h;
gtk_window_get_position (GTK_WINDOW (widget), &x, &y);
diff --git a/plugins/gtkui/ddblistview.c b/plugins/gtkui/ddblistview.c
index aa1f7a57..df349159 100644
--- a/plugins/gtkui/ddblistview.c
+++ b/plugins/gtkui/ddblistview.c
@@ -274,6 +274,7 @@ ddb_listview_class_init(DdbListviewClass *class)
{
GtkTableClass *widget_class = (GtkTableClass *) class;
GtkObjectClass *object_class = (GtkObjectClass *) class;
+ // FIXME!!!
object_class->destroy = ddb_listview_destroy;
}
@@ -357,10 +358,10 @@ ddb_listview_init(DdbListview *listview)
(GtkAttachOptions) (GTK_FILL), 0, 0);
- gtk_object_set_data (GTK_OBJECT (listview->list), "owner", listview);
- gtk_object_set_data (GTK_OBJECT (listview->header), "owner", listview);
- gtk_object_set_data (GTK_OBJECT (listview->scrollbar), "owner", listview);
- gtk_object_set_data (GTK_OBJECT (listview->hscrollbar), "owner", listview);
+ g_object_set_data (G_OBJECT (listview->list), "owner", listview);
+ g_object_set_data (G_OBJECT (listview->header), "owner", listview);
+ g_object_set_data (G_OBJECT (listview->scrollbar), "owner", listview);
+ g_object_set_data (G_OBJECT (listview->hscrollbar), "owner", listview);
g_signal_connect ((gpointer) listview->list, "configure_event",
G_CALLBACK (ddb_listview_list_configure_event),
@@ -436,14 +437,13 @@ ddb_listview_init(DdbListview *listview)
GtkWidget * ddb_listview_new()
{
- return GTK_WIDGET(gtk_type_new(ddb_listview_get_type()));
+ return g_object_newv (ddb_listview_get_type(), 0, NULL);//GTK_WIDGET(gtk_type_new(ddb_listview_get_type()));
}
static void
ddb_listview_destroy(GtkObject *object)
{
DdbListview *listview;
- DdbListviewClass *class;
g_return_if_fail(object != NULL);
g_return_if_fail(DDB_IS_LISTVIEW(object));
@@ -459,11 +459,11 @@ ddb_listview_destroy(GtkObject *object)
}
if (listview->cursor_sz) {
- gdk_cursor_destroy (listview->cursor_sz);
+ gdk_cursor_unref (listview->cursor_sz);
listview->cursor_sz = NULL;
}
if (listview->cursor_drag) {
- gdk_cursor_destroy (listview->cursor_drag);
+ gdk_cursor_unref (listview->cursor_drag);
listview->cursor_drag = NULL;
}
if (listview->backbuf) {
@@ -475,11 +475,9 @@ ddb_listview_destroy(GtkObject *object)
listview->backbuf_header = NULL;
}
- class = gtk_type_class(gtk_widget_get_type());
-
- if (GTK_OBJECT_CLASS (ddb_listview_parent_class)) {
- GTK_OBJECT_CLASS (ddb_listview_parent_class)->destroy (object);
- }
+// if (G_OBJECT_CLASS (ddb_listview_parent_class)) {
+// G_OBJECT_CLASS (ddb_listview_parent_class)->destroy (object);
+// }
}
void
@@ -529,7 +527,7 @@ ddb_listview_list_configure_event (GtkWidget *widget,
GdkEventConfigure *event,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
draw_init_font (widget->style);
int height = draw_get_font_size () + 12;
@@ -700,7 +698,7 @@ ddb_listview_list_expose_event (GtkWidget *widget,
GdkEventExpose *event,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
ddb_listview_list_expose (ps, event->area.x, event->area.y, event->area.width, event->area.height);
return FALSE;
}
@@ -718,7 +716,7 @@ ddb_listview_vscroll_event (GtkWidget *widget,
GdkEvent *event,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
GdkEventScroll *ev = (GdkEventScroll*)event;
GtkWidget *range = ps->scrollbar;;
GtkWidget *list = ps->list;
@@ -739,7 +737,7 @@ void
ddb_listview_vscroll_value_changed (GtkRange *widget,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
int newscroll = gtk_range_get_value (GTK_RANGE (widget));
if (ps->binding->vscroll_changed) {
ps->binding->vscroll_changed (newscroll);
@@ -785,7 +783,7 @@ void
ddb_listview_hscroll_value_changed (GtkRange *widget,
gpointer user_data)
{
- DdbListview *pl = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *pl = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
int newscroll = gtk_range_get_value (GTK_RANGE (widget));
ddb_listview_list_set_hscroll (pl, newscroll);
}
@@ -798,7 +796,7 @@ ddb_listview_list_drag_motion (GtkWidget *widget,
guint time,
gpointer user_data)
{
- DdbListview *pl = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *pl = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
ddb_listview_list_track_dragdrop (pl, y);
int cnt = g_list_length (drag_context->targets);
int i;
@@ -861,7 +859,7 @@ ddb_listview_list_drag_data_get (GtkWidget *widget,
guint time,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
switch (target_type) {
case TARGET_SAMEWIDGET:
{
@@ -904,7 +902,7 @@ ddb_listview_list_drag_data_received (GtkWidget *widget,
guint time,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
if (!ps->binding->external_drag_n_drop || !ps->binding->drag_n_drop) {
gtk_drag_finish (drag_context, TRUE, FALSE, time);
return;
@@ -967,7 +965,7 @@ ddb_listview_list_drag_leave (GtkWidget *widget,
guint time,
gpointer user_data)
{
- DdbListview *pl = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *pl = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
ddb_listview_list_track_dragdrop (pl, -1);
}
@@ -1193,7 +1191,8 @@ ddb_listview_list_render_row_background (DdbListview *ps, DdbListviewIter it, in
if (treeview->style->depth == -1) {
return; // drawing was called too early
}
- GTK_OBJECT_FLAGS (treeview) |= GTK_HAS_FOCUS;
+ GTK_WIDGET_SET_FLAGS (GTK_WIDGET (treeview), GTK_HAS_FOCUS);
+ //G_OBJECT_FLAGS (treeview) |= GTK_HAS_FOCUS;
}
int sel = it && ps->binding->is_selected (it);
if (theming || !sel) {
@@ -1989,7 +1988,7 @@ ddb_listview_list_drag_end (GtkWidget *widget,
GdkDragContext *drag_context,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
ddb_listview_refresh (ps, DDB_REFRESH_LIST|DDB_EXPOSE_LIST);
ps->scroll_direction = 0;
ps->scroll_pointer_y = -1;
@@ -2099,7 +2098,7 @@ ddb_listview_header_expose_event (GtkWidget *widget,
GdkEventExpose *event,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
ddb_listview_header_expose (ps, event->area.x, event->area.y, event->area.width, event->area.height);
return FALSE;
}
@@ -2110,7 +2109,7 @@ ddb_listview_header_configure_event (GtkWidget *widget,
GdkEventConfigure *event,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
draw_init_font (widget->style);
int height = draw_get_font_size () + 12;
if (height != widget->allocation.height) {
@@ -2131,7 +2130,7 @@ ddb_listview_header_realize (GtkWidget *widget,
gpointer user_data)
{
// create cursor for sizing headers
- DdbListview *listview = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
int h = draw_get_font_size ();
gtk_widget_set_size_request (widget, -1, h + 10);
listview->cursor_sz = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
@@ -2143,7 +2142,7 @@ ddb_listview_header_motion_notify_event (GtkWidget *widget,
GdkEventMotion *event,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
int ev_x, ev_y;
GdkModifierType ev_state;
@@ -2276,7 +2275,7 @@ ddb_listview_header_button_press_event (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
// ps->active_column = ddb_listview_header_get_column_for_coord (ps, event->x);
if (event->button == 1) {
// start sizing/dragging
@@ -2320,7 +2319,7 @@ ddb_listview_header_button_release_event (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
if (event->button == 1) {
if (ps->header_prepare) {
ps->header_sizing = -1;
@@ -2445,7 +2444,7 @@ ddb_listview_list_button_press_event (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
if (event->button == 1) {
ddb_listview_list_mouse1_pressed (ps, event->state, event->x, event->y, event->time);
}
@@ -2494,7 +2493,7 @@ ddb_listview_list_button_release_event (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
if (event->button == 1) {
ddb_listview_list_mouse1_released (ps, event->state, event->x, event->y, event->time);
}
@@ -2509,7 +2508,7 @@ ddb_listview_motion_notify_event (GtkWidget *widget,
int x = event->x;
int y = event->y;
gdk_event_request_motions (event);
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (widget), "owner"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
ddb_listview_list_mousemove (ps, event, x, y);
return FALSE;
}
diff --git a/plugins/gtkui/ddblistview.h b/plugins/gtkui/ddblistview.h
index 0060669d..0986a230 100644
--- a/plugins/gtkui/ddblistview.h
+++ b/plugins/gtkui/ddblistview.h
@@ -153,7 +153,7 @@ struct _DdbListviewClass {
GtkTableClass parent_class;
};
-GtkType ddb_listview_get_type(void);
+GType ddb_listview_get_type(void);
GtkWidget * ddb_listview_new();
diff --git a/plugins/gtkui/ddbtabstrip.c b/plugins/gtkui/ddbtabstrip.c
index 601b4e41..d4157c24 100644
--- a/plugins/gtkui/ddbtabstrip.c
+++ b/plugins/gtkui/ddbtabstrip.c
@@ -29,7 +29,7 @@
#define GLADE_HOOKUP_OBJECT(component,widget,name) \
g_object_set_data_full (G_OBJECT (component), name, \
- gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
+ g_object_ref (G_OBJECT (widget)), (GDestroyNotify) g_object_unref)
#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
g_object_set_data (G_OBJECT (component), name, widget)
@@ -71,7 +71,7 @@ ddb_tabstrip_realize (GtkWidget *widget) {
GdkWindowAttr attributes;
gint attributes_mask;
- if (GTK_WIDGET_NO_WINDOW (widget))
+ if (GTK_WIDGET_FLAGS (widget)&GTK_NO_WINDOW/*GTK_WIDGET_NO_WINDOW (widget)*/)
{
GTK_WIDGET_CLASS (ddb_tabstrip_parent_class)->realize (widget);
}
@@ -120,9 +120,9 @@ ddb_tabstrip_size_allocate (GtkWidget *widget,
widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED (widget))
+ if (GTK_WIDGET_FLAGS(widget)&GTK_REALIZED/*GTK_WIDGET_REALIZED (widget)*/)
{
- if (!GTK_WIDGET_NO_WINDOW (widget))
+ if (!(GTK_WIDGET_FLAGS (widget)&GTK_NO_WINDOW)/*GTK_WIDGET_NO_WINDOW (widget)*/)
gdk_window_move_resize (widget->window,
allocation->x, allocation->y,
allocation->width, allocation->height);
@@ -190,17 +190,11 @@ static void
ddb_tabstrip_destroy(GtkObject *object)
{
DdbTabStrip *tabstrip;
- DdbTabStripClass *class;
g_return_if_fail(object != NULL);
g_return_if_fail(DDB_IS_TABSTRIP(object));
tabstrip = DDB_TABSTRIP (object);
- class = gtk_type_class(gtk_widget_get_type());
-
- if (GTK_OBJECT_CLASS (ddb_tabstrip_parent_class)) {
- GTK_OBJECT_CLASS (ddb_tabstrip_parent_class)->destroy (object);
- }
}
static void
diff --git a/plugins/gtkui/ddbvolumebar.c b/plugins/gtkui/ddbvolumebar.c
index 767290cd..a9191cff 100644
--- a/plugins/gtkui/ddbvolumebar.c
+++ b/plugins/gtkui/ddbvolumebar.c
@@ -50,7 +50,7 @@ static void
ddb_volumebar_realize (GtkWidget *widget) {
DdbVolumeBar *darea = DDB_VOLUMEBAR (widget);
- GTK_WIDGET_SET_FLAGS (widget, GTK_NO_WINDOW);
+ gtk_widget_set_has_window (widget, FALSE);
GTK_WIDGET_CLASS (ddb_volumebar_parent_class)->realize (widget);
#if 0
@@ -98,9 +98,9 @@ ddb_volumebar_size_allocate (GtkWidget *widget,
widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
{
- if (!GTK_WIDGET_NO_WINDOW (widget))
+ if (gtk_widget_get_has_window (widget))
gdk_window_move_resize (widget->window,
allocation->x, allocation->y,
allocation->width, allocation->height);
diff --git a/plugins/gtkui/gdkdrawing.c b/plugins/gtkui/gdkdrawing.c
index bed21e34..2ccb27ae 100644
--- a/plugins/gtkui/gdkdrawing.c
+++ b/plugins/gtkui/gdkdrawing.c
@@ -57,7 +57,7 @@ draw_copy (uintptr_t dest_canvas, uintptr_t src_canvas, int dx, int dy, int sx,
void
draw_pixbuf (uintptr_t dest_canvas, uintptr_t pixbuf, int dx, int dy, int sx, int sy, int w, int h) {
- gdk_pixbuf_render_to_drawable (GDK_PIXBUF (pixbuf), GDK_DRAWABLE (dest_canvas), gc, sx, sy, dx, dy, w, h, GDK_RGB_DITHER_NONE, 0, 0);
+ gdk_draw_pixbuf (GDK_DRAWABLE (dest_canvas), gc, GDK_PIXBUF (pixbuf), sx, sy, dx, dy, w, h, GDK_RGB_DITHER_NONE, 0, 0);
}
void
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c
index 07a54612..72aef0ae 100644
--- a/plugins/gtkui/gtkui.c
+++ b/plugins/gtkui/gtkui.c
@@ -107,7 +107,7 @@ static struct timeval last_br_update;
static gboolean
update_songinfo (gpointer ctx) {
int iconified = gdk_window_get_state(mainwin->window) & GDK_WINDOW_STATE_ICONIFIED;
- if (!GTK_WIDGET_VISIBLE (mainwin) || iconified) {
+ if (!gtk_widget_get_visible (mainwin) || iconified) {
return FALSE;
}
char sbtext_new[512] = "-";
@@ -232,7 +232,7 @@ on_trayicon_scroll_event (GtkWidget *widget,
void
mainwin_toggle_visible (void) {
int iconified = gdk_window_get_state(mainwin->window) & GDK_WINDOW_STATE_ICONIFIED;
- if (GTK_WIDGET_VISIBLE (mainwin) && !iconified) {
+ if (gtk_widget_get_visible (mainwin) && !iconified) {
gtk_widget_hide (mainwin);
}
else {
@@ -322,7 +322,7 @@ redraw_queued_tracks (DdbListview *pl, int list) {
static gboolean
redraw_queued_tracks_cb (gpointer nothing) {
int iconified = gdk_window_get_state(mainwin->window) & GDK_WINDOW_STATE_ICONIFIED;
- if (!GTK_WIDGET_VISIBLE (mainwin) || iconified) {
+ if (!gtk_widget_get_visible (mainwin) || iconified) {
return FALSE;
}
redraw_queued_tracks (DDB_LISTVIEW (lookup_widget (mainwin, "playlist")), PL_MAIN);
@@ -644,7 +644,7 @@ update_win_title_idle (gpointer data) {
static gboolean
redraw_seekbar_cb (gpointer nothing) {
int iconified = gdk_window_get_state(mainwin->window) & GDK_WINDOW_STATE_ICONIFIED;
- if (!GTK_WIDGET_VISIBLE (mainwin) || iconified) {
+ if (!gtk_widget_get_visible (mainwin) || iconified) {
return FALSE;
}
seekbar_redraw ();
@@ -733,7 +733,7 @@ gtkui_thread (void *ctx) {
if (mainwin_icon_pixbuf)
{
gtk_window_set_icon (GTK_WINDOW (mainwin), mainwin_icon_pixbuf);
- gdk_pixbuf_unref (mainwin_icon_pixbuf);
+ g_object_unref (G_OBJECT (mainwin_icon_pixbuf));
}
{
int x = deadbeef->conf_get_int ("mainwin.geometry.x", 40);
diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c
index b7196501..9ef636de 100644
--- a/plugins/gtkui/interface.c
+++ b/plugins/gtkui/interface.c
@@ -21,7 +21,7 @@
#define GLADE_HOOKUP_OBJECT(component,widget,name) \
g_object_set_data_full (G_OBJECT (component), name, \
- gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
+ g_object_ref (G_OBJECT (widget)), (GDestroyNotify) g_object_unref)
#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
g_object_set_data (G_OBJECT (component), name, widget)
diff --git a/plugins/gtkui/mainplaylist.c b/plugins/gtkui/mainplaylist.c
index 8247106b..2ef09cf8 100644
--- a/plugins/gtkui/mainplaylist.c
+++ b/plugins/gtkui/mainplaylist.c
@@ -323,7 +323,7 @@ main_playlist_free (void) {
void
main_refresh (void) {
- if (mainwin && GTK_WIDGET_VISIBLE (mainwin)) {
+ if (mainwin && gtk_widget_get_visible (mainwin)) {
DdbListview *pl = DDB_LISTVIEW (lookup_widget (mainwin, "playlist"));
ddb_listview_refresh (pl, DDB_REFRESH_VSCROLL | DDB_REFRESH_LIST | DDB_EXPOSE_LIST);
}
diff --git a/plugins/gtkui/plcommon.c b/plugins/gtkui/plcommon.c
index 0e7f0da7..96ddff69 100644
--- a/plugins/gtkui/plcommon.c
+++ b/plugins/gtkui/plcommon.c
@@ -146,7 +146,7 @@ void draw_column_data (DdbListview *listview, GdkDrawable *drawable, DdbListview
else {
pixbuf = buffering16_pixbuf;
}
- gdk_pixbuf_render_to_drawable (pixbuf, drawable, GTK_WIDGET (listview)->style->black_gc, 0, 0, x + cwidth/2 - 8, y + height/2 - 8, 16, 16, GDK_RGB_DITHER_NONE, 0, 0);
+ gdk_draw_pixbuf (drawable, GTK_WIDGET (listview)->style->black_gc, pixbuf, 0, 0, x + cwidth/2 - 8, y + height/2 - 8, 16, 16, GDK_RGB_DITHER_NONE, 0, 0);
}
else if (it) {
char text[1024];
@@ -189,7 +189,7 @@ void
main_add_to_playback_queue_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (menuitem), "ps"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (menuitem), "ps"));
DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
while (it) {
if (deadbeef->pl_is_selected (it)) {
@@ -207,7 +207,7 @@ main_remove_from_playback_queue_activate
(GtkMenuItem *menuitem,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (menuitem), "ps"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (menuitem), "ps"));
DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
while (it) {
if (deadbeef->pl_is_selected (it)) {
@@ -225,7 +225,7 @@ main_reload_metadata_activate
(GtkMenuItem *menuitem,
gpointer user_data)
{
- DdbListview *ps = DDB_LISTVIEW (gtk_object_get_data (GTK_OBJECT (menuitem), "ps"));
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (menuitem), "ps"));
DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
while (it) {
if (deadbeef->pl_is_selected (it) && deadbeef->is_local_file (it->fname) && it->decoder_id) {
@@ -363,7 +363,7 @@ list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) {
add_to_playback_queue1 = gtk_menu_item_new_with_mnemonic ("Add to playback queue");
gtk_widget_show (add_to_playback_queue1);
gtk_container_add (GTK_CONTAINER (playlist_menu), add_to_playback_queue1);
- gtk_object_set_data (GTK_OBJECT (add_to_playback_queue1), "ps", listview);
+ g_object_set_data (G_OBJECT (add_to_playback_queue1), "ps", listview);
remove_from_playback_queue1 = gtk_menu_item_new_with_mnemonic ("Remove from playback queue");
if (inqueue == -1) {
@@ -371,12 +371,12 @@ list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) {
}
gtk_widget_show (remove_from_playback_queue1);
gtk_container_add (GTK_CONTAINER (playlist_menu), remove_from_playback_queue1);
- gtk_object_set_data (GTK_OBJECT (remove_from_playback_queue1), "ps", listview);
+ g_object_set_data (G_OBJECT (remove_from_playback_queue1), "ps", listview);
reload_metadata = gtk_menu_item_new_with_mnemonic ("Reload metadata");
gtk_widget_show (reload_metadata);
gtk_container_add (GTK_CONTAINER (playlist_menu), reload_metadata);
- gtk_object_set_data (GTK_OBJECT (reload_metadata), "ps", listview);
+ g_object_set_data (G_OBJECT (reload_metadata), "ps", listview);
separator9 = gtk_separator_menu_item_new ();
@@ -387,12 +387,12 @@ list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) {
remove2 = gtk_menu_item_new_with_mnemonic ("Remove");
gtk_widget_show (remove2);
gtk_container_add (GTK_CONTAINER (playlist_menu), remove2);
- gtk_object_set_data (GTK_OBJECT (remove2), "ps", listview);
+ g_object_set_data (G_OBJECT (remove2), "ps", listview);
remove_from_disk = gtk_menu_item_new_with_mnemonic ("Remove from disk");
gtk_widget_show (remove_from_disk);
gtk_container_add (GTK_CONTAINER (playlist_menu), remove_from_disk);
- gtk_object_set_data (GTK_OBJECT (remove_from_disk), "ps", listview);
+ g_object_set_data (G_OBJECT (remove_from_disk), "ps", listview);
separator8 = gtk_separator_menu_item_new ();
gtk_widget_show (separator8);
@@ -402,7 +402,7 @@ list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) {
properties1 = gtk_menu_item_new_with_mnemonic ("Properties");
gtk_widget_show (properties1);
gtk_container_add (GTK_CONTAINER (playlist_menu), properties1);
- gtk_object_set_data (GTK_OBJECT (properties1), "ps", listview);
+ g_object_set_data (G_OBJECT (properties1), "ps", listview);
g_signal_connect ((gpointer) add_to_playback_queue1, "activate",
G_CALLBACK (main_add_to_playback_queue_activate),
diff --git a/plugins/gtkui/prefwin.c b/plugins/gtkui/prefwin.c
index c04ae306..02ae8223 100644
--- a/plugins/gtkui/prefwin.c
+++ b/plugins/gtkui/prefwin.c
@@ -32,7 +32,7 @@
#define GLADE_HOOKUP_OBJECT(component,widget,name) \
g_object_set_data_full (G_OBJECT (component), name, \
- gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
+ g_object_ref (G_OBJECT (widget)), (GDestroyNotify) g_object_unref)
#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
g_object_set_data (G_OBJECT (component), name, widget)
diff --git a/plugins/gtkui/search.c b/plugins/gtkui/search.c
index 89d0c7db..16f83236 100644
--- a/plugins/gtkui/search.c
+++ b/plugins/gtkui/search.c
@@ -100,7 +100,7 @@ on_searchentry_changed (GtkEditable *editable,
void
search_refresh (void) {
- if (searchwin && GTK_WIDGET_VISIBLE (searchwin)) {
+ if (searchwin && gtk_widget_get_visible (searchwin)) {
GtkWidget *pl = lookup_widget (searchwin, "searchlist");
ddb_listview_refresh (DDB_LISTVIEW (pl), DDB_REFRESH_VSCROLL | DDB_REFRESH_LIST | DDB_EXPOSE_LIST);
}
@@ -199,7 +199,7 @@ on_searchwin_configure_event (GtkWidget *widget,
#else
GdkWindowState window_state = gdk_window_get_state (G_OBJECT (widget));
#endif
- if (!(window_state & GDK_WINDOW_STATE_MAXIMIZED) && GTK_WIDGET_VISIBLE (widget)) {
+ if (!(window_state & GDK_WINDOW_STATE_MAXIMIZED) && gtk_widget_get_visible (widget)) {
int x, y;
int w, h;
gtk_window_get_position (GTK_WINDOW (widget), &x, &y);
@@ -217,7 +217,7 @@ on_searchwin_window_state_event (GtkWidget *widget,
GdkEventWindowState *event,
gpointer user_data)
{
- if (!GTK_WIDGET_VISIBLE (widget)) {
+ if (!gtk_widget_get_visible (widget)) {
return FALSE;
}
// based on pidgin maximization handler
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 22:27:07 +0000