diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-04-12 02:48:43 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-04-12 02:48:43 +0000 |
| commit | e12d6657ee6aa24b5111380b9249a8f012917806 (patch) | |
| tree | f4e62a9bac8c5b8143acc025a3dc6fe536cbf48f | |
| parent | 82cda939239204f996eec19a40f04176e99ec424 (diff) | |
| download | gtk+-e12d6657ee6aa24b5111380b9249a8f012917806.tar.gz | |
Remove some unused variables.
2006-04-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (selection_motion_event_handler): Remove
some unused variables.
* gtk/gtktreeview.c ((gtk_tree_view_search_position_func): Apply
a patch from David Trowbridge to improve the positioning of the
search popup. (#338047)
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | gtk/gtktextview.c | 2 | ||||
| -rw-r--r-- | gtk/gtktreeview.c | 4 |
4 files changed, 20 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2006-04-11 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtktextview.c (selection_motion_event_handler): Remove + some unused variables. + + * gtk/gtktreeview.c ((gtk_tree_view_search_position_func): Apply + a patch from David Trowbridge to improve the positioning of the + search popup. (#338047) + 2006-04-11 Emmanuele Bassi <ebassi@cvs.gnome.org> * gtk/gtkrecentmanager.c (gtk_recent_manager_init) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 93488b13ff..0a673b92be 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2006-04-11 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtktextview.c (selection_motion_event_handler): Remove + some unused variables. + + * gtk/gtktreeview.c ((gtk_tree_view_search_position_func): Apply + a patch from David Trowbridge to improve the positioning of the + search popup. (#338047) + 2006-04-11 Emmanuele Bassi <ebassi@cvs.gnome.org> * gtk/gtkrecentmanager.c (gtk_recent_manager_init) diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 43a2ec5df2..c8004f915c 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -5637,8 +5637,6 @@ selection_motion_event_handler (GtkTextView *text_view, } else { - gint x, y; - GdkModifierType state; GtkTextIter cursor, start, end; GtkTextIter orig_start, orig_end; GtkTextBuffer *buffer; diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 8708553ad9..22e80d3a6d 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -12766,14 +12766,14 @@ gtk_tree_view_search_position_func (GtkTreeView *tree_view, &tree_height); gtk_widget_size_request (search_dialog, &requisition); - if (tree_x + tree_width - requisition.width > gdk_screen_get_width (screen)) + if (tree_x + tree_width > gdk_screen_get_width (screen)) x = gdk_screen_get_width (screen) - requisition.width; else if (tree_x + tree_width - requisition.width < 0) x = 0; else x = tree_x + tree_width - requisition.width; - if (tree_y + tree_height > gdk_screen_get_height (screen)) + if (tree_y + tree_height + requisition.height > gdk_screen_get_height (screen)) y = gdk_screen_get_height (screen) - requisition.height; else if (tree_y + tree_height < 0) /* isn't really possible ... */ y = 0; |