[gtk+] Avoid shadowing a variable
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Avoid shadowing a variable
- Date: Sat, 25 May 2013 17:18:28 +0000 (UTC)
commit f83af03579cbdb4b85e86c6cedee7578566fe802
Author: Matthias Clasen <mclasen redhat com>
Date: Sat May 25 13:17:57 2013 -0400
Avoid shadowing a variable
I don't think this broke anything, but it is just inviting
confusion.
gtk/gtkwindow.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 4a4e1f3..6970c7d 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -8755,19 +8755,19 @@ gtk_window_compute_hints (GtkWindow *window,
* +-----------+
*/
#define TEMPORARY_SIZE 10000 /* 10,000 pixels should be bigger than real widget sizes */
- GtkRequisition requisition;
+ GtkRequisition req;
int current_width, current_height;
_gtk_widget_override_size_request (geometry_info->widget,
TEMPORARY_SIZE, TEMPORARY_SIZE,
¤t_width, ¤t_height);
gtk_widget_get_preferred_size (widget,
- &requisition, NULL);
+ &req, NULL);
_gtk_widget_restore_size_request (geometry_info->widget,
current_width, current_height);
- extra_width = requisition.width - TEMPORARY_SIZE;
- extra_height = requisition.height - TEMPORARY_SIZE;
+ extra_width = req.width - TEMPORARY_SIZE;
+ extra_height = req.height - TEMPORARY_SIZE;
if (extra_width < 0 || extra_height < 0)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]