Mercurial > pidgin
changeset 4704:56c70997fe5c
[gaim-migrate @ 5015]
some might find this beter. Paco-Paco fixed 'make dist' for you dist-making
types out there, and I made cvs a little less annoying, and fixed a thing or
two.
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Tue, 11 Mar 2003 17:40:11 +0000 |
| parents | e4dda06a3143 |
| children | e34fe984f999 |
| files | .cvsignore pixmaps/status/.cvsignore pixmaps/status/default/.cvsignore pixmaps/status/default/Makefile.am src/buddy.c |
| diffstat | 5 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/.cvsignore Tue Mar 11 08:17:22 2003 +0000 +++ b/.cvsignore Tue Mar 11 17:40:11 2003 +0000 @@ -29,3 +29,4 @@ *.swp win32-install-dir .temp-gettextize +m4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pixmaps/status/.cvsignore Tue Mar 11 17:40:11 2003 +0000 @@ -0,0 +1,2 @@ +Makefile.in +Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pixmaps/status/default/.cvsignore Tue Mar 11 17:40:11 2003 +0000 @@ -0,0 +1,2 @@ +Makefile.in +Makefile
--- a/pixmaps/status/default/Makefile.am Tue Mar 11 08:17:22 2003 +0000 +++ b/pixmaps/status/default/Makefile.am Tue Mar 11 17:40:11 2003 +0000 @@ -1,4 +1,4 @@ -EXTRA_DIST = login.png aim.png icq.png msn.png jabber.png yahoo.png gadu-gadu.png napster.png irc.png \ +EXTRA_DIST = login.png aim.png icq.png msn.png jabber.png yahoo.png gadu-gadu.png napster.png irc.png \ activebuddy.png admin.png aol.png away.png wireless.png gaimstatuspixdir = $(datadir)/pixmaps/gaim/status/default
--- a/src/buddy.c Tue Mar 11 08:17:22 2003 +0000 +++ b/src/buddy.c Tue Mar 11 17:40:11 2003 +0000 @@ -322,8 +322,11 @@ if (sd->target == gdk_atom_intern("GAIM_BUDDY", FALSE)) { struct buddy *b = NULL; GtkTreePath *path = NULL; + GtkTreeViewDropPosition position; memcpy(&b, sd->data, sizeof(b)); - gtk_tree_view_get_dest_row_at_pos(widget, x, y, &path, GTK_TREE_VIEW_DROP_INTO_OR_AFTER); + if(gtk_tree_view_get_dest_row_at_pos(GTK_TREE_VIEW(widget), x, y, &path, &position)) { + /* if we're here, I think it means the drop is ok */ + } } } @@ -649,15 +652,15 @@ G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER); gtkblist->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(gtkblist->treemodel)); - + /* Set up dnd */ gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(gtkblist->treeview), GDK_BUTTON1_MASK, gte, 2, GDK_ACTION_COPY); - gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(gtkblist->treeview), gte, 2, + gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(gtkblist->treeview), gte, 2, GDK_ACTION_COPY | GDK_ACTION_MOVE); - g_signal_connect(G_OBJECT(gtkblist->treeview), "drag-data-received", gaim_gtk_blist_drag_data_rcv_cb, NULL); - g_signal_connect(G_OBJECT(gtkblist->treeview), "drag-data-get", gaim_gtk_blist_drag_data_get_cb, NULL); - + g_signal_connect(G_OBJECT(gtkblist->treeview), "drag-data-received", G_CALLBACK(gaim_gtk_blist_drag_data_rcv_cb), NULL); + g_signal_connect(G_OBJECT(gtkblist->treeview), "drag-data-get", G_CALLBACK(gaim_gtk_blist_drag_data_get_cb), NULL); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(gtkblist->treeview), FALSE);