author | dcarbery |
Fri, 24 Nov 2006 16:37:59 +0000 | |
branch | 217update |
changeset 19096 | d542fc2c823e |
parent 8517 | b8a1116b8d0f |
child 8666 | a73e4fd629f6 |
permissions | -rw-r--r-- |
8497 | 1 |
--- gaim-2.0.0beta4/gtk/gtkcellrendererexpander.c.orig 2006-10-18 18:37:48.000000000 +0100 |
2 |
+++ gaim-2.0.0beta4/gtk/gtkcellrendererexpander.c 2006-11-03 19:10:47.083709000 +0000 |
|
8486 | 3 |
@@ -56,13 +56,13 @@ |
4 |
GdkRectangle *cell_area, |
|
5 |
GdkRectangle *expose_area, |
|
6 |
guint flags); |
|
7 |
-static gboolean gaim_gtk_cell_renderer_expander_activate (GtkCellRenderer *cell, |
|
8 |
+static gboolean gaim_gtk_cell_renderer_expander_activate (GtkCellRenderer *r, |
|
9 |
GdkEvent *event, |
|
10 |
GtkWidget *widget, |
|
11 |
- const gchar *path, |
|
12 |
- GdkRectangle *background_area, |
|
13 |
- GdkRectangle *cell_area, |
|
14 |
- guint flags); |
|
15 |
+ const gchar *p, |
|
16 |
+ GdkRectangle *bg, |
|
17 |
+ GdkRectangle *cell, |
|
8497 | 18 |
+ GtkCellRendererState flags); |
8486 | 19 |
static void gaim_gtk_cell_renderer_expander_finalize (GObject *gobject); |
20 |
||
21 |
enum { |
|
8487
6edcb0c11090
New section to help the build find the .a files. Experimental.
dcarbery
parents:
8486
diff
changeset
|
22 |
--- gaim-2.0.0beta4/configure.ac.orig 2006-11-02 22:50:02.516349000 +0000 |
6edcb0c11090
New section to help the build find the .a files. Experimental.
dcarbery
parents:
8486
diff
changeset
|
23 |
+++ gaim-2.0.0beta4/configure.ac 2006-11-02 22:50:46.487764000 +0000 |
6edcb0c11090
New section to help the build find the .a files. Experimental.
dcarbery
parents:
8486
diff
changeset
|
24 |
@@ -689,9 +689,9 @@ |
6edcb0c11090
New section to help the build find the .a files. Experimental.
dcarbery
parents:
8486
diff
changeset
|
25 |
for i in $STATIC_PRPLS ; do |
6edcb0c11090
New section to help the build find the .a files. Experimental.
dcarbery
parents:
8486
diff
changeset
|
26 |
dnl Ugly special case for "libsilcgaim.a": |
6edcb0c11090
New section to help the build find the .a files. Experimental.
dcarbery
parents:
8486
diff
changeset
|
27 |
if test "x$i" = "xsilc"; then |
6edcb0c11090
New section to help the build find the .a files. Experimental.
dcarbery
parents:
8486
diff
changeset
|
28 |
- STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib${i}gaim.a" |
6edcb0c11090
New section to help the build find the .a files. Experimental.
dcarbery
parents:
8486
diff
changeset
|
29 |
+ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libgaim/protocols/$i/lib${i}gaim.a" |
6edcb0c11090
New section to help the build find the .a files. Experimental.
dcarbery
parents:
8486
diff
changeset
|
30 |
else |
6edcb0c11090
New section to help the build find the .a files. Experimental.
dcarbery
parents:
8486
diff
changeset
|
31 |
- STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib$i.a" |
6edcb0c11090
New section to help the build find the .a files. Experimental.
dcarbery
parents:
8486
diff
changeset
|
32 |
+ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libgaim/protocols/$i/lib$i.a" |
6edcb0c11090
New section to help the build find the .a files. Experimental.
dcarbery
parents:
8486
diff
changeset
|
33 |
fi |
6edcb0c11090
New section to help the build find the .a files. Experimental.
dcarbery
parents:
8486
diff
changeset
|
34 |
extern_init="$extern_init extern gboolean gaim_init_${i}_plugin();" |
6edcb0c11090
New section to help the build find the .a files. Experimental.
dcarbery
parents:
8486
diff
changeset
|
35 |
load_proto="$load_proto gaim_init_${i}_plugin();" |