Mon, 31 Oct 2005 02:19:51 +0000
[gaim-migrate @ 14205]
SF Patch #1342017 from sadrul
"This patch allows a user to change brush color during
the doodle-session.
This patch is mostly a rough one to get an idea whether
the approach is correct. To make things simple, I have
kept brush_size and brush_color in GaimGtkWhiteboard,
although it's there in doodle_session. It could be in
either place, although I would think it's best to be in
GaimGtkWhiteboard because any/most implementations of
doodle-ing would have these attributes. So keeping them
within the prpl may not be the best option?
Anyway, considering the brush-size and color stay at
the prpl for now, I have introduced two functions in
GaimWhiteboardPrplOps to get/set the size and color of
the brush from the prpl.
rekkanoryo (using Y! 7) and I (using gaim) have tested
this, and it seemed to work OK."
Plus, I cleaned up a whole bunch of code.
My apologies for this all being committed together, but it was a case of "Oh, this will be quick." that lead into hours of making intertwined changes.
committer: Richard Laager <rlaager@pidgin.im>
| 3630 | 1 | # |
| 2 | # Makefile.mingw | |
| 3 | # | |
| 4 | # Description: Makefile for win32 (mingw) version of libyahoo | |
| 5 | # | |
| 6 | ||
| 7 | # | |
| 8 | # PATHS | |
| 9 | # | |
| 10 | ||
| 11 | INCLUDE_DIR := . | |
| 12 | GTK_TOP := ../../../../win32-dev/gtk_2_0 | |
| 13 | GAIM_TOP := ../../.. | |
| 14 | YAHOO_ROOT := . | |
| 15 | GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir | |
| 16 | ||
| 17 | ## | |
| 18 | ## VARIABLE DEFINITIONS | |
| 19 | ## | |
| 20 | ||
| 21 | TARGET = libyahoo | |
| 22 | ||
| 23 | # Compiler Options | |
| 24 | ||
|
3718
6db53e60577c
[gaim-migrate @ 3851]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
25 | CFLAGS = |
| 3630 | 26 | |
|
3718
6db53e60577c
[gaim-migrate @ 3851]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
27 | DEFINES = |
| 3630 | 28 | |
| 29 | # Static or Plugin... | |
| 30 | ifeq ($(TYPE),STATIC) | |
| 31 | DEFINES += -DSTATIC | |
| 32 | DLL_INSTALL_DIR = $(GAIM_INSTALL_DIR) | |
| 33 | else | |
| 34 | ifeq ($(TYPE),PLUGIN) | |
| 35 | DLL_INSTALL_DIR = $(GAIM_INSTALL_DIR)/plugins | |
| 36 | endif | |
| 37 | endif | |
| 38 | ||
| 39 | ||
| 40 | ## | |
| 41 | ## INCLUDE MAKEFILES | |
| 42 | ## | |
| 43 | ||
|
3718
6db53e60577c
[gaim-migrate @ 3851]
Herman Bloggs <herman@bluedigits.com>
parents:
3630
diff
changeset
|
44 | include $(GAIM_TOP)/src/win32/global.mak |
| 3630 | 45 | |
| 46 | ## | |
| 47 | ## INCLUDE PATHS | |
| 48 | ## | |
| 49 | ||
| 50 | INCLUDE_PATHS += -I$(YAHOO_ROOT) \ | |
| 51 | -I$(GTK_TOP)/include \ | |
| 52 | -I$(GTK_TOP)/include/gtk-2.0 \ | |
| 53 | -I$(GTK_TOP)/include/glib-2.0 \ | |
| 54 | -I$(GTK_TOP)/include/pango-1.0 \ | |
| 55 | -I$(GTK_TOP)/include/atk-1.0 \ | |
| 56 | -I$(GTK_TOP)/lib/glib-2.0/include \ | |
| 57 | -I$(GTK_TOP)/lib/gtk-2.0/include \ | |
| 58 | -I$(GAIM_TOP)/src \ | |
| 59 | -I$(GAIM_TOP)/src/win32 \ | |
| 60 | -I$(GAIM_TOP) | |
| 61 | ||
| 62 | ||
| 63 | LIB_PATHS = -L$(GTK_TOP)/lib \ | |
| 64 | -L$(GAIM_TOP)/src | |
| 65 | ||
| 66 | ||
| 67 | ## | |
| 68 | ## SOURCES, OBJECTS | |
| 69 | ## | |
| 70 | ||
|
5932
989a2714d78e
[gaim-migrate @ 6372]
Herman Bloggs <herman@bluedigits.com>
parents:
3718
diff
changeset
|
71 | C_SRC = yahoo.c \ |
| 8349 | 72 | yahoo_auth.c \ |
|
6745
68569c0a6865
[gaim-migrate @ 7277]
Herman Bloggs <herman@bluedigits.com>
parents:
6574
diff
changeset
|
73 | yahoochat.c \ |
|
11476
85ff85429161
[gaim-migrate @ 13718]
Gary Kramlich <grim@reaperworld.com>
parents:
10393
diff
changeset
|
74 | yahoo_doodle.c \ |
| 7659 | 75 | yahoo_filexfer.c \ |
| 10393 | 76 | yahoo_packet.c \ |
| 9162 | 77 | yahoo_profile.c \ |
| 9306 | 78 | yahoo_picture.c \ |
| 9278 | 79 | yahoo_friend.c \ |
| 9376 | 80 | ycht.c \ |
|
6574
07321d9c231d
[gaim-migrate @ 7096]
Herman Bloggs <herman@bluedigits.com>
parents:
5932
diff
changeset
|
81 | crypt.c \ |
|
07321d9c231d
[gaim-migrate @ 7096]
Herman Bloggs <herman@bluedigits.com>
parents:
5932
diff
changeset
|
82 | util.c |
| 3630 | 83 | |
| 84 | ||
| 85 | OBJECTS = $(C_SRC:%.c=%.o) | |
| 86 | ||
| 87 | ||
| 88 | ## | |
| 89 | ## LIBRARIES | |
| 90 | ## | |
| 91 | ||
|
5932
989a2714d78e
[gaim-migrate @ 6372]
Herman Bloggs <herman@bluedigits.com>
parents:
3718
diff
changeset
|
92 | LIBS = -lgtk-win32-2.0 \ |
|
989a2714d78e
[gaim-migrate @ 6372]
Herman Bloggs <herman@bluedigits.com>
parents:
3718
diff
changeset
|
93 | -lglib-2.0 \ |
|
989a2714d78e
[gaim-migrate @ 6372]
Herman Bloggs <herman@bluedigits.com>
parents:
3718
diff
changeset
|
94 | -lgdk-win32-2.0 \ |
|
989a2714d78e
[gaim-migrate @ 6372]
Herman Bloggs <herman@bluedigits.com>
parents:
3718
diff
changeset
|
95 | -lgmodule-2.0 \ |
|
989a2714d78e
[gaim-migrate @ 6372]
Herman Bloggs <herman@bluedigits.com>
parents:
3718
diff
changeset
|
96 | -lgobject-2.0 \ |
|
989a2714d78e
[gaim-migrate @ 6372]
Herman Bloggs <herman@bluedigits.com>
parents:
3718
diff
changeset
|
97 | -lws2_32 \ |
|
989a2714d78e
[gaim-migrate @ 6372]
Herman Bloggs <herman@bluedigits.com>
parents:
3718
diff
changeset
|
98 | -lintl \ |
|
989a2714d78e
[gaim-migrate @ 6372]
Herman Bloggs <herman@bluedigits.com>
parents:
3718
diff
changeset
|
99 | -lgaim |
| 3630 | 100 | |
| 101 | ||
| 102 | ## | |
| 103 | ## RULES | |
| 104 | ## | |
| 105 | ||
| 106 | # How to make a C file | |
| 107 | ||
| 108 | %.o: %.c | |
| 109 | $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $< | |
| 110 | ||
| 111 | ## | |
| 112 | ## TARGET DEFINITIONS | |
| 113 | ## | |
| 114 | ||
| 115 | .PHONY: all clean | |
| 116 | ||
| 117 | all: $(TARGET).dll | |
| 118 | ||
| 119 | install: | |
| 120 | cp $(YAHOO_ROOT)/$(TARGET).dll $(DLL_INSTALL_DIR) | |
| 121 | ||
| 122 | ||
| 123 | ## | |
| 124 | ## BUILD Dependencies | |
| 125 | ## | |
| 126 | ||
| 127 | $(GAIM_TOP)/src/gaim.lib: | |
| 128 | $(MAKE) -C $(GAIM_TOP)/src -f Makefile.mingw gaim.lib | |
| 129 | ||
| 130 | ## | |
| 131 | ## BUILD DLL | |
| 132 | ## | |
| 133 | ||
|
5932
989a2714d78e
[gaim-migrate @ 6372]
Herman Bloggs <herman@bluedigits.com>
parents:
3718
diff
changeset
|
134 | $(TARGET).dll: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib |
|
989a2714d78e
[gaim-migrate @ 6372]
Herman Bloggs <herman@bluedigits.com>
parents:
3718
diff
changeset
|
135 | $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).lib -o $(TARGET).dll |
| 3630 | 136 | |
| 137 | ||
| 138 | ## | |
| 139 | ## CLEAN RULES | |
| 140 | ## | |
| 141 | ||
| 142 | clean: | |
| 143 | rm -rf *.o | |
| 144 | rm -rf $(TARGET).dll | |
| 145 | rm -rf $(TARGET).lib |