Sat, 29 Aug 2009 02:31:33 +0000
Fix what looks like an incorrect merge that caused gevolution's add buddy dialog
to segfault.
UPDATE:
Fix reversed logic in the gevolution plugin that led to a crash. Fixes #10115.
|
11218
886e6862af56
[gaim-migrate @ 13350]
Charlie Stockman <chuckleberry@users.sourceforge.net>
parents:
diff
changeset
|
1 | #include "glm.h" |
|
886e6862af56
[gaim-migrate @ 13350]
Charlie Stockman <chuckleberry@users.sourceforge.net>
parents:
diff
changeset
|
2 | |
|
886e6862af56
[gaim-migrate @ 13350]
Charlie Stockman <chuckleberry@users.sourceforge.net>
parents:
diff
changeset
|
3 | struct shark_struct{ |
|
886e6862af56
[gaim-migrate @ 13350]
Charlie Stockman <chuckleberry@users.sourceforge.net>
parents:
diff
changeset
|
4 | GLint* faces, *lids, *fins, *eyes, *iris, *pupil; |
|
886e6862af56
[gaim-migrate @ 13350]
Charlie Stockman <chuckleberry@users.sourceforge.net>
parents:
diff
changeset
|
5 | GLMmodel** m_faces, **m_lids, **m_fins, **m_eyes, **m_iris, **m_pupil; |
|
886e6862af56
[gaim-migrate @ 13350]
Charlie Stockman <chuckleberry@users.sourceforge.net>
parents:
diff
changeset
|
6 | int curr_face, curr_fin, curr_left_lid, curr_right_lid, curr_right_eye, curr_left_eye, curr_pupil, eye_count; |
|
886e6862af56
[gaim-migrate @ 13350]
Charlie Stockman <chuckleberry@users.sourceforge.net>
parents:
diff
changeset
|
7 | float curr_fin_angle; |
|
886e6862af56
[gaim-migrate @ 13350]
Charlie Stockman <chuckleberry@users.sourceforge.net>
parents:
diff
changeset
|
8 | }; |
|
886e6862af56
[gaim-migrate @ 13350]
Charlie Stockman <chuckleberry@users.sourceforge.net>
parents:
diff
changeset
|
9 | |
|
886e6862af56
[gaim-migrate @ 13350]
Charlie Stockman <chuckleberry@users.sourceforge.net>
parents:
diff
changeset
|
10 | void init_shark(FACE f); |