# HG changeset patch # User Richard Laager # Date 1124219728 0 # Node ID 65658ff2deb8d1dbbebfc4f3a6dc23f8228ef10e # Parent ed5302df41b0507c737540c0d0b3a7cf19ad9205 [gaim-migrate @ 13477] Removing gaim_gtkconv_get_dest_tab_at_xy, which is now useles. Also: (14:04:35) Sadrul Habib Chowdhury (sadrul): rlaager: while you are at it, there's a little mod to that patch: " gtkwin->drag_tab > page_num) " <-- ">" should be "<" (14:04:49) Sadrul Habib Chowdhury (sadrul): (i forgot to test that for the vertical tabs) committer: Tailor Script diff -r ed5302df41b0 -r 65658ff2deb8 plugins/ChangeLog.API --- a/plugins/ChangeLog.API Tue Aug 16 18:54:40 2005 +0000 +++ b/plugins/ChangeLog.API Tue Aug 16 19:15:28 2005 +0000 @@ -72,6 +72,8 @@ gtk_imhtml_toggle_underline, gtk_imhtml_toggle_strike: no longer return a value * Added: gtk_imhtml_clear_formatting() + * Removed: gaim_gtkconv_get_dest_tab_at_xy(), instead use + gaim_gtkconv_get_tab_at_xy() Signals: * Changed: "received-im-msg" and "received-chat-msg" to match, both diff -r ed5302df41b0 -r 65658ff2deb8 src/gtkconv.c --- a/src/gtkconv.c Tue Aug 16 18:54:40 2005 +0000 +++ b/src/gtkconv.c Tue Aug 16 19:15:28 2005 +0000 @@ -2116,7 +2116,7 @@ arrow1_x = arrow2_x = nb_x; arrow1_y = arrow2_y = nb_y; - page_num = gaim_gtkconv_get_dest_tab_at_xy(dest_win, + page_num = gaim_gtkconv_get_tab_at_xy(dest_win, e->x_root, e->y_root); if (gtk_notebook_get_tab_pos(dest_notebook) == GTK_POS_TOP || @@ -2145,7 +2145,7 @@ tab->allocation.width; arrow1_y = arrow2_y = nb_y + tab->allocation.y + tab->allocation.height/2; - if ((gpointer)gtkwin == (gpointer)dest_win && gtkwin->drag_tab > page_num) { + if ((gpointer)gtkwin == (gpointer)dest_win && gtkwin->drag_tab < page_num) { arrow1_y += tab->allocation.height; arrow2_y += tab->allocation.height; } @@ -2365,7 +2365,7 @@ dest_notebook = GTK_NOTEBOOK(gtkwin->notebook); /* Get the destination page number. */ - dest_page_num = gaim_gtkconv_get_dest_tab_at_xy(dest_win, + dest_page_num = gaim_gtkconv_get_tab_at_xy(dest_win, e->x_root, e->y_root); if (win == dest_win) { @@ -5929,12 +5929,6 @@ return page_num; } -int -gaim_gtkconv_get_dest_tab_at_xy(GaimConvWindow *win, int x, int y) -{ - return gaim_gtkconv_get_tab_at_xy(win, x, y); -} - static void close_on_tabs_pref_cb(const char *name, GaimPrefType type, gpointer value, gpointer data) diff -r ed5302df41b0 -r 65658ff2deb8 src/gtkconv.h --- a/src/gtkconv.h Tue Aug 16 18:54:40 2005 +0000 +++ b/src/gtkconv.h Tue Aug 16 19:15:28 2005 +0000 @@ -262,21 +262,6 @@ */ int gaim_gtkconv_get_tab_at_xy(GaimConvWindow *win, int x, int y); -/** - * Returns the index of the destination tab at the - * specified X, Y location in a notebook. - * - * This is used for drag-and-drop functions when the tab at the index - * is a destination tab. - * - * @param win The GTK+ window containing the notebook. - * @param x The X coordinate. - * @param y The Y coordinate. - * - * @return The index of the tab at the location. - */ -int gaim_gtkconv_get_dest_tab_at_xy(GaimConvWindow *win, int x, int y); - GaimGtkConversation *gaim_gtk_get_gtkconv_at_index(const GaimConvWindow *win, int index); /*@}*/