X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-utils.c;h=8c9bae5501617027009d9be62379e668bc136ad4;hb=d3bc7b9497f6205eaa0c6dece068caff6411ce8c;hp=916cc18bb7cc3e3df744c703a360c30457c82920;hpb=80aa207c49dda77a013f0df2a2e2a393062a96b6;p=evince.git

diff --git a/shell/ev-utils.c b/shell/ev-utils.c
index 916cc18b..8c9bae55 100644
--- a/shell/ev-utils.c
+++ b/shell/ev-utils.c
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
@@ -187,9 +187,8 @@ ev_pixbuf_add_shadow (GdkPixbuf *src, int size,
  * the region code.
  */
 void
-ev_print_region_contents (GdkRegion *region)
+ev_print_region_contents (cairo_region_t *region)
 {
-	GdkRectangle *rectangles = NULL;
 	gint n_rectangles, i;
 
 	if (region == NULL) {
@@ -198,17 +197,19 @@ ev_print_region_contents (GdkRegion *region)
 	}
 
 	g_print ("<region %p>\n", region);
-	gdk_region_get_rectangles (region, &rectangles, &n_rectangles);
+	n_rectangles = cairo_region_num_rectangles (region);
 	for (i = 0; i < n_rectangles; i++) {
+		GdkRectangle rect;
+
+		cairo_region_get_rectangle (region, i, &rect);
 		g_print ("\t(%d %d, %d %d) [%dx%d]\n",
-			 rectangles[i].x,
-			 rectangles[i].y,
-			 rectangles[i].x + rectangles[i].width,
-			 rectangles[i].y + rectangles[i].height,
-			 rectangles[i].width,
-			 rectangles[i].height);
+			 rect.x,
+			 rect.y,
+			 rect.x + rect.width,
+			 rect.y + rect.height,
+			 rect.width,
+			 rect.height);
 	}
-	g_free (rectangles);
 }
 
 static void
@@ -224,7 +225,7 @@ ev_gui_sanitise_popup_position (GtkMenu *menu,
 
 	g_return_if_fail (widget != NULL);
 
-	gtk_widget_size_request (GTK_WIDGET (menu), &req);
+	gtk_widget_get_preferred_size (GTK_WIDGET (menu), &req, NULL);
 
 	monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y);
 	gtk_menu_set_monitor (menu, monitor_num);
@@ -250,7 +251,7 @@ ev_gui_menu_position_tree_selection (GtkMenu   *menu,
 	GtkAllocation allocation;
 	GdkRectangle visible;
 
-	gtk_widget_size_request (GTK_WIDGET (menu), &req);
+	gtk_widget_get_preferred_size (GTK_WIDGET (menu), &req, NULL);
 	gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
 	gtk_widget_get_allocation (widget, &allocation);