[Gaim-commits] CVS: gaim/src gtkconv.c,1.581,1.582 gtkconv.h,1.68,1.69

[Richard L. <rl...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8376/src

Modified Files:
	gtkconv.c gtkconv.h 
Log Message:
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)


Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -d -p -r1.581 -r1.582
--- gtkconv.c	16 Aug 2005 18:54:40 -0000	1.581
+++ gtkconv.c	16 Aug 2005 19:15:27 -0000	1.582
@@ -2116,7 +2116,7 @@ notebook_motion_cb(GtkWidget *widget, Gd
 		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 @@ notebook_motion_cb(GtkWidget *widget, Gd
 							  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 @@ notebook_release_cb(GtkWidget *widget, G
 		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 @@ gaim_gtkconv_get_tab_at_xy(GaimConvWindo
 	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)

Index: gtkconv.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -p -r1.68 -r1.69
--- gtkconv.h	16 Aug 2005 18:54:40 -0000	1.68
+++ gtkconv.h	16 Aug 2005 19:15:28 -0000	1.69
@@ -262,21 +262,6 @@ GaimConvWindow *gaim_gtkwin_get_at_xy(in
  */
 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);
 /*@}*/