Mercurial > pidgin.yaz
annotate libpurple/win32/targets.mak @ 32138:e2c6e4fc3c84
Start looking at the GError parameter every time we call these functions:
- gdk_pixbuf_loader_write
- gdk_pixbuf_loader_close
- gdk_pixbuf_new_from_file
- gdk_pixbuf_new_from_file_at_size
- gdk_pixbuf_new_from_file_at_scale
There are times when gdkpixbuf returns a semi-invalid GdkPixbuf object and
also sets the GError. If this happens we want to discard and ignore the
GdkPixbuf object because it can cause problems. For example, calling
gdk_pixbuf_scale_simple() causes gdkpixbuf to rapidly consume memory in
an infinite loop. And that's bad.
This commit adds some helper functions to gtkutils.[c|h] that make it a
little easier to check the GError value. We should use them everywhere
we call any of the above functions.
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Wed, 22 Jun 2011 07:07:28 +0000 |
parents | 80affba7ea0d |
children |
rev | line source |
---|---|
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1 # |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
2 # targets.mak |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
3 # |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
4 # This file should be included at the end of all Makefile.mingw |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
5 # files for better handling of cross directory dependencies |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
6 # |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
7 |
21045
daf98e539358
Maintain VERSION and DISPLAY_VERSION defines in config.h for the mingw build instead of plopping it on the command line.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
16619
diff
changeset
|
8 $(PIDGIN_CONFIG_H): $(PIDGIN_CONFIG_H).mingw $(PIDGIN_TREE_TOP)/configure.ac |
21298
008cfc009d0e
Allow win32 builds to define EXTRAVERSION in local.mak to do the equivalent
Stu Tomlinson <stu@nosnilmot.com>
parents:
21297
diff
changeset
|
9 sed -e 's/@VERSION@/$(PIDGIN_VERSION)/; s/@DISPLAY_VERSION@/$(DISPLAY_VERSION)/' $@.mingw > $@ |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
10 |
21297
5b1acbab99cf
Make purple.h a generated file so plugins can just include this and never
Stu Tomlinson <stu@nosnilmot.com>
parents:
21045
diff
changeset
|
11 $(PURPLE_PURPLE_H): $(PURPLE_PURPLE_H).in |
21546
948ef81f4215
Fix purple.h generation on win32. Thanks to Kevin for noticing.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21298
diff
changeset
|
12 sed -e 's/@PLUGINS_DEFINE@/#define PURPLE_PLUGINS 1/' $@.in > $@ |
21297
5b1acbab99cf
Make purple.h a generated file so plugins can just include this and never
Stu Tomlinson <stu@nosnilmot.com>
parents:
21045
diff
changeset
|
13 |
16619
bb5c527cf143
version.h needs to be regenerated when configure.ac changes
Daniel Atallah <daniel.atallah@gmail.com>
parents:
16615
diff
changeset
|
14 $(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in $(PIDGIN_TREE_TOP)/configure.ac |
16602
56c61eb40850
Fix version.h generation on mingw build.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
16039
diff
changeset
|
15 awk 'BEGIN {FS="[\\(\\)\\[\\]]"} \ |
22653
57f5337a9c28
Patch from dharding to allow pidgin to be built on win32 using MSYS 1.0.10 which includes a version of sed that doesn't handle in-place replacement. Fixes #5527.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21546
diff
changeset
|
16 /^m4_define..purple_major_version/ {system("sed -e s/@PURPLE_MAJOR_VERSION@/"$$5"/ $@.in > $@");} \ |
24522
006e2e385631
I'm not sure how this ever worked...
Daniel Atallah <daniel.atallah@gmail.com>
parents:
22653
diff
changeset
|
17 /^m4_define..purple_minor_version/ {system("sed -e s/@PURPLE_MINOR_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@");} \ |
006e2e385631
I'm not sure how this ever worked...
Daniel Atallah <daniel.atallah@gmail.com>
parents:
22653
diff
changeset
|
18 /^m4_define..purple_micro_version/ {system("sed -e s/@PURPLE_MICRO_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@"); exit}' $(PIDGIN_TREE_TOP)/configure.ac |
16602
56c61eb40850
Fix version.h generation on mingw build.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
16039
diff
changeset
|
19 |
28039
bd3cf895e19a
Fix windows build by adding the necessary bits to define the MTN revision
Stu Tomlinson <stu@nosnilmot.com>
parents:
27970
diff
changeset
|
20 $(PIDGIN_REVISION_RAW_TXT): |
bd3cf895e19a
Fix windows build by adding the necessary bits to define the MTN revision
Stu Tomlinson <stu@nosnilmot.com>
parents:
27970
diff
changeset
|
21 (cd $(PIDGIN_TREE_TOP) && mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \ |
bd3cf895e19a
Fix windows build by adding the necessary bits to define the MTN revision
Stu Tomlinson <stu@nosnilmot.com>
parents:
27970
diff
changeset
|
22 || rm -f $@ |
bd3cf895e19a
Fix windows build by adding the necessary bits to define the MTN revision
Stu Tomlinson <stu@nosnilmot.com>
parents:
27970
diff
changeset
|
23 |
bd3cf895e19a
Fix windows build by adding the necessary bits to define the MTN revision
Stu Tomlinson <stu@nosnilmot.com>
parents:
27970
diff
changeset
|
24 $(PIDGIN_REVISION_H): $(PIDGIN_REVISION_RAW_TXT) |
bd3cf895e19a
Fix windows build by adding the necessary bits to define the MTN revision
Stu Tomlinson <stu@nosnilmot.com>
parents:
27970
diff
changeset
|
25 if [ -f $< ]; then \ |
29429
b5af0c398c69
Fix cross-compile on OSX, working around an apparently crippled sed.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
28039
diff
changeset
|
26 sed 's/^\(.\{1,\}\)$$/#define REVISION "\1"/' $< > $@; \ |
28039
bd3cf895e19a
Fix windows build by adding the necessary bits to define the MTN revision
Stu Tomlinson <stu@nosnilmot.com>
parents:
27970
diff
changeset
|
27 fi |
bd3cf895e19a
Fix windows build by adding the necessary bits to define the MTN revision
Stu Tomlinson <stu@nosnilmot.com>
parents:
27970
diff
changeset
|
28 [ -f $@ ] || echo "#define REVISION \"unknown\"" > $@ |
bd3cf895e19a
Fix windows build by adding the necessary bits to define the MTN revision
Stu Tomlinson <stu@nosnilmot.com>
parents:
27970
diff
changeset
|
29 |
16602
56c61eb40850
Fix version.h generation on mingw build.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
16039
diff
changeset
|
30 $(PURPLE_DLL) $(PURPLE_DLL).a: $(PURPLE_VERSION_H) |
16039
ded8da3de5f8
This should get all the Win32 Makefiles in line with
Kevin Stange <kevin@simguy.net>
parents:
15377
diff
changeset
|
31 $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) libpurple.dll |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
32 |
16039
ded8da3de5f8
This should get all the Win32 Makefiles in line with
Kevin Stange <kevin@simguy.net>
parents:
15377
diff
changeset
|
33 $(PURPLE_PERL_DLL) $(PURPLE_PERL_DLL).a: |
ded8da3de5f8
This should get all the Win32 Makefiles in line with
Kevin Stange <kevin@simguy.net>
parents:
15377
diff
changeset
|
34 $(MAKE) -C $(PURPLE_PERL_TOP) -f $(MINGW_MAKEFILE) perl.dll |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
35 |
16039
ded8da3de5f8
This should get all the Win32 Makefiles in line with
Kevin Stange <kevin@simguy.net>
parents:
15377
diff
changeset
|
36 $(PIDGIN_DLL) $(PIDGIN_DLL).a: |
ded8da3de5f8
This should get all the Win32 Makefiles in line with
Kevin Stange <kevin@simguy.net>
parents:
15377
diff
changeset
|
37 $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.dll |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
38 |
16039
ded8da3de5f8
This should get all the Win32 Makefiles in line with
Kevin Stange <kevin@simguy.net>
parents:
15377
diff
changeset
|
39 $(PIDGIN_EXE): |
ded8da3de5f8
This should get all the Win32 Makefiles in line with
Kevin Stange <kevin@simguy.net>
parents:
15377
diff
changeset
|
40 $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.exe |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
41 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
42 # Installation Directories |
16039
ded8da3de5f8
This should get all the Win32 Makefiles in line with
Kevin Stange <kevin@simguy.net>
parents:
15377
diff
changeset
|
43 $(PIDGIN_INSTALL_DIR): |
ded8da3de5f8
This should get all the Win32 Makefiles in line with
Kevin Stange <kevin@simguy.net>
parents:
15377
diff
changeset
|
44 mkdir -p $(PIDGIN_INSTALL_DIR) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
45 |
27970
ae6f3da265a2
Oops, missed this.
Etan Reisner <pidgin@unreliablesource.net>
parents:
27489
diff
changeset
|
46 $(PIDGIN_INSTALL_PERL_DIR): |
27489
b74fa3d29cda
Modify the Windows build/install setup to deal with the perl modules the way
Etan Reisner <pidgin@unreliablesource.net>
parents:
24522
diff
changeset
|
47 mkdir -p $(PIDGIN_INSTALL_PERL_DIR) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
48 |
16039
ded8da3de5f8
This should get all the Win32 Makefiles in line with
Kevin Stange <kevin@simguy.net>
parents:
15377
diff
changeset
|
49 $(PIDGIN_INSTALL_PLUGINS_DIR): |
ded8da3de5f8
This should get all the Win32 Makefiles in line with
Kevin Stange <kevin@simguy.net>
parents:
15377
diff
changeset
|
50 mkdir -p $(PIDGIN_INSTALL_PLUGINS_DIR) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
51 |
16039
ded8da3de5f8
This should get all the Win32 Makefiles in line with
Kevin Stange <kevin@simguy.net>
parents:
15377
diff
changeset
|
52 $(PURPLE_INSTALL_PO_DIR): |
ded8da3de5f8
This should get all the Win32 Makefiles in line with
Kevin Stange <kevin@simguy.net>
parents:
15377
diff
changeset
|
53 mkdir -p $(PURPLE_INSTALL_PO_DIR) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
54 |
27489
b74fa3d29cda
Modify the Windows build/install setup to deal with the perl modules the way
Etan Reisner <pidgin@unreliablesource.net>
parents:
24522
diff
changeset
|
55 #$(PURPLE_INSTALL_PLUGINS_DIR): |
b74fa3d29cda
Modify the Windows build/install setup to deal with the perl modules the way
Etan Reisner <pidgin@unreliablesource.net>
parents:
24522
diff
changeset
|
56 # mkdir -p $(PURPLE_INSTALL_PLUGINS_DIR) |
b74fa3d29cda
Modify the Windows build/install setup to deal with the perl modules the way
Etan Reisner <pidgin@unreliablesource.net>
parents:
24522
diff
changeset
|
57 |
b74fa3d29cda
Modify the Windows build/install setup to deal with the perl modules the way
Etan Reisner <pidgin@unreliablesource.net>
parents:
24522
diff
changeset
|
58 #$(PURPLE_INSTALL_PERL_DIR): |
b74fa3d29cda
Modify the Windows build/install setup to deal with the perl modules the way
Etan Reisner <pidgin@unreliablesource.net>
parents:
24522
diff
changeset
|
59 # mkdir -p $(PURPLE_INSTALL_PERL_DIR) |