[goffice] Remove libglade dependency from pc file. [#609833]
- From: Jean Bréfort <jbrefort src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [goffice] Remove libglade dependency from pc file. [#609833]
- Date: Sun, 14 Feb 2010 12:31:37 +0000 (UTC)
commit af3c0418c7c5e06301bdbef26e563747b7882c94
Author: Jean Brefort <jean brefort normalesup org>
Date: Sun Feb 14 13:33:19 2010 +0100
Remove libglade dependency from pc file. [#609833]
ChangeLog | 6 ++++++
NEWS | 3 +++
goffice/canvas/goc-canvas.c | 13 +++++++++----
libgoffice.pc.in | 2 +-
4 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 351375d..20e0485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-14 Jean Brefort <jean brefort normalesup org>
+
+ * goffice/canvas/goc-canvas.c (button_press_cb),
+ (button_release_cb), (motion_cb): don't return before cleaning.
+ * libgoffice.pc.in: remove libglade dependency. [#609833]
+
2010-02-13 Morten Welinder <terra gnome org>
* configure.in: Post-release bump.
diff --git a/NEWS b/NEWS
index aedf804..388004a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
goffice 0.8.1:
+Jean:
+ * Remove libglade dependency from pc file. [#609833]
+
--------------------------------------------------------------------------
goffice 0.8.0:
diff --git a/goffice/canvas/goc-canvas.c b/goffice/canvas/goc-canvas.c
index e661b36..f6bbb70 100644
--- a/goffice/canvas/goc-canvas.c
+++ b/goffice/canvas/goc-canvas.c
@@ -85,11 +85,13 @@ button_press_cb (GocCanvas *canvas, GdkEventButton *event, G_GNUC_UNUSED gpointe
y = canvas->scroll_y1 + event->y / canvas->pixels_per_unit;
item = goc_canvas_get_item_at (canvas, x, y);;
if (item) {
+ gboolean result;
canvas->cur_event = (GdkEvent *) event;
if (event->type == GDK_2BUTTON_PRESS)
return GOC_ITEM_GET_CLASS (item)->button2_pressed (item, event->button, x, y);
- return GOC_ITEM_GET_CLASS (item)->button_pressed (item, event->button, x, y);
+ result = GOC_ITEM_GET_CLASS (item)->button_pressed (item, event->button, x, y);
canvas->cur_event = NULL;
+ return result;
}
return FALSE;
}
@@ -110,9 +112,11 @@ button_release_cb (GocCanvas *canvas, GdkEventButton *event, G_GNUC_UNUSED gpoin
canvas->grabbed_item:
goc_canvas_get_item_at (canvas, x, y);
if (item) {
+ gboolean result;
canvas->cur_event = (GdkEvent *) event;
- return GOC_ITEM_GET_CLASS (item)->button_released (item, event->button, x, y);
+ result = GOC_ITEM_GET_CLASS (item)->button_released (item, event->button, x, y);
canvas->cur_event = NULL;
+ return result;
}
return FALSE;
}
@@ -122,6 +126,7 @@ motion_cb (GocCanvas *canvas, GdkEventMotion *event, G_GNUC_UNUSED gpointer data
{
double x, y;
GocItem *item;
+ gboolean result = FALSE;
if (event->window != gtk_layout_get_bin_window (&canvas->base))
return TRUE;
@@ -145,10 +150,10 @@ motion_cb (GocCanvas *canvas, GdkEventMotion *event, G_GNUC_UNUSED gpointer data
canvas->last_item = item;
klass->enter_notify (item, x, y);
}
- return klass->motion (item, x, y);
+ result = klass->motion (item, x, y);
}
canvas->cur_event = NULL;
- return FALSE;
+ return result;
}
static void
diff --git a/libgoffice.pc.in b/libgoffice.pc.in
index 4903b13..0a0611d 100644
--- a/libgoffice.pc.in
+++ b/libgoffice.pc.in
@@ -6,7 +6,7 @@ includedir= includedir@
Name: libGOffice
Description: G Office support library
Version: @VERSION@
-Requires.private: glib-2.0 gobject-2.0 gio-2.0 libgsf-1 libxml-2.0 gtk+-2.0 libglade-2.0 cairo pangocairo @EXTRA_DEPS@
+Requires.private: glib-2.0 gobject-2.0 gio-2.0 libgsf-1 libxml-2.0 gtk+-2.0 cairo pangocairo @EXTRA_DEPS@
Libs: -L${libdir} -lgoffice- GOFFICE_API_VER@
Libs.private: @EXTRA_LIBS@
Cflags: -I${includedir}/libgoffice- GOFFICE_API_VER@ @EXTRA_INCLUDES@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]