← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xiphos/trusty

« back to all changes in this revision

Viewing changes to src/gnome2/navbar_book.c

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs, Dmitrijs Ledkovs
  • Date: 2012-03-11 18:43:32 UTC
  • mfrom: (17.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20120311184332-splq3ecpx7tyi87d
Tags: 3.1.5+dfsg-1
http://bugs.debian.org/654511
[ Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> ]  
* New upstream release.
* Build using webkit backend
* Contains unpacked source for waf binary (Closes: #654511)
* Update debian/copyright to latest specification

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gnome2/navbar_book.c
2
2
 * Xiphos Bible Study Tool
3
3
 * navbar_book.c - navigation bar for genbook modules
4
4
 *
5
 
 * Copyright (C) 2000-2010 Xiphos Developer Team
 
5
 * Copyright (C) 2000-2011 Xiphos Developer Team
6
6
 *
7
7
 * This program is free software; you can redistribute it and/or modify
8
8
 * it under the terms of the GNU General Public License as published by
84
84
                                gboolean * push_in, gpointer user_data)
85
85
{
86
86
        GtkWidget *widget;
87
 
 
 
87
        GtkAllocation allocation;
88
88
        g_return_if_fail(GTK_IS_BUTTON(user_data));
89
 
        g_return_if_fail(GTK_WIDGET_NO_WINDOW(user_data));
 
89
#if defined(HAVE_GTK_220) || defined(USE_GTK_3)
 
90
        g_return_if_fail (gtk_widget_get_window(user_data));
 
91
#else
 
92
        g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data));
 
93
#endif
90
94
 
91
95
        widget = GTK_WIDGET(user_data);
92
96
 
93
 
        gdk_window_get_origin(widget->window, x, y);
94
 
 
95
 
        *x += widget->allocation.x;
96
 
        *y += widget->allocation.y + widget->allocation.height;
 
97
        gdk_window_get_origin(gtk_widget_get_window (widget), x, y);
 
98
        gtk_widget_get_allocation (widget, &allocation);
 
99
        *x += allocation.x;
 
100
        *y += allocation.y + allocation.height;
97
101
 
98
102
        *push_in = FALSE;
99
103
}