Skip to content
Browse files

Better compatibility with older GTK and Cairo

divelist.c:
Replaced "gtk_tree_path_get_indices_with_depth()" with the coupled alternative:
	int depth = gtk_tree_path_get_depth(path);
	int *indices = gtk_tree_path_get_indices(path);
for compatibility GTK+ < 2.22

*:
Replaced all usage of "cairo_rectangle_int_t" with "cairo_rectangle_t"
for compatibility with Cairo < 1.10.

Both modification make building Subsurface possible on a fairly recent Debian
distribution, which reports to have the version of the abovementioned
libraries "up-to-date", yet they are slightly outdated.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
  • Loading branch information...
1 parent ae33b5e commit 0fceb1c9070eb2b1c65f26e665d49ee54cc4e17e @neolit123 neolit123 committed with dirkhh Sep 11, 2012
Showing with 5 additions and 5 deletions.
  1. +2 −2 divelist.c
  2. +3 −3 gtk-gui.c
View
4 divelist.c
@@ -1826,8 +1826,8 @@ static void popup_divelist_menu(GtkTreeView *tree_view, GtkTreeModel *model, int
}
/* only offer trip editing options when we are displaying the tree model */
if (dive_list.model == dive_list.treemodel) {
- int depth;
- int *indices = gtk_tree_path_get_indices_with_depth(path, &depth);
+ int depth = gtk_tree_path_get_depth(path);
+ int *indices = gtk_tree_path_get_indices(path);
/* top level dive or child dive that is not the first child */
if (depth == 1 || indices[1] > 0) {
menuitem = gtk_menu_item_new_with_label("Create new trip above");
View
6 gtk-gui.c
@@ -971,7 +971,7 @@ void exit_ui(void)
}
typedef struct {
- cairo_rectangle_int_t rect;
+ cairo_rectangle_t rect;
const char *text;
} tooltip_record_t;
@@ -980,7 +980,7 @@ static int tooltips;
void attach_tooltip(int x, int y, int w, int h, const char *text)
{
- cairo_rectangle_int_t *rect;
+ cairo_rectangle_t *rect;
tooltip_rects = realloc(tooltip_rects, (tooltips + 1) * sizeof(tooltip_record_t));
rect = &tooltip_rects[tooltips].rect;
rect->x = x;
@@ -998,7 +998,7 @@ static gboolean profile_tooltip (GtkWidget *widget, gint x, gint y,
gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data)
{
int i;
- cairo_rectangle_int_t *drawing_area = user_data;
+ cairo_rectangle_t *drawing_area = user_data;
gint tx = x - drawing_area->x; /* get transformed coordinates */
gint ty = y - drawing_area->y;

0 comments on commit 0fceb1c

Please sign in to comment.
Something went wrong with that request. Please try again.