You can subscribe to this list here.
2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(106) |
Oct
(334) |
Nov
(246) |
Dec
(145) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2002 |
Jan
(42) |
Feb
(53) |
Mar
(232) |
Apr
(109) |
May
(137) |
Jun
(63) |
Jul
(26) |
Aug
(263) |
Sep
(193) |
Oct
(507) |
Nov
(440) |
Dec
(241) |
2003 |
Jan
(567) |
Feb
(195) |
Mar
(504) |
Apr
(481) |
May
(524) |
Jun
(522) |
Jul
(594) |
Aug
(502) |
Sep
(643) |
Oct
(508) |
Nov
(430) |
Dec
(377) |
2004 |
Jan
(361) |
Feb
(251) |
Mar
(219) |
Apr
(499) |
May
(461) |
Jun
(419) |
Jul
(314) |
Aug
(519) |
Sep
(416) |
Oct
(247) |
Nov
(305) |
Dec
(382) |
2005 |
Jan
(267) |
Feb
(282) |
Mar
(327) |
Apr
(338) |
May
(189) |
Jun
(400) |
Jul
(462) |
Aug
(530) |
Sep
(316) |
Oct
(523) |
Nov
(481) |
Dec
(650) |
2006 |
Jan
(536) |
Feb
(361) |
Mar
(287) |
Apr
(146) |
May
(101) |
Jun
(169) |
Jul
(221) |
Aug
(498) |
Sep
(300) |
Oct
(236) |
Nov
(209) |
Dec
(205) |
2007 |
Jan
(30) |
Feb
(23) |
Mar
(26) |
Apr
(15) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <dat...@us...> - 2006-09-19 22:53:53
|
Revision: 17322 http://svn.sourceforge.net/gaim/?rev=17322&view=rev Author: datallah Date: 2006-09-19 15:53:47 -0700 (Tue, 19 Sep 2006) Log Message: ----------- Fix stdout redirection to work for the wingaim executable even when running in the non-debug GUI subsystem. This has annoyed me for quite some time. Modified Paths: -------------- trunk/gtk/win32/win_gaim.c Modified: trunk/gtk/win32/win_gaim.c =================================================================== --- trunk/gtk/win32/win_gaim.c 2006-09-19 18:40:30 UTC (rev 17321) +++ trunk/gtk/win32/win_gaim.c 2006-09-19 22:53:47 UTC (rev 17322) @@ -224,7 +224,7 @@ printf("Trying to set SafeDllSearchMode to 0\n"); regval = 0; if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - "System\\CurrentControlSet\\Control\\Session Manager", + "System\\CurrentControlSet\\Control\\Session Manager", 0, KEY_SET_VALUE, &hkey ) == ERROR_SUCCESS) { if (RegSetValueEx(hkey, @@ -511,15 +511,21 @@ /* If debug or help or version flag used, create console for output */ if (strstr(lpszCmdLine, "-d") || strstr(lpszCmdLine, "-h") || strstr(lpszCmdLine, "-v")) { - LPFNATTACHCONSOLE MyAttachConsole = NULL; - if ((hmod = GetModuleHandle("kernel32.dll"))) { - MyAttachConsole = - (LPFNATTACHCONSOLE) - GetProcAddress(hmod, "AttachConsole"); + /* If stdout hasn't been redirected to a file, alloc a console + * (_istty() doesn't work for stuff using the GUI subsystem) */ + if (_fileno(stdout) == -1) { + LPFNATTACHCONSOLE MyAttachConsole = NULL; + if ((hmod = GetModuleHandle("kernel32.dll"))) { + MyAttachConsole = + (LPFNATTACHCONSOLE) + GetProcAddress(hmod, "AttachConsole"); + } + if ((MyAttachConsole && MyAttachConsole(ATTACH_PARENT_PROCESS)) + || AllocConsole()) { + freopen("CONOUT$", "w", stdout); + freopen("CONOUT$", "w", stderr); + } } - if ((MyAttachConsole && MyAttachConsole(ATTACH_PARENT_PROCESS)) - || AllocConsole()) - freopen("CONOUT$", "w", stdout); } /* Load exception handler if we have it */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-09-19 18:47:12
|
Revision: 17321 http://svn.sourceforge.net/gaim/?rev=17321&view=rev Author: datallah Date: 2006-09-19 11:40:30 -0700 (Tue, 19 Sep 2006) Log Message: ----------- Fix svn:mime-type and svn:eol-style properties for binary files Modified Paths: -------------- web/htdocs/EC_2000_sm.jpg web/htdocs/Tuxie_2001.jpg web/htdocs/favicon.ico web/htdocs/forkgettext.jpg web/htdocs/memorialday-011.jpg web/htdocs/roadmap.png web/htdocs/rollcage.jpg web/htdocs/wtc_flag.jpg Property Changed: ---------------- web/htdocs/EC_2000_sm.jpg web/htdocs/Tuxie_2001.jpg web/htdocs/aoltw.pdf web/htdocs/favicon.ico web/htdocs/forkgettext.jpg web/htdocs/images/a.png web/htdocs/images/blackpixel.png web/htdocs/images/cool.png web/htdocs/images/date_bottom.png web/htdocs/images/feed-icon.png web/htdocs/images/gaimlindows.png web/htdocs/images/halloween/favicon.png web/htdocs/images/halloween/links_bg.jpg web/htdocs/images/halloween/links_bg.png web/htdocs/images/halloween/links_tl.png web/htdocs/images/halloween/navbar/bugs_b.png web/htdocs/images/halloween/navbar/bugs_bh.png web/htdocs/images/halloween/navbar/bugs_t.png web/htdocs/images/halloween/navbar/contactinfo_b.png web/htdocs/images/halloween/navbar/contactinfo_bh.png web/htdocs/images/halloween/navbar/contactinfo_t.png web/htdocs/images/halloween/navbar/documentation_b.png web/htdocs/images/halloween/navbar/documentation_bh.png web/htdocs/images/halloween/navbar/documentation_t.png web/htdocs/images/halloween/navbar/downloads_b.png web/htdocs/images/halloween/navbar/downloads_bh.png web/htdocs/images/halloween/navbar/downloads_t.png web/htdocs/images/halloween/navbar/faq_b.png web/htdocs/images/halloween/navbar/faq_bh.png web/htdocs/images/halloween/navbar/faq_t.png web/htdocs/images/halloween/navbar/news_b.png web/htdocs/images/halloween/navbar/news_bh.png web/htdocs/images/halloween/navbar/news_t.png web/htdocs/images/halloween/navbar/plugins_b.png web/htdocs/images/halloween/navbar/plugins_bh.png web/htdocs/images/halloween/navbar/plugins_t.png web/htdocs/images/halloween/navbar/project_b.png web/htdocs/images/halloween/navbar/project_bh.png web/htdocs/images/halloween/navbar/project_t.png web/htdocs/images/halloween/navbar/screenshots_b.png web/htdocs/images/halloween/navbar/screenshots_bh.png web/htdocs/images/halloween/navbar/screenshots_t.png web/htdocs/images/halloween/navbar/themes_b.png web/htdocs/images/halloween/navbar/themes_bh.png web/htdocs/images/halloween/navbar/themes_t.png web/htdocs/images/halloween/navbar/whatisgaim_b.png web/htdocs/images/halloween/navbar/whatisgaim_bh.png web/htdocs/images/halloween/navbar/whatisgaim_t.png web/htdocs/images/halloween/navbar/wingaim_b.png web/htdocs/images/halloween/navbar/wingaim_bh.png web/htdocs/images/halloween/navbar/wingaim_t.png web/htdocs/images/halloween/one-pumpkin.jpg web/htdocs/images/halloween/penguin2.png web/htdocs/images/halloween/penguin2.xcf web/htdocs/images/links_bg.png web/htdocs/images/links_tl.png web/htdocs/images/logo.xcf web/htdocs/images/navbar/bugs_b.png web/htdocs/images/navbar/bugs_bh.png web/htdocs/images/navbar/bugs_t.png web/htdocs/images/navbar/contactinfo_b.png web/htdocs/images/navbar/contactinfo_bh.png web/htdocs/images/navbar/contactinfo_t.png web/htdocs/images/navbar/documentation_b.png web/htdocs/images/navbar/documentation_bh.png web/htdocs/images/navbar/documentation_t.png web/htdocs/images/navbar/downloads_b.png web/htdocs/images/navbar/downloads_bh.png web/htdocs/images/navbar/downloads_t.png web/htdocs/images/navbar/faq_b.png web/htdocs/images/navbar/faq_bh.png web/htdocs/images/navbar/faq_t.png web/htdocs/images/navbar/news_b.png web/htdocs/images/navbar/news_bh.png web/htdocs/images/navbar/news_t.png web/htdocs/images/navbar/plugins_b.png web/htdocs/images/navbar/plugins_bh.png web/htdocs/images/navbar/plugins_t.png web/htdocs/images/navbar/project_b.png web/htdocs/images/navbar/project_bh.png web/htdocs/images/navbar/project_t.png web/htdocs/images/navbar/screenshots_b.png web/htdocs/images/navbar/screenshots_bh.png web/htdocs/images/navbar/screenshots_t.png web/htdocs/images/navbar/themes_b.png web/htdocs/images/navbar/themes_bh.png web/htdocs/images/navbar/themes_t.png web/htdocs/images/navbar/whatisgaim_b.png web/htdocs/images/navbar/whatisgaim_bh.png web/htdocs/images/navbar/whatisgaim_t.png web/htdocs/images/navbar/wingaim_b.png web/htdocs/images/navbar/wingaim_bh.png web/htdocs/images/navbar/wingaim_t.png web/htdocs/images/news_bottom.png web/htdocs/images/news_left.png web/htdocs/images/news_mb.png web/htdocs/images/news_tl.png web/htdocs/images/news_top.png web/htdocs/images/penguin2.png web/htdocs/images/powered_by_libgaim.xcf web/htdocs/images/q.png web/htdocs/images/screenshots/account.png web/htdocs/images/screenshots/account_t.png web/htdocs/images/screenshots/aimicq-t.png web/htdocs/images/screenshots/aimicq.png web/htdocs/images/screenshots/buddylist.png web/htdocs/images/screenshots/buddylist_t.png web/htdocs/images/screenshots/convos.png web/htdocs/images/screenshots/convos_t.png web/htdocs/images/screenshots/docklet.png web/htdocs/images/screenshots/docklet_t.png web/htdocs/images/screenshots/ft.png web/htdocs/images/screenshots/ft_t.png web/htdocs/images/screenshots/gaim-cvs-i18n.png web/htdocs/images/screenshots/getinfo.png web/htdocs/images/screenshots/getinfo_t.png web/htdocs/images/screenshots/i18n.png web/htdocs/images/screenshots/i18n_t.png web/htdocs/images/screenshots/jabber.png web/htdocs/images/screenshots/jabber_t.png web/htdocs/images/screenshots/modify.png web/htdocs/images/screenshots/modify_t.png web/htdocs/images/screenshots/msn_buddylist.png web/htdocs/images/screenshots/msn_buddylist_t.png web/htdocs/images/screenshots/msn_convo.png web/htdocs/images/screenshots/msn_convo_t.png web/htdocs/images/screenshots/newlist-t.png web/htdocs/images/screenshots/newlist.png web/htdocs/images/screenshots/plugins.png web/htdocs/images/screenshots/plugins_t.png web/htdocs/images/screenshots/tabbed.png web/htdocs/images/screenshots/tabbed_t.png web/htdocs/images/screenshots/themes.png web/htdocs/images/screenshots/themes_t.png web/htdocs/images/statusicons/aim/activebuddy.png web/htdocs/images/statusicons/aim/admin.png web/htdocs/images/statusicons/aim/aol.png web/htdocs/images/statusicons/aim/away.png web/htdocs/images/statusicons/aim/confirmed.png web/htdocs/images/statusicons/aim/offline.png web/htdocs/images/statusicons/aim/unconfirmed.png web/htdocs/images/statusicons/aim/wireless.png web/htdocs/images/statusicons/gg/away.png web/htdocs/images/statusicons/gg/busy.png web/htdocs/images/statusicons/gg/invisible.png web/htdocs/images/statusicons/gg/online.png web/htdocs/images/statusicons/icq/away.png web/htdocs/images/statusicons/icq/dnd.png web/htdocs/images/statusicons/icq/ffc.png web/htdocs/images/statusicons/icq/na.png web/htdocs/images/statusicons/icq/occ.png web/htdocs/images/statusicons/icq/offline.png web/htdocs/images/statusicons/icq/online.png web/htdocs/images/statusicons/irc/offline.png web/htdocs/images/statusicons/irc/online.png web/htdocs/images/statusicons/jabber/available.png web/htdocs/images/statusicons/jabber/away.png web/htdocs/images/statusicons/jabber/chat.png web/htdocs/images/statusicons/jabber/dnd.png web/htdocs/images/statusicons/jabber/error.png web/htdocs/images/statusicons/jabber/offline.png web/htdocs/images/statusicons/jabber/xa.png web/htdocs/images/statusicons/msn/away.png web/htdocs/images/statusicons/msn/occupied.png web/htdocs/images/statusicons/msn/offline.png web/htdocs/images/statusicons/msn/online.png web/htdocs/images/statusicons/napster/online.png web/htdocs/images/statusicons/yahoo/away.png web/htdocs/images/statusicons/yahoo/game.png web/htdocs/images/statusicons/yahoo/idle.png web/htdocs/images/statusicons/yahoo/offline.png web/htdocs/images/statusicons/yahoo/online.png web/htdocs/images/thanksgiving/links_bg.png web/htdocs/images/thanksgiving/links_tl.png web/htdocs/images/thanksgiving/navbar/bugs_b.png web/htdocs/images/thanksgiving/navbar/bugs_bh.png web/htdocs/images/thanksgiving/navbar/bugs_t.png web/htdocs/images/thanksgiving/navbar/contactinfo_b.png web/htdocs/images/thanksgiving/navbar/contactinfo_bh.png web/htdocs/images/thanksgiving/navbar/contactinfo_t.png web/htdocs/images/thanksgiving/navbar/documentation_b.png web/htdocs/images/thanksgiving/navbar/documentation_bh.png web/htdocs/images/thanksgiving/navbar/documentation_t.png web/htdocs/images/thanksgiving/navbar/downloads_b.png web/htdocs/images/thanksgiving/navbar/downloads_bh.png web/htdocs/images/thanksgiving/navbar/downloads_t.png web/htdocs/images/thanksgiving/navbar/faq_b.png web/htdocs/images/thanksgiving/navbar/faq_bh.png web/htdocs/images/thanksgiving/navbar/faq_t.png web/htdocs/images/thanksgiving/navbar/news_b.png web/htdocs/images/thanksgiving/navbar/news_bh.png web/htdocs/images/thanksgiving/navbar/news_t.png web/htdocs/images/thanksgiving/navbar/plugins_b.png web/htdocs/images/thanksgiving/navbar/plugins_bh.png web/htdocs/images/thanksgiving/navbar/plugins_t.png web/htdocs/images/thanksgiving/navbar/project_b.png web/htdocs/images/thanksgiving/navbar/project_bh.png web/htdocs/images/thanksgiving/navbar/project_t.png web/htdocs/images/thanksgiving/navbar/screenshots_b.png web/htdocs/images/thanksgiving/navbar/screenshots_bh.png web/htdocs/images/thanksgiving/navbar/screenshots_t.png web/htdocs/images/thanksgiving/navbar/themes_b.png web/htdocs/images/thanksgiving/navbar/themes_bh.png web/htdocs/images/thanksgiving/navbar/themes_t.png web/htdocs/images/thanksgiving/navbar/whatisgaim_b.png web/htdocs/images/thanksgiving/navbar/whatisgaim_bh.png web/htdocs/images/thanksgiving/navbar/whatisgaim_t.png web/htdocs/images/thanksgiving/navbar/wingaim_b.png web/htdocs/images/thanksgiving/navbar/wingaim_bh.png web/htdocs/images/thanksgiving/navbar/wingaim_t.png web/htdocs/images/thanksgiving/penguin2.png web/htdocs/images/transpixel.gif web/htdocs/memorialday-011.jpg web/htdocs/roadmap.png web/htdocs/rollcage.jpg web/htdocs/wtc_flag.jpg Modified: web/htdocs/EC_2000_sm.jpg =================================================================== (Binary files differ) Property changes on: web/htdocs/EC_2000_sm.jpg ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision Name: svn:eol-style - native Name: svn:mime-type + application/octet-stream Modified: web/htdocs/Tuxie_2001.jpg =================================================================== (Binary files differ) Property changes on: web/htdocs/Tuxie_2001.jpg ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision Name: svn:eol-style - native Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/aoltw.pdf ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision Name: svn:eol-style - native Name: svn:mime-type + application/octet-stream Modified: web/htdocs/favicon.ico =================================================================== (Binary files differ) Property changes on: web/htdocs/favicon.ico ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision Name: svn:eol-style - native Name: svn:mime-type + application/octet-stream Modified: web/htdocs/forkgettext.jpg =================================================================== (Binary files differ) Property changes on: web/htdocs/forkgettext.jpg ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision Name: svn:eol-style - native Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/a.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/blackpixel.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/cool.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/date_bottom.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/feed-icon.png ___________________________________________________________________ Name: svn:mime-type - image/png + application/octet-stream Property changes on: web/htdocs/images/gaimlindows.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/favicon.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/links_bg.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/links_bg.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/links_tl.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/bugs_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/bugs_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/bugs_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/contactinfo_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/contactinfo_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/contactinfo_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/documentation_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/documentation_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/documentation_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/downloads_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/downloads_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/downloads_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/faq_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/faq_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/faq_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/news_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/news_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/news_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/plugins_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/plugins_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/plugins_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/project_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/project_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/project_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/screenshots_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/screenshots_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/screenshots_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/themes_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/themes_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/themes_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/whatisgaim_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/whatisgaim_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/whatisgaim_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/wingaim_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/wingaim_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/navbar/wingaim_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/one-pumpkin.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/penguin2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/halloween/penguin2.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/links_bg.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/links_tl.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/logo.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/bugs_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/bugs_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/bugs_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/contactinfo_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/contactinfo_bh.png ___________________________________________________________________ Name: svn:mime-type - image/png + application/octet-stream Property changes on: web/htdocs/images/navbar/contactinfo_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/documentation_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/documentation_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/documentation_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/downloads_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/downloads_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/downloads_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/faq_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/faq_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/faq_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/news_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/news_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/news_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/plugins_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/plugins_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/plugins_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/project_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/project_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/project_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/screenshots_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/screenshots_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/screenshots_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/themes_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/themes_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/themes_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/whatisgaim_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/whatisgaim_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/whatisgaim_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/wingaim_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/wingaim_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/navbar/wingaim_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/news_bottom.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/news_left.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/news_mb.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/news_tl.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/news_top.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/penguin2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/powered_by_libgaim.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/q.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/account.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/account_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/aimicq-t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/aimicq.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/buddylist.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/buddylist_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/convos.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/convos_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/docklet.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/docklet_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/ft.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/ft_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/gaim-cvs-i18n.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/getinfo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/getinfo_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/i18n.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/i18n_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/jabber.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/jabber_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/modify.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/modify_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/msn_buddylist.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/msn_buddylist_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/msn_convo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/msn_convo_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/newlist-t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/newlist.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/plugins.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/plugins_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/tabbed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/tabbed_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/themes.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/screenshots/themes_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/aim/activebuddy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/aim/admin.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/aim/aol.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/aim/away.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/aim/confirmed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/aim/offline.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/aim/unconfirmed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/aim/wireless.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/gg/away.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/gg/busy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/gg/invisible.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/gg/online.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/icq/away.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/icq/dnd.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/icq/ffc.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/icq/na.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/icq/occ.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/icq/offline.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/icq/online.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/irc/offline.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/irc/online.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/jabber/available.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/jabber/away.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/jabber/chat.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/jabber/dnd.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/jabber/error.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/jabber/offline.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/jabber/xa.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/msn/away.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/msn/occupied.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/msn/offline.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/msn/online.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/napster/online.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/yahoo/away.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/yahoo/game.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/yahoo/idle.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/yahoo/offline.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/statusicons/yahoo/online.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/links_bg.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/links_tl.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/bugs_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/bugs_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/bugs_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/contactinfo_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/contactinfo_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/contactinfo_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/documentation_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/documentation_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/documentation_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/downloads_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/downloads_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/downloads_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/faq_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/faq_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/faq_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/news_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/news_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/news_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/plugins_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/plugins_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/plugins_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/project_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/project_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/project_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/screenshots_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/screenshots_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/screenshots_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/themes_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/themes_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/themes_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/whatisgaim_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/whatisgaim_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/whatisgaim_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/wingaim_b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/wingaim_bh.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/navbar/wingaim_t.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/thanksgiving/penguin2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Property changes on: web/htdocs/images/transpixel.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: web/htdocs/memorialday-011.jpg =================================================================== (Binary files differ) Property changes on: web/htdocs/memorialday-011.jpg ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision Name: svn:eol-style - native Name: svn:mime-type + application/octet-stream Modified: web/htdocs/roadmap.png =================================================================== (Binary files differ) Property changes on: web/htdocs/roadmap.png ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision Name: svn:eol-style - native Name: svn:mime-type + application/octet-stream Modified: web/htdocs/rollcage.jpg =================================================================== (Binary files differ) Property changes on: web/htdocs/rollcage.jpg ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision Name: svn:eol-style - native Name: svn:mime-type + application/octet-stream Modified: web/htdocs/wtc_flag.jpg =================================================================== (Binary files differ) Property changes on: web/htdocs/wtc_flag.jpg ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision Name: svn:eol-style - native Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-09-19 07:16:16
|
Revision: 17320 http://svn.sourceforge.net/gaim/?rev=17320&view=rev Author: thekingant Date: 2006-09-19 00:16:07 -0700 (Tue, 19 Sep 2006) Log Message: ----------- Make this a little less confusing Modified Paths: -------------- web/htdocs/faq.txt web/htdocs/faq2.txt Modified: web/htdocs/faq.txt =================================================================== --- web/htdocs/faq.txt 2006-09-19 01:01:20 UTC (rev 17319) +++ web/htdocs/faq.txt 2006-09-19 07:16:07 UTC (rev 17320) @@ -648,7 +648,7 @@ Q: Can I send SMS messages? A: Yep, just send an IM to the person's phone number. For example, -if the phone number is (919) 555-1234, you would IM the screen name +if the phone number is (919) 555-1234, you would message +19195551234 We think this should work for countries with a country code of 1 (the United States and Canada). <p> Modified: web/htdocs/faq2.txt =================================================================== --- web/htdocs/faq2.txt 2006-09-19 01:01:20 UTC (rev 17319) +++ web/htdocs/faq2.txt 2006-09-19 07:16:07 UTC (rev 17320) @@ -665,7 +665,7 @@ Q: Can I send SMS messages? A: Yep, just send an IM to the person's phone number. For example, -if the phone number is (919) 555-1234, you would IM the screen name +if the phone number is (919) 555-1234, you would message +19195551234 We think this should work for countries with a country code of 1 (the United States and Canada). <p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-09-19 01:01:22
|
Revision: 17319 http://svn.sourceforge.net/gaim/?rev=17319&view=rev Author: rlaager Date: 2006-09-18 18:01:20 -0700 (Mon, 18 Sep 2006) Log Message: ----------- Rest of SF Patch #1559532 from Mike Stoddard Fixes SF Bug 1520965 Fixes SF Bug 1544012 "This is patch to fix connection problems in the Novell protocol plugin. It should fix bugs 1520965 and 1544012." "The two bugs are both connection problems. Unfortunately the plugin is designed to be a little too synchronous so non-blocking i/o causes problems for it. The fix is to retry a little longer in nm_read_all and to not disconnect if errno is EAGAIN after processing an incoming response or event. When I get more time I will work on making the plugin more asynchronous so that we don't have to block in nm_read_all. For now however this patch will get people working again. Any suggestions/comments are welcome." I consulted with Daniel on this one, and I'm committing it as a temporary fix, since Mike says he's going to fix it for real later. Modified Paths: -------------- trunk/libgaim/protocols/novell/nmconn.c trunk/libgaim/protocols/novell/nmuser.c Modified: trunk/libgaim/protocols/novell/nmconn.c =================================================================== --- trunk/libgaim/protocols/novell/nmconn.c 2006-09-19 00:55:20 UTC (rev 17318) +++ trunk/libgaim/protocols/novell/nmconn.c 2006-09-19 01:01:20 UTC (rev 17319) @@ -232,7 +232,7 @@ int bytes_left = len; int bytes_read; int total_bytes = 0; - int retry = 10; + int retry = 1000; if (conn == NULL || buff == NULL) return NMERR_BAD_PARM; @@ -250,7 +250,7 @@ break; } #ifdef _WIN32 - Sleep(1000); + Sleep(1); #else usleep(1000); #endif Modified: trunk/libgaim/protocols/novell/nmuser.c =================================================================== --- trunk/libgaim/protocols/novell/nmuser.c 2006-09-19 00:55:20 UTC (rev 17318) +++ trunk/libgaim/protocols/novell/nmuser.c 2006-09-19 01:01:20 UTC (rev 17319) @@ -997,7 +997,6 @@ { NMConn *conn; NMERR_T rc = NM_OK; - int ret; guint32 val; if (user == NULL) @@ -1006,16 +1005,18 @@ conn = user->conn; /* Check to see if this is an event or a response */ - ret = nm_tcp_read(conn, (char *) &val, sizeof(val)); - if (ret == sizeof(val)) { - + rc = nm_read_all(conn, (char *) &val, sizeof(val)); + if (rc == NM_OK) { if (strncmp((char *) &val, "HTTP", strlen("HTTP")) == 0) rc = nm_process_response(user); else rc = nm_process_event(user, GUINT32_FROM_LE(val)); } else { - rc = NMERR_PROTOCOL; + if (errno == EAGAIN) + rc = NM_OK; + else + rc = NMERR_PROTOCOL; } return rc; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-09-19 00:55:30
|
Revision: 17318 http://svn.sourceforge.net/gaim/?rev=17318&view=rev Author: rlaager Date: 2006-09-18 17:55:20 -0700 (Mon, 18 Sep 2006) Log Message: ----------- Part of SF Patch #1559532 from Mike Stoddard "I have also included a fix for another issue -- if the the user is disconnected because he/she logged in somewhere else we don't want to reconnect." Modified Paths: -------------- trunk/libgaim/protocols/novell/novell.c Modified: trunk/libgaim/protocols/novell/novell.c =================================================================== --- trunk/libgaim/protocols/novell/novell.c 2006-09-18 23:59:27 UTC (rev 17317) +++ trunk/libgaim/protocols/novell/novell.c 2006-09-19 00:55:20 UTC (rev 17318) @@ -2014,8 +2014,11 @@ gc = gaim_account_get_connection((GaimAccount *) user->client_data); if (gc) + { + gc->wants_to_die = TRUE; /* we don't want to reconnect in this case */ gaim_connection_error(gc, _("You have been logged out because you" " logged in at another workstation.")); + } } static void This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2006-09-18 23:59:34
|
Revision: 17317 http://svn.sourceforge.net/gaim/?rev=17317&view=rev Author: deryni9 Date: 2006-09-18 16:59:27 -0700 (Mon, 18 Sep 2006) Log Message: ----------- s/gntgaim.1/gaim-text.1/ in svn:ignore Property Changed: ---------------- trunk/doc/ Property changes on: trunk/doc ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile html gaim.1 gaim-remote.1 gntgaim.1 + Makefile.in Makefile html gaim.1 gaim-remote.1 gaim-text.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sea...@us...> - 2006-09-18 21:55:12
|
Revision: 17316 http://svn.sourceforge.net/gaim/?rev=17316&view=rev Author: seanegan Date: 2006-09-18 14:55:06 -0700 (Mon, 18 Sep 2006) Log Message: ----------- Fix the size remembering of the entry imhtml. Also, add functionality such that the buddy icon does not affect the remembered size Modified Paths: -------------- trunk/gtk/gtkcellrendererexpander.c trunk/gtk/gtkconv.c trunk/gtk/gtkconv.h Modified: trunk/gtk/gtkcellrendererexpander.c =================================================================== --- trunk/gtk/gtkcellrendererexpander.c 2006-09-18 20:20:32 UTC (rev 17315) +++ trunk/gtk/gtkcellrendererexpander.c 2006-09-18 21:55:06 UTC (rev 17316) @@ -274,7 +274,6 @@ GtkCellRendererState flags) { GtkTreePath *path = gtk_tree_path_new_from_string(p); -printf("!! Activated!\n"); if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget), path)) gtk_tree_view_collapse_row(GTK_TREE_VIEW(widget), path); else Modified: trunk/gtk/gtkconv.c =================================================================== --- trunk/gtk/gtkconv.c 2006-09-18 20:20:32 UTC (rev 17315) +++ trunk/gtk/gtkconv.c 2006-09-18 21:55:06 UTC (rev 17316) @@ -212,6 +212,10 @@ if (!GAIM_IS_GTK_CONVERSATION(conv)) return FALSE; + if (gtkconv->auto_resize) { + return FALSE; + } + /* I find that I resize the window when it has a bunch of conversations in it, mostly so that the * tab bar will fit, but then I don't want new windows taking up the entire screen. I check to see * if there is only one conversation in the window. This way we'll be setting new windows to the @@ -224,7 +228,7 @@ gaim_prefs_set_int("/gaim/gtk/conversations/im/default_width", allocation->width); gaim_prefs_set_int("/gaim/gtk/conversations/im/default_height", allocation->height); } - if (w == gtkconv->entry) + if (w == gtkconv->lower_hbox) gaim_prefs_set_int("/gaim/gtk/conversations/im/entry_height", allocation->height); } else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) @@ -233,7 +237,7 @@ gaim_prefs_set_int("/gaim/gtk/conversations/chat/default_width", allocation->width); gaim_prefs_set_int("/gaim/gtk/conversations/chat/default_height", allocation->height); } - if (w == gtkconv->entry) + if (w == gtkconv->lower_hbox) gaim_prefs_set_int("/gaim/gtk/conversations/chat/entry_height", allocation->height); if (w == gtkconv->u.chat->list) gaim_prefs_set_int("/gaim/gtk/conversations/chat/userlist_width", allocation->width == 1 ? 0 : allocation->width); @@ -2259,6 +2263,19 @@ } } +/* This gets added as an idle handler when doing something that + * redraws the icon. It sets the auto_resize gboolean to TRUE. + * This way, when the size_allocate callback gets triggered, it notices + * that this is an autoresize, and after the main loop iterates, it + * gets set back to FALSE + */ +static gboolean reset_auto_resize_cb(gpointer data) +{ + GaimGtkConversation *gtkconv = (GaimGtkConversation *)data; + gtkconv->auto_resize = FALSE; + return FALSE; +} + static gboolean redraw_icon(gpointer data) { @@ -2277,6 +2294,9 @@ if(account && account->gc) prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(account->gc->prpl); + gtkconv->auto_resize = TRUE; + g_idle_add(reset_auto_resize_cb, gtkconv); + gdk_pixbuf_animation_iter_advance(gtkconv->u.im->iter, NULL); buf = gdk_pixbuf_animation_iter_get_pixbuf(gtkconv->u.im->iter); @@ -4045,7 +4065,7 @@ gtk_widget_set_name(gtkconv->entry, "gaim_gtkconv_entry"); gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->entry), gaim_account_get_protocol_name(conv->account)); - gtk_widget_set_size_request(gtkconv->entry, -1, + gtk_widget_set_size_request(gtkconv->lower_hbox, -1, gaim_prefs_get_int("/gaim/gtk/conversations/chat/entry_height")); gtkconv->entry_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry)); @@ -4057,7 +4077,7 @@ G_CALLBACK(send_cb), gtkconv); g_signal_connect_after(G_OBJECT(gtkconv->entry), "button_press_event", G_CALLBACK(entry_stop_rclick_cb), NULL); - g_signal_connect(G_OBJECT(gtkconv->entry), "size-allocate", + g_signal_connect(G_OBJECT(gtkconv->lower_hbox), "size-allocate", G_CALLBACK(size_allocate_cb), gtkconv); default_formatize(gtkconv); @@ -4142,7 +4162,7 @@ gtk_widget_set_name(gtkconv->entry, "gaim_gtkconv_entry"); gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->entry), gaim_account_get_protocol_name(conv->account)); - gtk_widget_set_size_request(gtkconv->entry, -1, + gtk_widget_set_size_request(gtkconv->lower_hbox, -1, gaim_prefs_get_int("/gaim/gtk/conversations/im/entry_height")); gtkconv->entry_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry)); @@ -4154,7 +4174,7 @@ G_CALLBACK(send_cb), gtkconv); g_signal_connect_after(G_OBJECT(gtkconv->entry), "button_press_event", G_CALLBACK(entry_stop_rclick_cb), NULL); - g_signal_connect(G_OBJECT(gtkconv->entry), "size-allocate", + g_signal_connect(G_OBJECT(gtkconv->lower_hbox), "size-allocate", G_CALLBACK(size_allocate_cb), gtkconv); g_signal_connect(G_OBJECT(gtkconv->entry_buffer), "insert_text", @@ -5929,6 +5949,11 @@ gtk_widget_show(event); gtkconv->u.im->icon = gtk_image_new_from_pixbuf(scale); + gtkconv->auto_resize = TRUE; + /* Reset the size request to allow the buddy icon to resize */ + gtk_widget_set_size_request(gtkconv->lower_hbox, -1, -1); + g_idle_add(reset_auto_resize_cb, gtkconv); + printf("Auto resize true\n"); gtk_widget_set_size_request(gtkconv->u.im->icon, scale_width, scale_height); gtk_container_add(GTK_CONTAINER(event), gtkconv->u.im->icon); gtk_widget_show(gtkconv->u.im->icon); Modified: trunk/gtk/gtkconv.h =================================================================== --- trunk/gtk/gtkconv.h 2006-09-18 20:20:32 UTC (rev 17315) +++ trunk/gtk/gtkconv.h 2006-09-18 21:55:06 UTC (rev 17316) @@ -127,7 +127,11 @@ GtkWidget *imhtml; GtkTextBuffer *entry_buffer; GtkWidget *entry; - + gboolean auto_resize; /* this is set to TRUE if the conversation + * is being resized by a non-user-initiated + * event, such as the buddy icon appearing + */ + GtkWidget *close; /* "x" on the tab */ GtkWidget *icon; GtkWidget *tab_label; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sea...@us...> - 2006-09-18 20:20:38
|
Revision: 17315 http://svn.sourceforge.net/gaim/?rev=17315&view=rev Author: seanegan Date: 2006-09-18 13:20:32 -0700 (Mon, 18 Sep 2006) Log Message: ----------- I like to drag the expander in the chat all the way over so the userlist isn't visible. This saves that preference. Modified Paths: -------------- trunk/gtk/gtkcellrendererexpander.c trunk/gtk/gtkconv.c Modified: trunk/gtk/gtkcellrendererexpander.c =================================================================== --- trunk/gtk/gtkcellrendererexpander.c 2006-09-18 18:23:17 UTC (rev 17314) +++ trunk/gtk/gtkcellrendererexpander.c 2006-09-18 20:20:32 UTC (rev 17315) @@ -108,7 +108,7 @@ static void gaim_gtk_cell_renderer_expander_init (GaimGtkCellRendererExpander *cellexpander) { GTK_CELL_RENDERER(cellexpander)->mode = GTK_CELL_RENDERER_MODE_ACTIVATABLE; - GTK_CELL_RENDERER(cellexpander)->xpad = 2; + GTK_CELL_RENDERER(cellexpander)->xpad = 0; GTK_CELL_RENDERER(cellexpander)->ypad = 2; } Modified: trunk/gtk/gtkconv.c =================================================================== --- trunk/gtk/gtkconv.c 2006-09-18 18:23:17 UTC (rev 17314) +++ trunk/gtk/gtkconv.c 2006-09-18 20:20:32 UTC (rev 17315) @@ -235,6 +235,8 @@ } if (w == gtkconv->entry) gaim_prefs_set_int("/gaim/gtk/conversations/chat/entry_height", allocation->height); + if (w == gtkconv->u.chat->list) + gaim_prefs_set_int("/gaim/gtk/conversations/chat/userlist_width", allocation->width == 1 ? 0 : allocation->width); } return FALSE; @@ -3976,12 +3978,16 @@ "pixbuf", CHAT_USERS_ICON_COLUMN, NULL); gtk_tree_view_column_set_sizing(col, GTK_TREE_VIEW_COLUMN_AUTOSIZE); gtk_tree_view_append_column(GTK_TREE_VIEW(list), col); + gtk_widget_set_size_request(lbox, + gaim_prefs_get_int("/gaim/gtk/conversations/chat/userlist_width"), -1); g_signal_connect(G_OBJECT(list), "button_press_event", G_CALLBACK(right_click_chat_cb), gtkconv); g_signal_connect(G_OBJECT(list), "popup-menu", G_CALLBACK(gtkconv_chat_popup_menu_cb), gtkconv); - + g_signal_connect(G_OBJECT(list), "size-allocate", G_CALLBACK(size_allocate_cb), gtkconv); + + rend = gtk_cell_renderer_text_new(); g_object_set(rend, @@ -4008,8 +4014,6 @@ gtk_tree_view_append_column(GTK_TREE_VIEW(list), col); - gtk_widget_set_size_request(list, 150, -1); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(list), FALSE); gtk_widget_show(list); @@ -6482,7 +6486,7 @@ gaim_prefs_add_int("/gaim/gtk/conversations/chat/default_width", 410); gaim_prefs_add_int("/gaim/gtk/conversations/chat/default_height", 160); gaim_prefs_add_int("/gaim/gtk/conversations/chat/entry_height", 50); - + gaim_prefs_add_int("/gaim/gtk/conversations/chat/userlist_width", 80); /* Conversations -> IM */ gaim_prefs_add_none("/gaim/gtk/conversations/im"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2006-09-18 18:23:23
|
Revision: 17314 http://svn.sourceforge.net/gaim/?rev=17314&view=rev Author: deryni9 Date: 2006-09-18 11:23:17 -0700 (Mon, 18 Sep 2006) Log Message: ----------- This should make these functions work in a more perl-like fashion. Modified Paths: -------------- trunk/gtk/plugins/perl/common/GtkConv.xs trunk/gtk/plugins/perl/common/GtkConvWin.xs trunk/gtk/plugins/perl/common/GtkFt.xs Modified: trunk/gtk/plugins/perl/common/GtkConv.xs =================================================================== --- trunk/gtk/plugins/perl/common/GtkConv.xs 2006-09-18 18:18:30 UTC (rev 17313) +++ trunk/gtk/plugins/perl/common/GtkConv.xs 2006-09-18 18:23:17 UTC (rev 17314) @@ -24,8 +24,10 @@ Gaim::GtkUI::Conversation conv void -gaim_gtkconv_new(conv) +gaim_gtkconv_new(class, conv) Gaim::Conversation conv + C_ARGS: + conv gboolean gaim_gtkconv_is_hidden(gtkconv) Modified: trunk/gtk/plugins/perl/common/GtkConvWin.xs =================================================================== --- trunk/gtk/plugins/perl/common/GtkConvWin.xs 2006-09-18 18:18:30 UTC (rev 17313) +++ trunk/gtk/plugins/perl/common/GtkConvWin.xs 2006-09-18 18:23:17 UTC (rev 17314) @@ -4,7 +4,8 @@ PROTOTYPES: ENABLE Gaim::GtkUI::Conversation::Window -gaim_gtk_conv_window_new() +gaim_gtk_conv_window_new(class) + C_ARGS: /* void */ void gaim_gtk_conv_window_destroy(win) Modified: trunk/gtk/plugins/perl/common/GtkFt.xs =================================================================== --- trunk/gtk/plugins/perl/common/GtkFt.xs 2006-09-18 18:18:30 UTC (rev 17313) +++ trunk/gtk/plugins/perl/common/GtkFt.xs 2006-09-18 18:23:17 UTC (rev 17314) @@ -14,7 +14,8 @@ PROTOTYPES: ENABLE Gaim::GtkUI::Xfer::Dialog -gaim_gtkxfer_dialog_new() +gaim_gtkxfer_dialog_new(class) + C_ARGS: /* void */ void gaim_gtkxfer_dialog_destroy(dialog) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2006-09-18 18:18:37
|
Revision: 17313 http://svn.sourceforge.net/gaim/?rev=17313&view=rev Author: deryni9 Date: 2006-09-18 11:18:30 -0700 (Mon, 18 Sep 2006) Log Message: ----------- That's what happens when I type faster than I look. Bah. Modified Paths: -------------- trunk/gtk/gtkroomlist.h Modified: trunk/gtk/gtkroomlist.h =================================================================== --- trunk/gtk/gtkroomlist.h 2006-09-18 18:16:47 UTC (rev 17312) +++ trunk/gtk/gtkroomlist.h 2006-09-18 18:18:30 UTC (rev 17313) @@ -48,7 +48,7 @@ /** * Shows a new room list dialog and fetches the list for the specified account. * - * @param account The account use force. + * @param account The account to use. */ void gaim_gtk_roomlist_dialog_show_with_account(GaimAccount *account); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2006-09-18 18:16:54
|
Revision: 17312 http://svn.sourceforge.net/gaim/?rev=17312&view=rev Author: deryni9 Date: 2006-09-18 11:16:47 -0700 (Mon, 18 Sep 2006) Log Message: ----------- Fix the doxygen docs for the function as well. Modified Paths: -------------- trunk/gtk/gtkroomlist.h Modified: trunk/gtk/gtkroomlist.h =================================================================== --- trunk/gtk/gtkroomlist.h 2006-09-18 18:14:50 UTC (rev 17311) +++ trunk/gtk/gtkroomlist.h 2006-09-18 18:16:47 UTC (rev 17312) @@ -48,8 +48,7 @@ /** * Shows a new room list dialog and fetches the list for the specified account. * - * @param account The account to force. - * @return The new dialog. + * @param account The account use force. */ void gaim_gtk_roomlist_dialog_show_with_account(GaimAccount *account); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2006-09-18 18:16:15
|
Revision: 17311 http://svn.sourceforge.net/gaim/?rev=17311&view=rev Author: deryni9 Date: 2006-09-18 11:14:50 -0700 (Mon, 18 Sep 2006) Log Message: ----------- I couldn't see a reason why we needed all of gaim_gtk_roomlist_dialog_new, gaim_gtk_roomlist_dialog_new_with_account, gaim_gtk_roomlist_dialog_show, and gaim_gtk_roomlist_dialog_show_with_account especially considering the _show functions basically just called the _new functions. So I whittled us down to just _show and _show_with_account being visible. And since nothing outside GtkRoomlist.c was using the GaimGtkRoomlistDialog struct I made that private too. Modified Paths: -------------- trunk/ChangeLog.API trunk/gtk/gtkroomlist.c trunk/gtk/gtkroomlist.h trunk/gtk/plugins/perl/common/GtkRoomlist.xs trunk/gtk/plugins/perl/common/gtkmodule.h trunk/gtk/plugins/perl/common/typemap Modified: trunk/ChangeLog.API =================================================================== --- trunk/ChangeLog.API 2006-09-18 15:07:10 UTC (rev 17310) +++ trunk/ChangeLog.API 2006-09-18 18:14:50 UTC (rev 17311) @@ -199,6 +199,9 @@ * GaimGtkLogViewer hidden... You weren't using it anyway. * GaimGtkConversation: dialogs (dialogs.search moved to GaimGtkWindow) * gaim_show_xfer_dialog: Use gaim_gtk_xfer_dialog_show(NULL) instead. + * GaimGtkRoomlistDialog: Nothing used it outside of the file it was in. + * gaim_gtk_roomlist_dialog_new: use gaim_gtk_roomlist_show + * gaim_gtk_roomlist_dialog_new_with_account: use gaim_gtk_roomlist_show_with_account Added: * gaim_prefs_disconnect_by_handle() @@ -325,6 +328,7 @@ * gaim_buddy_get_server_alias() * gaim_conv_send_confirm() * GaimConversationUiOps.send_confirm + * gaim_gtk_roomlist_dialog_show_with_account Signals - Changed: (See the Doxygen docs for details on all signals.) * Signal propagation now stops after a handler returns a non-NULL value. Modified: trunk/gtk/gtkroomlist.c =================================================================== --- trunk/gtk/gtkroomlist.c 2006-09-18 15:07:10 UTC (rev 17310) +++ trunk/gtk/gtkroomlist.c 2006-09-18 18:14:50 UTC (rev 17311) @@ -34,15 +34,7 @@ #include "gtkroomlist.h" -typedef struct _GaimGtkRoomlist { - GaimGtkRoomlistDialog *dialog; - GtkTreeStore *model; - GtkWidget *tree; - GHashTable *cats; /**< Meow. */ - gint num_rooms, total_rooms; -} GaimGtkRoomlist; - -struct _GaimGtkRoomlistDialog { +typedef struct _GaimGtkRoomlistDialog { GtkWidget *window; GtkWidget *account_widget; GtkWidget *progress; @@ -60,8 +52,16 @@ gboolean pg_needs_pulse; gboolean pg_to_active; guint pg_update_to; -}; +} GaimGtkRoomlistDialog; +typedef struct _GaimGtkRoomlist { + GaimGtkRoomlistDialog *dialog; + GtkTreeStore *model; + GtkWidget *tree; + GHashTable *cats; /**< Meow. */ + gint num_rooms, total_rooms; +} GaimGtkRoomlist; + enum { NAME_COLUMN = 0, ROOM_COLUMN, @@ -335,7 +335,8 @@ return FALSE; } -GaimGtkRoomlistDialog *gaim_gtk_roomlist_dialog_new_with_account(GaimAccount *account) +static GaimGtkRoomlistDialog * +gaim_gtk_roomlist_dialog_new_with_account(GaimAccount *account) { GaimGtkRoomlistDialog *dialog; GtkWidget *window; @@ -459,13 +460,8 @@ return dialog; } -GaimGtkRoomlistDialog *gaim_gtk_roomlist_dialog_new(void) +void gaim_gtk_roomlist_dialog_show_with_account(GaimAccount *account) { - return gaim_gtk_roomlist_dialog_new_with_account(NULL); -} - -static void gaim_gtk_roomlist_dialog_show_with_account(GaimAccount *account) -{ GaimGtkRoomlistDialog *dialog; dialog = gaim_gtk_roomlist_dialog_new_with_account(account); @@ -477,7 +473,7 @@ void gaim_gtk_roomlist_dialog_show(void) { - gaim_gtk_roomlist_dialog_new(); + gaim_gtk_roomlist_dialog_new_with_account(NULL); } static void gaim_gtk_roomlist_new(GaimRoomlist *list) Modified: trunk/gtk/gtkroomlist.h =================================================================== --- trunk/gtk/gtkroomlist.h 2006-09-18 15:07:10 UTC (rev 17310) +++ trunk/gtk/gtkroomlist.h 2006-09-18 18:14:50 UTC (rev 17311) @@ -27,9 +27,6 @@ #include "roomlist.h" - -typedef struct _GaimGtkRoomlistDialog GaimGtkRoomlistDialog; - /** * Initializes the room list subsystem. */ @@ -44,24 +41,16 @@ gboolean gaim_gtk_roomlist_is_showable(void); /** - * Shows the roomlist dialog. + * Shows a new roomlist dialog. */ void gaim_gtk_roomlist_dialog_show(void); /** - * Creates a new room list dialog. + * Shows a new room list dialog and fetches the list for the specified account. * - * @return The new dialog. - */ -GaimGtkRoomlistDialog *gaim_gtk_roomlist_dialog_new(void); - -/** - * Creates a new room list dialog and fetch the list on - * the specified account. - * * @param account The account to force. * @return The new dialog. */ -GaimGtkRoomlistDialog *gaim_gtk_roomlist_dialog_new_with_account(GaimAccount *account); +void gaim_gtk_roomlist_dialog_show_with_account(GaimAccount *account); #endif /* _GAIM_GTKROOMLIST_H_ */ Modified: trunk/gtk/plugins/perl/common/GtkRoomlist.xs =================================================================== --- trunk/gtk/plugins/perl/common/GtkRoomlist.xs 2006-09-18 15:07:10 UTC (rev 17310) +++ trunk/gtk/plugins/perl/common/GtkRoomlist.xs 2006-09-18 18:14:50 UTC (rev 17311) @@ -10,15 +10,8 @@ PROTOTYPES: ENABLE void -gaim_gtk_roomlist_dialog_show(class) - C_ARGS: /* void */ +gaim_gtk_roomlist_dialog_show() -Gaim::GtkUI::Roomlist::Dialog -gaim_gtk_roomlist_dialog_new(class) - C_ARGS: /* void */ - -Gaim::GtkUI::Roomlist::Dialog -gaim_gtk_roomlist_dialog_new_with_account(class, account) +void +gaim_gtk_roomlist_dialog_show_with_account(account) Gaim::Account account - C_ARGS: - account Modified: trunk/gtk/plugins/perl/common/gtkmodule.h =================================================================== --- trunk/gtk/plugins/perl/common/gtkmodule.h 2006-09-18 15:07:10 UTC (rev 17310) +++ trunk/gtk/plugins/perl/common/gtkmodule.h 2006-09-18 18:14:50 UTC (rev 17311) @@ -72,8 +72,5 @@ /* gtkmenutray.h */ typedef GaimGtkMenuTray * Gaim__GtkUI__MenuTray; -/* gtkroomlist.h */ -typedef GaimGtkRoomlistDialog * Gaim__GtkUI__Roomlist__Dialog; - /* gtkstatusbox.h */ typedef GtkGaimStatusBox * Gaim__GtkUI__StatusBox; Modified: trunk/gtk/plugins/perl/common/typemap =================================================================== --- trunk/gtk/plugins/perl/common/typemap 2006-09-18 15:07:10 UTC (rev 17310) +++ trunk/gtk/plugins/perl/common/typemap 2006-09-18 18:14:50 UTC (rev 17311) @@ -17,5 +17,4 @@ Gaim::GtkUI::IMHtml::Options T_IV Gaim::GtkUI::IMHtmlToolbar T_GaimObj Gaim::GtkUI::MenuTray T_GaimObj -Gaim::GtkUI::Roomlist::Dialog T_GaimObj Gaim::GtkUI::StatusBox T_GaimObj This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-09-18 15:07:17
|
Revision: 17310 http://svn.sourceforge.net/gaim/?rev=17310&view=rev Author: datallah Date: 2006-09-18 08:07:10 -0700 (Mon, 18 Sep 2006) Log Message: ----------- fix tyop Modified Paths: -------------- trunk/libgaim/util.c Modified: trunk/libgaim/util.c =================================================================== --- trunk/libgaim/util.c 2006-09-18 06:20:36 UTC (rev 17309) +++ trunk/libgaim/util.c 2006-09-18 15:07:10 UTC (rev 17310) @@ -2413,7 +2413,7 @@ gchar *filename_temp; filename_temp = g_strdup_printf("%s~", filename); - gaim_debug_error("util", "Error parsing file %s. Rrenaming old " + gaim_debug_error("util", "Error parsing file %s. Renaming old " "file to %s\n", filename_full, filename_temp); gaim_util_write_data_to_file(filename_temp, contents, length); g_free(filename_temp); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-09-18 06:20:57
|
Revision: 17309 http://svn.sourceforge.net/gaim/?rev=17309&view=rev Author: thekingant Date: 2006-09-17 23:20:36 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Rename the gntgaim executable to gaim-text I feel like this is much more clear to end users, who will probably have no idea what gnt is. Modified Paths: -------------- trunk/ChangeLog trunk/configure.ac trunk/console/Makefile.am trunk/console/gntgaim.c trunk/doc/Makefile.am Added Paths: ----------- trunk/doc/gaim-text.1.in Removed Paths: ------------- trunk/doc/gntgaim.1.in Property Changed: ---------------- trunk/console/ Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-18 04:40:45 UTC (rev 17308) +++ trunk/ChangeLog 2006-09-18 06:20:36 UTC (rev 17309) @@ -5,7 +5,7 @@ * With the Core/UI split completed, it is now possible to build Gaim without any UIs, creating a libgaim library upon which other UIs may be constructed - * A new ncurses-based console UI called gntgaim is now available + * A new ncurses-based console UI called gaim-text is now available (Sadrul Habib Chowdhury, Google Summer of Code) * Reorganized the source tree to split apart the code for the UI changes and libgaim targets Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-09-18 04:40:45 UTC (rev 17308) +++ trunk/configure.ac 2006-09-18 06:20:36 UTC (rev 17309) @@ -3,6 +3,7 @@ AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) +#AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_PREREQ([2.50]) @@ -1848,7 +1849,7 @@ gaim.service doc/Makefile doc/gaim.1 - doc/gntgaim.1 + doc/gaim-text.1 m4macros/Makefile gtk/Makefile gtk/pixmaps/Makefile Property changes on: trunk/console ___________________________________________________________________ Name: svn:ignore - Makefile.in gmon.out gntgaim .libs .deps Makefile .error *.o + Makefile.in gaim-text gmon.out .libs .deps Makefile .error *.o Modified: trunk/console/Makefile.am =================================================================== --- trunk/console/Makefile.am 2006-09-18 04:40:45 UTC (rev 17308) +++ trunk/console/Makefile.am 2006-09-18 06:20:36 UTC (rev 17309) @@ -2,9 +2,9 @@ SUBDIRS = libgnt plugins -bin_PROGRAMS = gntgaim +bin_PROGRAMS = gaim-text -gntgaim_SOURCES = \ +gaim_text_SOURCES = \ gntaccount.c \ gntblist.c \ gntconn.c \ @@ -18,7 +18,7 @@ gntstatus.c \ gntui.c -gntgaim_headers = \ +gaim_text_headers = \ gntaccount.h \ gntblist.h \ gntconn.h \ @@ -32,13 +32,13 @@ gntstatus.h \ gntui.h -gntgaimincludedir=$(includedir)/gaim/gnt -gntgaiminclude_HEADERS = \ - $(gntgaim_headers) +gaim_textincludedir=$(includedir)/gaim/gnt +gaim_textinclude_HEADERS = \ + $(gaim_text_headers) -gntgaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) -gntgaim_LDFLAGS = -export-dynamic -gntgaim_LDADD = \ +gaim_text_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) +gaim_text_LDFLAGS = -export-dynamic +gaim_text_LDADD = \ @LIBOBJS@ \ $(DBUS_LIBS) \ $(STATIC_LINK_LIBS) \ Modified: trunk/console/gntgaim.c =================================================================== --- trunk/console/gntgaim.c 2006-09-18 04:40:45 UTC (rev 17308) +++ trunk/console/gntgaim.c 2006-09-18 06:20:36 UTC (rev 17309) @@ -245,7 +245,7 @@ } /* show version message */ if (opt_version) { - printf("gntgaim %s\n", VERSION); + printf("gaim-text %s\n", VERSION); return 0; } Modified: trunk/doc/Makefile.am =================================================================== --- trunk/doc/Makefile.am 2006-09-18 04:40:45 UTC (rev 17308) +++ trunk/doc/Makefile.am 2006-09-18 06:20:36 UTC (rev 17309) @@ -1,4 +1,4 @@ -man_MANS = gaim.1 gntgaim.1 +man_MANS = gaim.1 gaim-text.1 EXTRA_DIST = \ C-HOWTO.dox \ @@ -14,7 +14,7 @@ dbus-server-signals.dox \ gaim.1.in \ gaims_funniest_home_convos.txt \ - gntgaim.1.in \ + gaim-text.1.in \ gtkaccount-signals.dox \ gtkblist-signals.dox \ gtkconv-signals.dox \ Copied: trunk/doc/gaim-text.1.in (from rev 17300, trunk/doc/gntgaim.1.in) =================================================================== --- trunk/doc/gaim-text.1.in (rev 0) +++ trunk/doc/gaim-text.1.in 2006-09-18 06:20:36 UTC (rev 17309) @@ -0,0 +1,287 @@ +.\" Copyright (c) 2006, Sadrul Habib Chowdhury <sa...@us...> +.\" +.\" This is free documentation; you can redistribute it and/or +.\" modify it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2 of +.\" the License, or (at your option) any later version. +.\" +.\" The GNU General Public License's references to "object code" +.\" and "executables" are to be interpreted as the output of any +.\" document formatting or typesetting system, including +.\" intermediate and printed output. +.\" +.\" This manual is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public +.\" License along with this manual; if not, write to the Free +.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, +.\" USA. +.TH gaim-text 1 +.SH NAME +GntGaim \- A Pimpin' Penguin console frontend for Instant Messaging client Gaim. +.SH SYNOPSIS +.TP 5 +\fBgaim-text \fI[options]\fR + +.SH DESCRIPTION +.PP +\fBgaim-text\fR is a console-based modular messaging client capable of using +AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, +Zephyr, Gadu-Gadu, and QQ all at once. It has many common features found in +other clients, as well as many unique features. Gaim is not endorsed by or +affiliated with America Online, ICQ, Microsoft, or Yahoo. + +.SH OPTIONS +The following options are provided by \fBgaim-text\fR using the standard GNU +command line syntax: +.TP +.B \-d, \-\-debug +Print debugging messages to stderr and start with the \fBDebug\fR window. The +messages shown in the \fBDebug\fR window are the same as the ones printed in +stderr. +.TP +.B \-c, \-\-config=\fIDIR\fB +Use \fIDIR\fR as the directory for config files instead of \fI~/.gaim\fR. +.TP +.B \-h, \-\-help +Print this help and exit. +.TP +.B \-n, \-\-nologin +Don't automatically login when \fBgaim-text\fR starts. Sets all accounts to +Offline. +.TP +.B \-v, \-\-version +Display the version information window. + +.SH GNT Shortcuts +You can use the following shortcuts: +.TP +.B Alt \+ n +Go to the next window. +.TP +.B Alt \+ p +Go to the previous window. +.TP +.B Alt \+ w +Show the list of windows. You can select and jump to any window from the list. +.TP +.B Alt \+ c +Close the current window. +.TP +.B Alt \+ q +Quit. +.TP +.B Alt \+ m +Start moving a window. Press the cursor keys to move the window. When you are +done, press \fBEnter\fR or \fBEscape\fR. +.TP +.B Alt \+ r +Start resizing a window. Press the cursor keys to resize the window. When you +are done, press \fBEnter\fR or \fBEscape\fR. +.TP +.B Alt \+ d +Dump the contents of the screen in HTML format in a file named "dump.html" in +working directory. +.TP +.B Alt \+ . +Move the position of the current window in the window list one place to the +right. +.TP +.B Alt \+ , +Move the position of the current window in the window list one place to the +left. +.TP +.B Alt \+ l +Refresh the windows. This is useful after resizing the terminal window. +.TP +.B Alt \+ 1 2 ... 0 +Jump to the 1st, 2nd ... 10th window. + +.SH FILES +\fI~/.gntrc\fR: configuration file for gnt applications. +.br +.TP +A sample file looks like: +.br +[general] +.br +shadow = 0 +.br +# There is experimental mouse support +.br +mouse = 1 +.br +# To use some custom window-manager +.br +wm = /usr/local/lib/gaim/s.so +.br + +.br +[colors] +.br +# The RGB values range in [0, 1000] +.br +black = 0; 0; 0 +.br +red = 1000; 0; 0 +.br +green = 0; 1000; 0 +.br +blue = 250; 250; 700 +.br +white = 1000; 1000; 1000 +.br +gray = 700; 700; 700 +.br +darkgray = 256; 256; 256 +.br + +.br +[colorpairs] +.br +normal = white; black +.br +highlight = white; blue +.br +highlightd = black; gray +.br +shadow = black; darkgray +.br +title = white; blue +.br +titled = white; gray +.br +text = white; blue +.br +disabled = gray; black +.br + +.br +# Remap some keys for GntEntry +.br +[GntEntry::remap] +.br +# Remap the up-arrow to the left-arrow +.br +^[[A = ^[[D +.br +# Remap the down-arrow to the right-arrow +.br +^[[B = ^[[C +.br +# Remap 'a' to 'bcd' +.br +a = bcd +.br +# Completely ignore the key 'q' +.br +q = +.br +# But the following will NOT work +.br +#abc = bcd +.br + +# Hitting 'space' will activate a button +.br +[GntButton::remap] +.br +\\ = \\r +.br + +.SH Mouse Support +There is experimental mouse support. You can focus windows, activate buttons, +select rows in a list, scroll using the wheel-scroll etc. Mouse support is +disabled by default, so you need to enable it in ~/.gntrc (see the sample +above). + +.SH Window Management +The default window management is very limited. But it is possible to write +custom window managers to suit your needs. There is a sample window-manager +included (named \fIs.so\fR) which adds a little 'close-button' for the windows, +removes the borders from the buddylist and pops up new windows in the middle of +the screen, instead of at the upper-left corder. It is provided as a sample +simple manager, but it should be possible to write more complex managers, and +it's very possible that the window-manager API will need to be enhanced. Look at +the sample ~/.gntrc file above to see how to select a window-manager. + + +.SH Conversation Commands +There are a few helpful commands in addition to the regular commands. You can +use these from any conversation to access other windows. + +.TP +.B accounts +for the accounts window. + +.TP +.B buddylist +for the buddylist. + +.TP +.B debugwin +for the debug window. + +.TP +.B plugins +for the plugins window. + +.TP +.B prefs +for the preferences window. + +.TP +.B status +for the status window. + +.SH BUGS +Known bugs are listed at +.br +\fIhttp://sourceforge.net/tracker/?group_id=235&atid=100235\fR + +.SH PATCHES +If you fix a bug in \fBgaim-text\fR (or otherwise enhance it), please submit a +patch (using \fIsvn diff > my.diff\fR against the latest SVN version) +at +.br +\fIhttp://sourceforge.net/tracker/?func=add&group_id=235&atid=300235\fR + +Before sending a bug report, please verify that you have the latest +version of \fBgaim-text\fR and \fBlibgaim\fR. Many bugs (major and minor) are +fixed at each release, and if yours is out of date, the problem may already have +been solved. + +You are also encouraged to drop by at \fB#gaim\fR on \fIirc.freenode.net\fR to +discuss about development. + +.SH SEE ALSO +\fIhttp://gaim.sourceforge.net/\fR +.br +\fIhttp://www.sourceforge.net/projects/gaim/\fR + +.SH LICENSE +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but +\fBWITHOUT ANY WARRANTY\fR; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +.SH AUTHORS +Sadrul Habib Chowdhury <\fIs...@us...\fR> +.br + +This manpage was written by Sadrul Habib Chowdhury +<\fIs...@us...\fR> and Dennis Ristuccia +<\fId...@de...\fR>. + Deleted: trunk/doc/gntgaim.1.in =================================================================== --- trunk/doc/gntgaim.1.in 2006-09-18 04:40:45 UTC (rev 17308) +++ trunk/doc/gntgaim.1.in 2006-09-18 06:20:36 UTC (rev 17309) @@ -1,287 +0,0 @@ -.\" Copyright (c) 2006, Sadrul Habib Chowdhury <sa...@us...> -.\" -.\" This is free documentation; you can redistribute it and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of -.\" the License, or (at your option) any later version. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public -.\" License along with this manual; if not, write to the Free -.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, -.\" USA. -.TH gntgaim 1 -.SH NAME -GntGaim \- A Pimpin' Penguin console frontend for Instant Messaging client Gaim. -.SH SYNOPSIS -.TP 5 -\fBgntgaim \fI[options]\fR - -.SH DESCRIPTION -.PP -\fBgntgaim\fR is a console-based modular messaging client capable of using -AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, -Zephyr, Gadu-Gadu, and QQ all at once. It has many common features found in -other clients, as well as many unique features. Gaim is not endorsed by or -affiliated with America Online, ICQ, Microsoft, or Yahoo. - -.SH OPTIONS -The following options are provided by \fBgntgaim\fR using the standard GNU -command line syntax: -.TP -.B \-d, \-\-debug -Print debugging messages to stderr and start with the \fBDebug\fR window. The -messages shown in the \fBDebug\fR window are the same as the ones printed in -stderr. -.TP -.B \-c, \-\-config=\fIDIR\fB -Use \fIDIR\fR as the directory for config files instead of \fI~/.gaim\fR. -.TP -.B \-h, \-\-help -Print this help and exit. -.TP -.B \-n, \-\-nologin -Don't automatically login when \fBgntgaim\fR starts. Sets all accounts to -Offline. -.TP -.B \-v, \-\-version -Display the version information window. - -.SH GNT Shortcuts -You can use the following shortcuts: -.TP -.B Alt \+ n -Go to the next window. -.TP -.B Alt \+ p -Go to the previous window. -.TP -.B Alt \+ w -Show the list of windows. You can select and jump to any window from the list. -.TP -.B Alt \+ c -Close the current window. -.TP -.B Alt \+ q -Quit. -.TP -.B Alt \+ m -Start moving a window. Press the cursor keys to move the window. When you are -done, press \fBEnter\fR or \fBEscape\fR. -.TP -.B Alt \+ r -Start resizing a window. Press the cursor keys to resize the window. When you -are done, press \fBEnter\fR or \fBEscape\fR. -.TP -.B Alt \+ d -Dump the contents of the screen in HTML format in a file named "dump.html" in -working directory. -.TP -.B Alt \+ . -Move the position of the current window in the window list one place to the -right. -.TP -.B Alt \+ , -Move the position of the current window in the window list one place to the -left. -.TP -.B Alt \+ l -Refresh the windows. This is useful after resizing the terminal window. -.TP -.B Alt \+ 1 2 ... 0 -Jump to the 1st, 2nd ... 10th window. - -.SH FILES -\fI~/.gntrc\fR: configuration file for gnt applications. -.br -.TP -A sample file looks like: -.br -[general] -.br -shadow = 0 -.br -# There is experimental mouse support -.br -mouse = 1 -.br -# To use some custom window-manager -.br -wm = /usr/local/lib/gaim/s.so -.br - -.br -[colors] -.br -# The RGB values range in [0, 1000] -.br -black = 0; 0; 0 -.br -red = 1000; 0; 0 -.br -green = 0; 1000; 0 -.br -blue = 250; 250; 700 -.br -white = 1000; 1000; 1000 -.br -gray = 700; 700; 700 -.br -darkgray = 256; 256; 256 -.br - -.br -[colorpairs] -.br -normal = white; black -.br -highlight = white; blue -.br -highlightd = black; gray -.br -shadow = black; darkgray -.br -title = white; blue -.br -titled = white; gray -.br -text = white; blue -.br -disabled = gray; black -.br - -.br -# Remap some keys for GntEntry -.br -[GntEntry::remap] -.br -# Remap the up-arrow to the left-arrow -.br -^[[A = ^[[D -.br -# Remap the down-arrow to the right-arrow -.br -^[[B = ^[[C -.br -# Remap 'a' to 'bcd' -.br -a = bcd -.br -# Completely ignore the key 'q' -.br -q = -.br -# But the following will NOT work -.br -#abc = bcd -.br - -# Hitting 'space' will activate a button -.br -[GntButton::remap] -.br -\\ = \\r -.br - -.SH Mouse Support -There is experimental mouse support. You can focus windows, activate buttons, -select rows in a list, scroll using the wheel-scroll etc. Mouse support is -disabled by default, so you need to enable it in ~/.gntrc (see the sample -above). - -.SH Window Management -The default window management is very limited. But it is possible to write -custom window managers to suit your needs. There is a sample window-manager -included (named \fIs.so\fR) which adds a little 'close-button' for the windows, -removes the borders from the buddylist and pops up new windows in the middle of -the screen, instead of at the upper-left corder. It is provided as a sample -simple manager, but it should be possible to write more complex managers, and -it's very possible that the window-manager API will need to be enhanced. Look at -the sample ~/.gntrc file above to see how to select a window-manager. - - -.SH Conversation Commands -There are a few helpful commands in addition to the regular commands. You can -use these from any conversation to access other windows. - -.TP -.B accounts -for the accounts window. - -.TP -.B buddylist -for the buddylist. - -.TP -.B debugwin -for the debug window. - -.TP -.B plugins -for the plugins window. - -.TP -.B prefs -for the preferences window. - -.TP -.B status -for the status window. - -.SH BUGS -Known bugs are listed at -.br -\fIhttp://sourceforge.net/tracker/?group_id=235&atid=100235\fR - -.SH PATCHES -If you fix a bug in \fBgntgaim\fR (or otherwise enhance it), please submit a -patch (using \fIsvn diff > my.diff\fR against the latest SVN version) -at -.br -\fIhttp://sourceforge.net/tracker/?func=add&group_id=235&atid=300235\fR - -Before sending a bug report, please verify that you have the latest -version of \fBgntgaim\fR and \fBlibgaim\fR. Many bugs (major and minor) are -fixed at each release, and if yours is out of date, the problem may already have -been solved. - -You are also encouraged to drop by at \fB#gaim\fR on \fIirc.freenode.net\fR to -discuss about development. - -.SH SEE ALSO -\fIhttp://gaim.sourceforge.net/\fR -.br -\fIhttp://www.sourceforge.net/projects/gaim/\fR - -.SH LICENSE -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, but -\fBWITHOUT ANY WARRANTY\fR; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -.SH AUTHORS -Sadrul Habib Chowdhury <\fIs...@us...\fR> -.br - -This manpage was written by Sadrul Habib Chowdhury -<\fIs...@us...\fR> and Dennis Ristuccia -<\fId...@de...\fR>. - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-09-18 04:40:48
|
Revision: 17308 http://svn.sourceforge.net/gaim/?rev=17308&view=rev Author: rlaager Date: 2006-09-17 21:40:45 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Nathan pointed out that I made a mistake when editing that last patch. Modified Paths: -------------- trunk/gtk/gtkconv.c Modified: trunk/gtk/gtkconv.c =================================================================== --- trunk/gtk/gtkconv.c 2006-09-18 04:35:10 UTC (rev 17307) +++ trunk/gtk/gtkconv.c 2006-09-18 04:40:45 UTC (rev 17308) @@ -3352,7 +3352,7 @@ CHAT_USERS_NAME_COLUMN, name, CHAT_USERS_FLAGS_COLUMN, flags, CHAT_USERS_COLOR_COLUMN, &send_color, - CHAT_USERS_WEIGHT_COLUMN ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, is_buddy, + CHAT_USERS_WEIGHT_COLUMN, is_buddy ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, -1); } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-09-18 04:35:18
|
Revision: 17307 http://svn.sourceforge.net/gaim/?rev=17307&view=rev Author: rlaager Date: 2006-09-17 21:35:10 -0700 (Sun, 17 Sep 2006) Log Message: ----------- SF Patch #1481843 from Sadrul It sounds like the GTK+ folks won't be fixing bug #355214: http://bugzilla.gnome.org/show_bug.cgi?id=355214 This fixes the bolding of buddies in chat rooms. Modified Paths: -------------- trunk/ChangeLog.API trunk/gtk/gtkconv.c trunk/gtk/gtkconv.h Modified: trunk/ChangeLog.API =================================================================== --- trunk/ChangeLog.API 2006-09-18 04:27:49 UTC (rev 17306) +++ trunk/ChangeLog.API 2006-09-18 04:35:10 UTC (rev 17307) @@ -132,6 +132,8 @@ clearing the search at the end. * gaim_gtkxfer_dialog_show: Can now take NULL to show (and possibly create) a default gtkxfer dialog. + * CHAT_USERS_BUDDY_COLUMN became CHAT_USERS_WEIGHT_COLUMN, along with + a change in the values stored in the column. Removed: * gaim_gtk_sound_{get,set}_mute() (replaced by the /gaim/gtk/sound/mute Modified: trunk/gtk/gtkconv.c =================================================================== --- trunk/gtk/gtkconv.c 2006-09-18 04:27:49 UTC (rev 17306) +++ trunk/gtk/gtkconv.c 2006-09-18 04:35:10 UTC (rev 17307) @@ -3337,9 +3337,7 @@ gdk_color_parse(SEND_COLOR, &send_color); #if GTK_CHECK_VERSION(2,6,0) - gtk_list_store_insert_with_values - (ls, - &iter, + gtk_list_store_insert_with_values(ls, &iter, /* * The GTK docs are mute about the effects of the "row" value for performance. * X-Chat hardcodes their value to 0 (prepend) and -1 (append), so we will too. @@ -3347,55 +3345,52 @@ * but no one in #gtk+ seems to know anything about it either. * Inserting in the "wrong" location has no visible ill effects. - F.P. */ - -1, /* "row" */ - CHAT_USERS_ICON_COLUMN, pixbuf, - CHAT_USERS_ALIAS_COLUMN, alias, - CHAT_USERS_ALIAS_KEY_COLUMN, alias_key, - CHAT_USERS_NAME_COLUMN, name, - CHAT_USERS_FLAGS_COLUMN, flags, - CHAT_USERS_COLOR_COLUMN, &send_color, - CHAT_USERS_BUDDY_COLUMN, is_buddy, - -1); - } - else { - gtk_list_store_insert_with_values - (ls, - &iter, - -1, /* "row" */ - CHAT_USERS_ICON_COLUMN, pixbuf, - CHAT_USERS_ALIAS_COLUMN, alias, - CHAT_USERS_ALIAS_KEY_COLUMN, alias_key, - CHAT_USERS_NAME_COLUMN, name, - CHAT_USERS_FLAGS_COLUMN, flags, - CHAT_USERS_COLOR_COLUMN, get_nick_color(gtkconv, name), - CHAT_USERS_BUDDY_COLUMN, is_buddy, - -1); - + -1, /* "row" */ + CHAT_USERS_ICON_COLUMN, pixbuf, + CHAT_USERS_ALIAS_COLUMN, alias, + CHAT_USERS_ALIAS_KEY_COLUMN, alias_key, + CHAT_USERS_NAME_COLUMN, name, + CHAT_USERS_FLAGS_COLUMN, flags, + CHAT_USERS_COLOR_COLUMN, &send_color, + CHAT_USERS_WEIGHT_COLUMN ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, is_buddy, + -1); + } + else + { + gtk_list_store_insert_with_values(ls, &iter, + -1, /* "row" */ + CHAT_USERS_ICON_COLUMN, pixbuf, + CHAT_USERS_ALIAS_COLUMN, alias, + CHAT_USERS_ALIAS_KEY_COLUMN, alias_key, + CHAT_USERS_NAME_COLUMN, name, + CHAT_USERS_FLAGS_COLUMN, flags, + CHAT_USERS_COLOR_COLUMN, get_nick_color(gtkconv, name), + CHAT_USERS_WEIGHT_COLUMN, is_buddy ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, + -1); #else gtk_list_store_append(ls, &iter); gtk_list_store_set(ls, &iter, - CHAT_USERS_ICON_COLUMN, pixbuf, - CHAT_USERS_ALIAS_COLUMN, alias, - CHAT_USERS_ALIAS_KEY_COLUMN, alias_key, - CHAT_USERS_NAME_COLUMN, name, - CHAT_USERS_FLAGS_COLUMN, flags, - CHAT_USERS_COLOR_COLUMN, &send_color, - CHAT_USERS_BUDDY_COLUMN, is_buddy, - -1); + CHAT_USERS_ICON_COLUMN, pixbuf, + CHAT_USERS_ALIAS_COLUMN, alias, + CHAT_USERS_ALIAS_KEY_COLUMN, alias_key, + CHAT_USERS_NAME_COLUMN, name, + CHAT_USERS_FLAGS_COLUMN, flags, + CHAT_USERS_COLOR_COLUMN, &send_color, + CHAT_USERS_WEIGHT_COLUMN, is_buddy ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, + -1); } - - else { - + else + { gtk_list_store_append(ls, &iter); gtk_list_store_set(ls, &iter, - CHAT_USERS_ICON_COLUMN, pixbuf, - CHAT_USERS_ALIAS_COLUMN, alias, - CHAT_USERS_ALIAS_KEY_COLUMN, alias_key, - CHAT_USERS_NAME_COLUMN, name, - CHAT_USERS_FLAGS_COLUMN, flags, - CHAT_USERS_COLOR_COLUMN, get_nick_color(gtkconv, name), - CHAT_USERS_BUDDY_COLUMN, is_buddy, - -1); + CHAT_USERS_ICON_COLUMN, pixbuf, + CHAT_USERS_ALIAS_COLUMN, alias, + CHAT_USERS_ALIAS_KEY_COLUMN, alias_key, + CHAT_USERS_NAME_COLUMN, name, + CHAT_USERS_FLAGS_COLUMN, flags, + CHAT_USERS_COLOR_COLUMN, get_nick_color(gtkconv, name), + CHAT_USERS_WEIGHT_COLUMN, is_buddy ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, + -1); #endif } @@ -3655,15 +3650,15 @@ gint ret = 0; gtk_tree_model_get(model, a, - CHAT_USERS_ALIAS_KEY_COLUMN, &user1, - CHAT_USERS_FLAGS_COLUMN, &f1, - CHAT_USERS_BUDDY_COLUMN, &buddy1, - -1); + CHAT_USERS_ALIAS_KEY_COLUMN, &user1, + CHAT_USERS_FLAGS_COLUMN, &f1, + CHAT_USERS_WEIGHT_COLUMN, &buddy1, + -1); gtk_tree_model_get(model, b, - CHAT_USERS_ALIAS_KEY_COLUMN, &user2, - CHAT_USERS_FLAGS_COLUMN, &f2, - CHAT_USERS_BUDDY_COLUMN, &buddy2, - -1); + CHAT_USERS_ALIAS_KEY_COLUMN, &user2, + CHAT_USERS_FLAGS_COLUMN, &f2, + CHAT_USERS_WEIGHT_COLUMN, &buddy2, + -1); if (user1 == NULL || user2 == NULL) { if (!(user1 == NULL && user2 == NULL)) @@ -3672,7 +3667,7 @@ /* sort more important users first */ ret = (f1 > f2) ? -1 : 1; } else if (buddy1 != buddy2) { - ret = buddy1 ? -1 : 1; + ret = (buddy1 > buddy2) ? -1 : 1; } else { ret = strcasecmp(user1, user2); } @@ -3803,7 +3798,8 @@ gtk_tree_model_get(model, &iter, CHAT_USERS_NAME_COLUMN, &name, -1); if (!strcmp(normalized_name, gaim_normalize(conv->account, name))) { - gtk_list_store_set(GTK_LIST_STORE(model), &iter, CHAT_USERS_BUDDY_COLUMN, is_buddy, -1); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, + CHAT_USERS_WEIGHT_COLUMN, is_buddy ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, -1); g_free(name); break; } @@ -3968,7 +3964,7 @@ ls = gtk_list_store_new(CHAT_USERS_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, - GDK_TYPE_COLOR, G_TYPE_BOOLEAN); + GDK_TYPE_COLOR, G_TYPE_INT); gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(ls), CHAT_USERS_ALIAS_KEY_COLUMN, sort_chat_users, NULL, NULL); @@ -3990,13 +3986,13 @@ g_object_set(rend, "foreground-set", TRUE, - "weight", PANGO_WEIGHT_BOLD, + "weight-set", TRUE, NULL); col = gtk_tree_view_column_new_with_attributes(NULL, rend, - "text", CHAT_USERS_ALIAS_COLUMN, - "foreground-gdk", CHAT_USERS_COLOR_COLUMN, - "weight-set", CHAT_USERS_BUDDY_COLUMN, - NULL); + "text", CHAT_USERS_ALIAS_COLUMN, + "foreground-gdk", CHAT_USERS_COLOR_COLUMN, + "weight", CHAT_USERS_WEIGHT_COLUMN, + NULL); gaim_signal_connect(blist_handle, "buddy-added", gtkchat, GAIM_CALLBACK(buddy_added_cb), conv); Modified: trunk/gtk/gtkconv.h =================================================================== --- trunk/gtk/gtkconv.h 2006-09-18 04:27:49 UTC (rev 17306) +++ trunk/gtk/gtkconv.h 2006-09-18 04:35:10 UTC (rev 17307) @@ -48,7 +48,7 @@ CHAT_USERS_NAME_COLUMN, CHAT_USERS_FLAGS_COLUMN, CHAT_USERS_COLOR_COLUMN, - CHAT_USERS_BUDDY_COLUMN, + CHAT_USERS_WEIGHT_COLUMN, CHAT_USERS_COLUMNS }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2006-09-18 04:27:52
|
Revision: 17306 http://svn.sourceforge.net/gaim/?rev=17306&view=rev Author: deryni9 Date: 2006-09-17 21:27:49 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Fix the package namespacing of a couple utility functions. Modified Paths: -------------- trunk/gtk/plugins/perl/common/GtkUtils.xs Modified: trunk/gtk/plugins/perl/common/GtkUtils.xs =================================================================== --- trunk/gtk/plugins/perl/common/GtkUtils.xs 2006-09-18 04:26:33 UTC (rev 17305) +++ trunk/gtk/plugins/perl/common/GtkUtils.xs 2006-09-18 04:27:49 UTC (rev 17306) @@ -1,6 +1,6 @@ #include "gtkmodule.h" -MODULE = Gaim::GtkUI::Utils PACKAGE = Gaim::GtkUI::Utils PREFIX = gaim_gtk_utils_ +MODULE = Gaim::GtkUI::Utils PACKAGE = Gaim::GtkUI::Utils PREFIX = gaim_gtk_ PROTOTYPES: ENABLE gboolean This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2006-09-18 04:26:38
|
Revision: 17305 http://svn.sourceforge.net/gaim/?rev=17305&view=rev Author: deryni9 Date: 2006-09-17 21:26:33 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Remove a couple more commented out functions, fix the class we were blessing things into with smiley themes, and add an indentatation level to the bootstrap section of GtkUI.xs (doesn't matter now but bit me during some of my testing). Modified Paths: -------------- trunk/gtk/plugins/perl/common/GtkThemes.xs trunk/gtk/plugins/perl/common/GtkUI.xs Modified: trunk/gtk/plugins/perl/common/GtkThemes.xs =================================================================== --- trunk/gtk/plugins/perl/common/GtkThemes.xs 2006-09-18 04:24:03 UTC (rev 17304) +++ trunk/gtk/plugins/perl/common/GtkThemes.xs 2006-09-18 04:26:33 UTC (rev 17305) @@ -1,13 +1,5 @@ #include "gtkmodule.h" -/* This can't work at the moment since I don't have a typemap for Gtk::Widget. - * I thought about using the one from libgtk2-perl but wasn't sure how to go - * about doing that. -void -gaim_gtkthemes_smiley_themeize(widget) - Gtk::Widget * widget -*/ - MODULE = Gaim::GtkUI::Themes PACKAGE = Gaim::GtkUI::Themes PREFIX = gaim_gtkthemes_ PROTOTYPES: ENABLE @@ -32,5 +24,5 @@ GSList *l; PPCODE: for (l = gaim_gtkthemes_get_proto_smileys(id); l != NULL; l = l->next) { - XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gtk::IMHtml::Smiley"))); + XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::GtkUI::IMHtml::Smiley"))); } Modified: trunk/gtk/plugins/perl/common/GtkUI.xs =================================================================== --- trunk/gtk/plugins/perl/common/GtkUI.xs 2006-09-18 04:24:03 UTC (rev 17304) +++ trunk/gtk/plugins/perl/common/GtkUI.xs 2006-09-18 04:26:33 UTC (rev 17305) @@ -1,24 +1,5 @@ #include "gtkmodule.h" -/* -#define GAIM_PERL_BOOT_PROTO(x) \ - void boot_Gaim__##x(pTHX_ CV *cv); - -#define GAIM_PERL_BOOT(x) \ - gaim_perl_callXS(boot_Gaim__##x, cv, mark) - -static void -gaim_perl_callXS(void (*subaddr)(pTHX_ CV *cv), CV *cv, SV **mark) -{ - dSP; - - PUSHMARK(mark); - (*subaddr)(aTHX_ cv); - - PUTBACK; -} -*/ - /* Prototypes for the BOOT section below. */ GAIM_PERL_BOOT_PROTO(GtkUI__Account); GAIM_PERL_BOOT_PROTO(GtkUI__BuddyList); @@ -51,29 +32,29 @@ PROTOTYPES: ENABLE BOOT: -GAIM_PERL_BOOT(GtkUI__Account); -GAIM_PERL_BOOT(GtkUI__BuddyList); -GAIM_PERL_BOOT(GtkUI__Connection); -GAIM_PERL_BOOT(GtkUI__Conversation); -GAIM_PERL_BOOT(GtkUI__Conversation__Window); -GAIM_PERL_BOOT(GtkUI__Debug); -GAIM_PERL_BOOT(GtkUI__Dialogs); -GAIM_PERL_BOOT(GtkUI__IMHtml); -GAIM_PERL_BOOT(GtkUI__IMHtmlToolbar); -GAIM_PERL_BOOT(GtkUI__Log); -GAIM_PERL_BOOT(GtkUI__MenuTray); -GAIM_PERL_BOOT(GtkUI__Plugin); -GAIM_PERL_BOOT(GtkUI__PluginPref); -GAIM_PERL_BOOT(GtkUI__Pounce); -GAIM_PERL_BOOT(GtkUI__Prefs); -GAIM_PERL_BOOT(GtkUI__Privacy); -GAIM_PERL_BOOT(GtkUI__Roomlist); -GAIM_PERL_BOOT(GtkUI__Status); + GAIM_PERL_BOOT(GtkUI__Account); + GAIM_PERL_BOOT(GtkUI__BuddyList); + GAIM_PERL_BOOT(GtkUI__Connection); + GAIM_PERL_BOOT(GtkUI__Conversation); + GAIM_PERL_BOOT(GtkUI__Conversation__Window); + GAIM_PERL_BOOT(GtkUI__Debug); + GAIM_PERL_BOOT(GtkUI__Dialogs); + GAIM_PERL_BOOT(GtkUI__IMHtml); + GAIM_PERL_BOOT(GtkUI__IMHtmlToolbar); + GAIM_PERL_BOOT(GtkUI__Log); + GAIM_PERL_BOOT(GtkUI__MenuTray); + GAIM_PERL_BOOT(GtkUI__Plugin); + GAIM_PERL_BOOT(GtkUI__PluginPref); + GAIM_PERL_BOOT(GtkUI__Pounce); + GAIM_PERL_BOOT(GtkUI__Prefs); + GAIM_PERL_BOOT(GtkUI__Privacy); + GAIM_PERL_BOOT(GtkUI__Roomlist); + GAIM_PERL_BOOT(GtkUI__Status); #ifndef _WIN32 -GAIM_PERL_BOOT(GtkUI__Session); + GAIM_PERL_BOOT(GtkUI__Session); #endif -GAIM_PERL_BOOT(GtkUI__Sound); -GAIM_PERL_BOOT(GtkUI__StatusBox); -GAIM_PERL_BOOT(GtkUI__Themes); -GAIM_PERL_BOOT(GtkUI__Utils); -GAIM_PERL_BOOT(GtkUI__Xfer); + GAIM_PERL_BOOT(GtkUI__Sound); + GAIM_PERL_BOOT(GtkUI__StatusBox); + GAIM_PERL_BOOT(GtkUI__Themes); + GAIM_PERL_BOOT(GtkUI__Utils); + GAIM_PERL_BOOT(GtkUI__Xfer); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2006-09-18 04:24:08
|
Revision: 17304 http://svn.sourceforge.net/gaim/?rev=17304&view=rev Author: deryni9 Date: 2006-09-17 21:24:03 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Typo and whitespace change. Modified Paths: -------------- trunk/gtk/plugins/perl/Makefile.am trunk/gtk/plugins/perl/common/GtkUI.pm Modified: trunk/gtk/plugins/perl/Makefile.am =================================================================== --- trunk/gtk/plugins/perl/Makefile.am 2006-09-18 04:22:44 UTC (rev 17303) +++ trunk/gtk/plugins/perl/Makefile.am 2006-09-18 04:24:03 UTC (rev 17304) @@ -61,7 +61,7 @@ done # Evil Hack (TM) -# ... which doesn't work with DESTDIR installs. FIXME? +# ... which doesn't work with DESTDIR installs. FIXME? uninstall-local: @for dir in $(perl_dirs); do \ cd $$dir && \ Modified: trunk/gtk/plugins/perl/common/GtkUI.pm =================================================================== --- trunk/gtk/plugins/perl/common/GtkUI.pm 2006-09-18 04:22:44 UTC (rev 17303) +++ trunk/gtk/plugins/perl/common/GtkUI.pm 2006-09-18 04:24:03 UTC (rev 17304) @@ -33,7 +33,7 @@ This module provides the interface for using perl scripts as plugins in Gaim, with access to the Gaim Gtk interface functions. With this, developers can write perl scripts that can be loaded in Gaim as plugins. The script can -interact with IMs, chats, accoutns, the buddy list, gaim signals, and more. +interact with IMs, chats, accounts, the buddy list, gaim signals, and more. The API for the perl interface is very similar to that of the Gaim C API, which can be viewed at http://gaim.sourceforge.net/api/ or in the header files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2006-09-18 04:22:59
|
Revision: 17303 http://svn.sourceforge.net/gaim/?rev=17303&view=rev Author: deryni9 Date: 2006-09-17 21:22:44 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Remove a bunch of functions that are commented out because they can't work currently, they'll come back if I can get the actual Gtk2 perl stuff to not crash, but they were just taking up space and getting in my way (since they are removed already in my other tree). Modified Paths: -------------- trunk/gtk/plugins/perl/common/GtkBlist.xs trunk/gtk/plugins/perl/common/GtkConv.xs trunk/gtk/plugins/perl/common/GtkPlugin.xs trunk/gtk/plugins/perl/common/GtkPluginPref.xs trunk/gtk/plugins/perl/common/GtkPrefs.xs trunk/gtk/plugins/perl/common/GtkSavedStatuses.xs trunk/gtk/plugins/perl/common/GtkUtils.xs Modified: trunk/gtk/plugins/perl/common/GtkBlist.xs =================================================================== --- trunk/gtk/plugins/perl/common/GtkBlist.xs 2006-09-18 03:17:11 UTC (rev 17302) +++ trunk/gtk/plugins/perl/common/GtkBlist.xs 2006-09-18 04:22:44 UTC (rev 17303) @@ -1,43 +1,5 @@ #include "gtkmodule.h" -/* This can't work at the moment since I don't have a typemap for Gtk::Widget. - * I thought about using the one from libgtk2-perl but wasn't sure how to go - * about doing that. - -void -gaim_gtk_blist_make_buddy_menu(menu, buddy, sub) - Gtk::Widget menu - Gaim::Buddy buddy - gboolean sub -*/ - -/* This can't work at the moment since I don't have a typemap for Gdk::Pixbuf. - * I thought about using the one from libgtk2-perl but wasn't sure how to go - * about doing that. - -GdkPixbuf -gaim_gtk_blist_get_status_icon(node, size) - Gaim::BuddyList::Node node - Gaim::Status::IconSize size -*/ - -/* This can't work at the moment since I don't have a typemap for Gtk::Widget. - * I thought about using the one from libgtk2-perl but wasn't sure how to go - * about doing that. - -void -gaim_gtk_append_blist_node_proto_menu(menu, gc, node) - Gtk::Widget menu - Gaim::Connection gc - Gaim::BuddyList::Node node - -void -gaim_gtk_append_blist_node_extended_menu(menu, node) - Gtk::Widget menu - Gaim::Connection gc - Gaim::BuddyList::Node node -*/ - MODULE = Gaim::GtkUI::BuddyList PACKAGE = Gaim::GtkUI::BuddyList PREFIX = gaim_gtk_blist_ PROTOTYPES: ENABLE Modified: trunk/gtk/plugins/perl/common/GtkConv.xs =================================================================== --- trunk/gtk/plugins/perl/common/GtkConv.xs 2006-09-18 03:17:11 UTC (rev 17302) +++ trunk/gtk/plugins/perl/common/GtkConv.xs 2006-09-18 04:22:44 UTC (rev 17303) @@ -1,44 +1,5 @@ #include "gtkmodule.h" -/* This can't work at the moment since I don't have a typemap for Gtk::Widget. - * I thought about using the one from libgtk2-perl but wasn't sure how to go - * about doing that. -guint -gaim_gtk_conversations_fill_menu(menu, convs) - Gtk::Widget menu - SV *convs -PREINIT: - GList *t_GL; - int i, t_len; -PPCODE: - t_GL = NULL; - t_len = av_len((AV *)SvRV(convs)); - - for (i = 0; i < t_len; i++) { - STRLEN t_sl; - t_GL = g_list_append(t_GL, SvPV(*av_fetch((AV *)SvRV(convs), i, 0), t_sl)); - } - gaim_gtk_conversations_fill_menu(menu, t_GL); -*/ - -/* This can't work at the moment since I don't have a typemap for Gtk::Widget. - * I thought about using the one from libgtk2-perl but wasn't sure how to go - * about doing that. -GdkPixbuf -gaim_gtkconv_get_tab_icon(conv, small_icon) - Gaim::Conversation conv - gboolean small_icon -*/ - -/* This can't work at the moment since I don't have a typemap for gboolean *. -int -gaim_gtkconv_get_tab_at_xy(win, x, y, to_right) - Gaim::GtkUI::Conversation::Window win - int x - int y - gboolean * to_right -*/ - MODULE = Gaim::GtkUI::Conversation PACKAGE = Gaim::GtkUI::Conversation PREFIX = gaim_gtkconv_ PROTOTYPES: ENABLE Modified: trunk/gtk/plugins/perl/common/GtkPlugin.xs =================================================================== --- trunk/gtk/plugins/perl/common/GtkPlugin.xs 2006-09-18 03:17:11 UTC (rev 17302) +++ trunk/gtk/plugins/perl/common/GtkPlugin.xs 2006-09-18 04:22:44 UTC (rev 17303) @@ -1,16 +1,5 @@ #include "gtkmodule.h" -/* This can't work at the moment since I don't have a typemap for Gtk::Widget. - * I thought about using the one from libgtk2-perl but wasn't sure how to go - * about doing that. -Gtk::Widget -gaim_gtk_plugin_get_config_frame(plugin) - Gaim::Plugin plugin -*/ - -MODULE = Gaim::GtkUI::Plugin PACKAGE = Gaim::GtkUI::Plugin PREFIX = gaim_gtk_plugin_ -PROTOTYPES: ENABLE - MODULE = Gaim::GtkUI::Plugin PACKAGE = Gaim::GtkUI::Plugins PREFIX = gaim_gtk_plugins_ PROTOTYPES: ENABLE Modified: trunk/gtk/plugins/perl/common/GtkPluginPref.xs =================================================================== --- trunk/gtk/plugins/perl/common/GtkPluginPref.xs 2006-09-18 03:17:11 UTC (rev 17302) +++ trunk/gtk/plugins/perl/common/GtkPluginPref.xs 2006-09-18 04:22:44 UTC (rev 17303) @@ -1,12 +1,4 @@ #include "gtkmodule.h" -/* This can't work at the moment since I don't have a typemap for Gtk::Widget. - * I thought about using the one from libgtk2-perl but wasn't sure how to go - * about doing that. -Gtk::Widget -gaim_gtk_plugin_pref_create_frame(frame) - Gaim::PluginPref::Frame frame -*/ - MODULE = Gaim::GtkUI::PluginPref PACKAGE = Gaim::GtkUI::PluginPref PREFIX = gaim_gtk_plugin_pref_ PROTOTYPES: ENABLE Modified: trunk/gtk/plugins/perl/common/GtkPrefs.xs =================================================================== --- trunk/gtk/plugins/perl/common/GtkPrefs.xs 2006-09-18 03:17:11 UTC (rev 17302) +++ trunk/gtk/plugins/perl/common/GtkPrefs.xs 2006-09-18 04:22:44 UTC (rev 17303) @@ -1,72 +1,5 @@ #include "gtkmodule.h" -/* This can't work at the moment since I don't have a typemap for Gtk::Widget. - * I thought about using the one from libgtk2-perl but wasn't sure how to go - * about doing that. -Gtk::Widget -gaim_gtk_prefs_checkbox(title, key, page) - const char * title - const char * key - Gtk::Widget page - -Gtk::Widget -gaim_gtk_prefs_labeled_spin_button(page, title, key, min, max, sg) - Gtk::Widget page - const gchar * title - const char * key - int min - int max - Gtk::Size::Group sg - -Gtk::Widget -gaim_gtk_prefs_labeled_entry(page, title, key, sg) - Gtk::Widget page - const gchar * title - const char * key - Gtk::Size::Group sg - -TODO Test this carefully, I'm not at all confident in the loop. -Gtk::Widget -gaim_gtk_prefs_dropdown(page, title, type, key, ...) - Gtk::Widget page - const gchar * title - Gaim::Pref::Type type - const char * key -PREINIT: - GList *t_GL; - int i; -CODE: - t_GL = NULL; - for (i = 0; i < items; i++) { - if (type == GAIM_PREF_INT || type == GAIM_PREF_BOOLEAN) { - t_GL = g_list_append(t_GL, SvIV(ST(i+1))); - else { - t_GL = g_list_append(t_GL, SvPV(ST(i+1))); - } - } - -Gtk::Widget -gaim_gtk_prefs_dropdown_from_list(page, title, type, key, menuitems) - Gtk::Widget page - const gchar * title - Gaim::Pref::Type type - const char * key - SV *menuitems -PREINIT: - GList *t_GL; - int i, t_len; -CODE: - t_GL = NULL; - t_len = av_len((AV *)SvRV(menuitems)); - - for ( i = 0; i < t_len; i++) { - STRLEN t_sl; - t_GL = g_list_append(t_GL, SvPV(*av_fetch((AV *)SvRV(menuitems), i, 0), t_sl)); - RETVAL = gaim_gtk_prefs_dropdown_from_list(page, title, type, key, t_GL); -OUTPUT: - RETVAL -*/ - MODULE = Gaim::GtkUI::Prefs PACKAGE = Gaim::GtkUI::Prefs PREFIX = gaim_gtk_prefs_ PROTOTYPES: ENABLE Modified: trunk/gtk/plugins/perl/common/GtkSavedStatuses.xs =================================================================== --- trunk/gtk/plugins/perl/common/GtkSavedStatuses.xs 2006-09-18 03:17:11 UTC (rev 17302) +++ trunk/gtk/plugins/perl/common/GtkSavedStatuses.xs 2006-09-18 04:22:44 UTC (rev 17303) @@ -1,16 +1,5 @@ #include "gtkmodule.h" -/* This can't work at the moment since I don't have a typemap for Gtk::Widget. - * I thought about using the one from libgtk2-perl but wasn't sure how to go - * about doing that. - * This also has a GCallback issue that I have no idea how to deal with, - * though the core-perl typemap has a mapping for them. -Gtk::Widget -gaim_gtk_status_menu(status, callback) - Gaim::SavedStatus status - GCallback callback -*/ - MODULE = Gaim::GtkUI::Status PACKAGE = Gaim::GtkUI::Status PREFIX = gaim_gtk_status_ PROTOTYPES: ENABLE Modified: trunk/gtk/plugins/perl/common/GtkUtils.xs =================================================================== --- trunk/gtk/plugins/perl/common/GtkUtils.xs 2006-09-18 03:17:11 UTC (rev 17302) +++ trunk/gtk/plugins/perl/common/GtkUtils.xs 2006-09-18 04:22:44 UTC (rev 17303) @@ -1,197 +1,5 @@ #include "gtkmodule.h" -/* This can't work at the moment since I don't have a typemap for Gtk::Widget. - * I thought about using the one from libgtk2-perl but wasn't sure how to go - * about doing that. -void -gaim_setup_imhtml(imhtml) - Gtk::Widget imhtml - -Gtk::Widget -gaim_gtk_create_imhtml(editable, imhtml_ret, toolbar_ret, sw_ret) - gboolean editable - GtkWidget ** imhtml_ret - GtkWidget ** toolbar_ret - GtkWidget ** sw_ret - -void -gaim_gtk_toggle_sensitive(widget, to_toggle) - Gtk::Widget widget - Gtk::Widget to_toggle - -void -gaim_gtk_set_sensitive_if_input(entry, dialog) - Gtk::Widget entry - Gtk::Widget dialog - -void -gaim_gtk_toggle_sensitive_array(w, data) - Gtk::Widget w - GPtrArray data - -void -gaim_gtk_toggle_showhide(widget, to_toggle) - Gtk::Widget widget - Gtk::Widget to_toggle - -void -gaim_separator(menu) - Gtk::Widget menu - -Gtk::Widget -gaim_new_item(menu, str) - Gtk::Widget menu - const char * str - -Gtk::Widget -gaim_new_check_item(menu, str, sf, data, checked) - Gtk::Widget menu - const char * str - GtkSignalFunc sf - gpointer data - gboolean checked - -Gtk::Widget -gaim_new_item_from_stock(menu, str, icon, sf, data, accel_key, accel_mods, mod) - Gtk::Widget menu - const char * str - const char * icon - GtkSignalFunc sf - gpointer data - guint accel_key - guint accel_mods - char * mod - -Gtk::Widget -gaim_pixbuf_button_from_stock(text, icon, style) - const char * text - const char * icon - Gaim::ButtonOrientation style - -Gtk::Widget -gaim_gtk_make_frame(parent, title) - Gtk::Widget parent - const char * title - -Gtk::Widget -gaim_gtk_protocol_option_menu_new(id, cb, user_data) - const char * id - GCallback cb - gpointer user_data - -Gtk::Widget -gaim_gtk_account_option_menu_new(default_account, show_all, cb, filter_func, user_data) - Gaim::Account account - gboolean show_all - GCallback cb - Gaim::Account::FilterFunc filter_func - gpointer user_data - -Gaim::Account -gaim_gtk_account_option_menu_get_selected(optmenu) - Gtk::Widget optmenu - -void -gaim_gtk_account_option_menu_set_selected(optmenu, account) - Gtk::Widget optmenu - Gaim::Account account - -void -gaim_gtk_setup_screenname_autocomplete(entry, optmenu, all) - Gtk::Widget entry - Gtk::Widget optmenu - gboolean all - -gboolean -gaim_gtk_check_if_dir(path, filesel) - const char * path - Gtk::FileSelection filesel - -void -gaim_gtk_setup_gtkspell(textview) - Gtk::TextView textview - -void -gaim_gtk_save_accels_cb(accel_group, arg1, arg2, arg3, data) - Gtk::AccelGroup accel_group - guint arg1 - Gdk::ModifierType arg2 - GClosure arg3 - gpointer data -*/ - -/* TODO This needs GaimAccount ** -gboolean -gaim_gtk_parse_x_im_contact(msg, all_accounts, ret_account, ret_protocol, ret_username, ret_alias) - const char * msg - gboolean all_accounts - Gaim::Account ret_account - char ** ret_protocol - char ** ret_username - char ** ret_alias -*/ - -/* This can't work at the moment since I don't have a typemap for Gtk::Widget. - * I thought about using the one from libgtk2-perl but wasn't sure how to go - * about doing that. -void -gaim_set_accessible_lable(w, l) - Gtk::Widget w - Gtk::Widget l - -void -gaim_gtk_treeview_popup_menu_position_func(menu, x, y, push_in, user_data) - Gtk::Menu menu - gint x - gint y - gboolean push_in - gpointer user_data - -void -gaim_dnd_file_manage(sd, account, who) - Gtk::SelectionData sd - Gaim::Account account - const char * who - -void -gaim_gtk_buddy_icon_get_scale_size(buf, spec, width, height) - Gdk::Pixbuf buf - Gaim::Buddy::Icon::Spec spec - int width - int height - -Gdk::Pixbuf -gaim_gtk_create_prpl_icon(account, scale_factor) - const Gaim::Account account - double scale_factor - -Gdk::Pixbuf -gaim_gtk_create_prpl_icon_with_status(account, status_type, scale_factor) - const Gaim::Account account - Gaim::StatusType status_type - double scale_factor - -Gdk::Pixbuf -gaim_gtk_create_gaim_icon_with_status(primitive, scale_factor) - Gaim::StatusPrimitive primitive - double scale_factor - -void -gaim_gtk_append_menu_action(menu, act, gobject) - Gtk::Widget menu - Gaim::Menu::Action act - gpointer gobject - -void -gaim_gtk_set_cursor(widget, cursor_type) - Gtk::Widget widget - Gdk::CursorType cursor_type - -void -gaim_gtk_clear_cursor(widget) - Gtk::Widget widget -*/ - MODULE = Gaim::GtkUI::Utils PACKAGE = Gaim::GtkUI::Utils PREFIX = gaim_gtk_utils_ PROTOTYPES: ENABLE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2006-09-18 03:17:16
|
Revision: 17302 http://svn.sourceforge.net/gaim/?rev=17302&view=rev Author: sadrul Date: 2006-09-17 20:17:11 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Auto-completion can have non-alpha characters. Modified Paths: -------------- trunk/console/libgnt/gntentry.c Modified: trunk/console/libgnt/gntentry.c =================================================================== --- trunk/console/libgnt/gntentry.c 2006-09-18 02:53:54 UTC (rev 17301) +++ trunk/console/libgnt/gntentry.c 2006-09-18 03:17:11 UTC (rev 17302) @@ -31,7 +31,7 @@ while (s > entry->start) { char *t = g_utf8_find_prev_char(entry->start, s); - if ((*t < 'A' || *t > 'Z') && (*t < 'a' || *t > 'z')) + if (isspace(*t)) break; s = t; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-09-18 02:54:01
|
Revision: 17301 http://svn.sourceforge.net/gaim/?rev=17301&view=rev Author: rlaager Date: 2006-09-17 19:53:54 -0700 (Sun, 17 Sep 2006) Log Message: ----------- SF Patch #1560154 from Patrick Cheung This changes two #include <foo.h> lines to #include "foo.h" for local headers. Modified Paths: -------------- trunk/COPYRIGHT trunk/libgaim/imgstore.c Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2006-09-18 01:13:07 UTC (rev 17300) +++ trunk/COPYRIGHT 2006-09-18 02:53:54 UTC (rev 17301) @@ -49,6 +49,7 @@ Cerulean Studios, LLC Jonathan Champ Christophe Chapuis +Patrick Cheung Ka-Hing Cheung Sadrul Habib Chowdhury Brian Chu Modified: trunk/libgaim/imgstore.c =================================================================== --- trunk/libgaim/imgstore.c 2006-09-18 01:13:07 UTC (rev 17300) +++ trunk/libgaim/imgstore.c 2006-09-18 02:53:54 UTC (rev 17301) @@ -25,8 +25,8 @@ */ #include <glib.h> -#include <debug.h> -#include <imgstore.h> +#include "debug.h" +#include "imgstore.h" static GSList *imgstore = NULL; static int nextid = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-09-18 01:13:43
|
Revision: 17300 http://svn.sourceforge.net/gaim/?rev=17300&view=rev Author: datallah Date: 2006-09-17 18:13:07 -0700 (Sun, 17 Sep 2006) Log Message: ----------- Fix mingw makefile .PHONY targets. Fix gtkwin32dep.h missing includes. Modified Paths: -------------- trunk/Makefile.mingw trunk/README.mingw trunk/gtk/Makefile.mingw trunk/gtk/pixmaps/Makefile.mingw trunk/gtk/pixmaps/smileys/Makefile.mingw trunk/gtk/pixmaps/smileys/default/Makefile.mingw trunk/gtk/pixmaps/smileys/none/Makefile.mingw trunk/gtk/plugins/Makefile.mingw trunk/gtk/plugins/docklet/Makefile.mingw trunk/gtk/plugins/perl/Makefile.mingw trunk/gtk/plugins/perl/common/Makefile.mingw trunk/gtk/plugins/ticker/Makefile.mingw trunk/gtk/plugins/win32/transparency/Makefile.mingw trunk/gtk/plugins/win32/winprefs/Makefile.mingw trunk/gtk/sounds/Makefile.mingw trunk/gtk/win32/IdleTracker/Makefile.mingw trunk/gtk/win32/gtkwin32dep.h trunk/libgaim/Makefile.mingw trunk/libgaim/plugins/Makefile.mingw trunk/libgaim/plugins/perl/Makefile.mingw trunk/libgaim/plugins/perl/common/Makefile.mingw trunk/libgaim/plugins/ssl/Makefile.mingw trunk/libgaim/plugins/tcl/Makefile.mingw trunk/libgaim/protocols/Makefile.mingw trunk/libgaim/protocols/bonjour/Makefile.mingw trunk/libgaim/protocols/gg/Makefile.mingw trunk/libgaim/protocols/irc/Makefile.mingw trunk/libgaim/protocols/jabber/Makefile.mingw trunk/libgaim/protocols/msn/Makefile.mingw trunk/libgaim/protocols/novell/Makefile.mingw trunk/libgaim/protocols/oscar/Makefile.mingw trunk/libgaim/protocols/qq/Makefile.mingw trunk/libgaim/protocols/sametime/Makefile.mingw trunk/libgaim/protocols/silc/Makefile.mingw trunk/libgaim/protocols/simple/Makefile.mingw trunk/libgaim/protocols/toc/Makefile.mingw trunk/libgaim/protocols/yahoo/Makefile.mingw trunk/libgaim/protocols/zephyr/Makefile.mingw trunk/po/Makefile.mingw Modified: trunk/Makefile.mingw =================================================================== --- trunk/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -31,6 +31,7 @@ exit; \ }' VERSION) +.PHONY: all install installer installer_nogtk installer_debug installers clean all: $(GAIM_CONFIG_H) $(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) @@ -57,8 +58,7 @@ $(MAKE) -C $(GAIM_PO_TOP) -f $(GAIM_WIN32_MAKEFILE) clean $(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) clean $(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) clean - rm -rf $(GAIM_CONFIG_H) - rm -rf gaim*.exe + rm -f $(GAIM_CONFIG_H) gaim*.exe rm -rf $(GAIM_INSTALL_PERLMOD_DIR) $(GAIM_INSTALL_PLUGINS_DIR) $(GAIM_INSTALL_PO_DIR) $(GAIM_INSTALL_DIR) include $(GAIM_COMMON_TARGETS) Modified: trunk/README.mingw =================================================================== --- trunk/README.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/README.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -1,10 +1,6 @@ -How to build Gaim using MinGw +How to build Gaim using MinGW ============================= -Since these instructions are constantly changing and in order for me to -avoid maintaining two versions of these instructions please refer to: +Since these instructions are constantly changing, please refer to: -http://gaim.sourceforge.net/win32 - -- Herman - +http://gaim.sourceforge.net/win32/build.php Modified: trunk/gtk/Makefile.mingw =================================================================== --- trunk/gtk/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -129,7 +129,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean clean_exe +.PHONY: all install clean clean_exe all: $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll $(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) Modified: trunk/gtk/pixmaps/Makefile.mingw =================================================================== --- trunk/gtk/pixmaps/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/pixmaps/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -10,6 +10,8 @@ datadir := $(GAIM_INSTALL_DIR) include ./Makefile.am +.PHONY: install + install: if test '$(SUBDIRS)'; then \ list='$(SUBDIRS)'; for subdir in $$list; do \ Modified: trunk/gtk/pixmaps/smileys/Makefile.mingw =================================================================== --- trunk/gtk/pixmaps/smileys/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/pixmaps/smileys/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -6,6 +6,8 @@ include ./Makefile.am +.PHONY: install + install: if test '$(SUBDIRS)'; then \ list='$(SUBDIRS)'; for subdir in $$list; do \ Modified: trunk/gtk/pixmaps/smileys/default/Makefile.mingw =================================================================== --- trunk/gtk/pixmaps/smileys/default/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/pixmaps/smileys/default/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -10,6 +10,8 @@ datadir = $(GAIM_INSTALL_DIR) include ./Makefile.am +.PHONY: install + install: if test '$(gaimsmileypix_DATA)'; then \ mkdir -p $(gaimsmileypixdir); \ Modified: trunk/gtk/pixmaps/smileys/none/Makefile.mingw =================================================================== --- trunk/gtk/pixmaps/smileys/none/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/pixmaps/smileys/none/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -10,6 +10,8 @@ datadir = $(GAIM_INSTALL_DIR) include ./Makefile.am +.PHONY: install + install: if test '$(gaimsmileypix_DATA)'; then \ mkdir -p $(gaimsmileypixdir); \ Modified: trunk/gtk/plugins/Makefile.mingw =================================================================== --- trunk/gtk/plugins/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/plugins/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -55,7 +55,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all clean plugins install all: plugins $(MAKE) -C $(DOCKLET_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) @@ -64,7 +64,7 @@ $(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) $(MAKE) -C $(WINPREFS_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) -install: $(GAIM_INSTALL_PLUGINS_DIR) +install: all $(GAIM_INSTALL_PLUGINS_DIR) $(MAKE) -C $(DOCKLET_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install $(MAKE) -C $(GTKPERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install $(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install @@ -91,8 +91,7 @@ ## CLEAN RULES ## clean: - rm -f *.o - rm -f *.dll + rm -f *.o *.dll $(MAKE) -C $(DOCKLET_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean $(MAKE) -C $(GTKPERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean $(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean Modified: trunk/gtk/plugins/docklet/Makefile.mingw =================================================================== --- trunk/gtk/plugins/docklet/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/plugins/docklet/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -55,7 +55,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/gtk/plugins/perl/Makefile.mingw =================================================================== --- trunk/gtk/plugins/perl/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/plugins/perl/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -10,7 +10,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) Modified: trunk/gtk/plugins/perl/common/Makefile.mingw =================================================================== --- trunk/gtk/plugins/perl/common/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/plugins/perl/common/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -82,7 +82,7 @@ ## ## TARGETS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/gtk/plugins/ticker/Makefile.mingw =================================================================== --- trunk/gtk/plugins/ticker/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/plugins/ticker/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -55,7 +55,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/gtk/plugins/win32/transparency/Makefile.mingw =================================================================== --- trunk/gtk/plugins/win32/transparency/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/plugins/win32/transparency/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -55,7 +55,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/gtk/plugins/win32/winprefs/Makefile.mingw =================================================================== --- trunk/gtk/plugins/win32/winprefs/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/plugins/win32/winprefs/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -57,7 +57,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/gtk/sounds/Makefile.mingw =================================================================== --- trunk/gtk/sounds/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/sounds/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -10,6 +10,8 @@ datadir := $(GAIM_INSTALL_DIR) include ./Makefile.am +.PHONY: install + install: if test '$(sounds_DATA)'; then \ mkdir -p $(soundsdir); \ Modified: trunk/gtk/win32/IdleTracker/Makefile.mingw =================================================================== --- trunk/gtk/win32/IdleTracker/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/win32/IdleTracker/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -23,7 +23,7 @@ ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll @@ -42,8 +42,6 @@ ## clean: - rm -rf $(OBJECTS) - rm -rf $(TARGET).dll - rm -rf $(TARGET).dll.a + rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a include $(GAIM_COMMON_TARGETS) Modified: trunk/gtk/win32/gtkwin32dep.h =================================================================== --- trunk/gtk/win32/gtkwin32dep.h 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/gtk/win32/gtkwin32dep.h 2006-09-18 01:13:07 UTC (rev 17300) @@ -22,6 +22,8 @@ */ #ifndef _GTKWIN32DEP_H_ #define _GTKWIN32DEP_H_ +#include <windows.h> +#include <gtk/gtk.h> HINSTANCE gtkwgaim_hinstance(void); Modified: trunk/libgaim/Makefile.mingw =================================================================== --- trunk/libgaim/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -98,7 +98,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll $(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE) Modified: trunk/libgaim/plugins/Makefile.mingw =================================================================== --- trunk/libgaim/plugins/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/plugins/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -42,7 +42,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all clean plugins install all: $(GAIM_LIBGAIM_DLL).a plugins $(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) @@ -53,7 +53,7 @@ $(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install $(MAKE) -C $(TCL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install $(MAKE) -C $(SSL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install - cp $(GAIM_LIB_PLUGINS_TOP)/*.dll $(GAIM_INSTALL_PLUGINS_DIR) + cp *.dll $(GAIM_INSTALL_PLUGINS_DIR) .c.dll: $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $< @@ -69,8 +69,7 @@ ## CLEAN RULES ## clean: - rm -rf $(GAIM_LIB_PLUGINS_TOP)/*.o - rm -rf $(GAIM_LIB_PLUGINS_TOP)/*.dll + rm -f *.o *.dll $(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean $(MAKE) -C $(TCL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean $(MAKE) -C $(SSL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean Modified: trunk/libgaim/plugins/perl/Makefile.mingw =================================================================== --- trunk/libgaim/plugins/perl/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/plugins/perl/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -54,7 +54,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll $(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) Modified: trunk/libgaim/plugins/perl/common/Makefile.mingw =================================================================== --- trunk/libgaim/plugins/perl/common/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/plugins/perl/common/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -87,7 +87,7 @@ ## ## TARGETS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll $(AUTOSPLIT) Modified: trunk/libgaim/plugins/ssl/Makefile.mingw =================================================================== --- trunk/libgaim/plugins/ssl/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/plugins/ssl/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -64,7 +64,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll $(TARGET_NSS).dll @@ -88,7 +88,6 @@ ## CLEAN RULES ## clean: - rm -rf $(OBJECTS) $(OBJECTS_NSS) - rm -rf $(TARGET).dll $(TARGET_NSS).dll + rm -f $(OBJECTS) $(OBJECTS_NSS) $(TARGET).dll $(TARGET_NSS).dll include $(GAIM_COMMON_TARGETS) Modified: trunk/libgaim/plugins/tcl/Makefile.mingw =================================================================== --- trunk/libgaim/plugins/tcl/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/plugins/tcl/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -55,7 +55,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/libgaim/protocols/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -37,6 +37,8 @@ TOC_TYPE = PLUGIN YAHOO_TYPE = PLUGIN +.PHONY: all install clean + all: $(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f $(GAIM_WIN32_MAKEFILE) $(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f $(GAIM_WIN32_MAKEFILE) Modified: trunk/libgaim/protocols/bonjour/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/bonjour/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/bonjour/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -62,7 +62,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/libgaim/protocols/gg/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/gg/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/gg/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -69,7 +69,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/libgaim/protocols/irc/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/irc/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/irc/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -59,7 +59,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/libgaim/protocols/jabber/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/jabber/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/jabber/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -73,7 +73,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/libgaim/protocols/msn/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/msn/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/msn/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -83,7 +83,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/libgaim/protocols/novell/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/novell/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/novell/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -66,7 +66,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/libgaim/protocols/oscar/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/oscar/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/oscar/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -89,7 +89,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/libgaim/protocols/qq/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/qq/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/qq/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -89,7 +89,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/libgaim/protocols/sametime/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/sametime/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/sametime/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -59,7 +59,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/libgaim/protocols/silc/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/silc/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/silc/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -68,7 +68,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/libgaim/protocols/simple/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/simple/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/simple/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -56,7 +56,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/libgaim/protocols/toc/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/toc/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/toc/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -56,7 +56,7 @@ ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/libgaim/protocols/yahoo/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/yahoo/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/yahoo/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -67,7 +67,7 @@ ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/libgaim/protocols/zephyr/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/zephyr/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/libgaim/protocols/zephyr/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -127,7 +127,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll Modified: trunk/po/Makefile.mingw =================================================================== --- trunk/po/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) +++ trunk/po/Makefile.mingw 2006-09-18 01:13:07 UTC (rev 17300) @@ -1,5 +1,5 @@ # Makefile.mingw -# +# # Description: Makefile to generate mo files # @@ -28,6 +28,8 @@ ## TARGETS ## +.PHONY: all install clean + all: $(CATALOGS) install: all This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-09-18 00:04:17
|
Revision: 17299 http://svn.sourceforge.net/gaim/?rev=17299&view=rev Author: datallah Date: 2006-09-17 17:04:14 -0700 (Sun, 17 Sep 2006) Log Message: ----------- fix build Modified Paths: -------------- trunk/gtk/plugins/perl/common/Makefile.mingw Modified: trunk/gtk/plugins/perl/common/Makefile.mingw =================================================================== --- trunk/gtk/plugins/perl/common/Makefile.mingw 2006-09-17 23:13:55 UTC (rev 17298) +++ trunk/gtk/plugins/perl/common/Makefile.mingw 2006-09-18 00:04:14 UTC (rev 17299) @@ -19,6 +19,7 @@ -I$(GAIM_TOP) \ -I$(GAIM_LIB_TOP) \ -I$(GAIM_GTK_TOP) \ + -I$(GAIM_GTK_TOP)/win32 \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/atk-1.0 \ -I$(GTK_TOP)/include/glib-2.0 \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-09-17 23:14:05
|
Revision: 17298 http://svn.sourceforge.net/gaim/?rev=17298&view=rev Author: datallah Date: 2006-09-17 16:13:55 -0700 (Sun, 17 Sep 2006) Log Message: ----------- On win32, ensure that conversation windows are initially put in a sane place (instead of just [0,0]). This can easily be extended to any other problematic windows. I should have done this a long time ago to prevent countless bug reports. Modified Paths: -------------- trunk/gtk/gtkconv.c trunk/gtk/gtkgaim.h trunk/gtk/gtkmain.c trunk/gtk/gtknotify.c trunk/gtk/gtkprefs.c trunk/gtk/win32/gtkwin32dep.c trunk/gtk/win32/gtkwin32dep.h Modified: trunk/gtk/gtkconv.c =================================================================== --- trunk/gtk/gtkconv.c 2006-09-17 22:43:01 UTC (rev 17297) +++ trunk/gtk/gtkconv.c 2006-09-17 23:13:55 UTC (rev 17298) @@ -5550,7 +5550,6 @@ (gaim_blist_find_chat(account, gaim_conversation_get_name(conv)) != NULL)); } - } else { /* Account is offline */ /* Or it's a chat that we've left. */ @@ -7503,6 +7502,11 @@ gtk_widget_show(testidea); +#ifdef _WIN32 + g_signal_connect(G_OBJECT(win->window), "show", + G_CALLBACK(gtkwgaim_ensure_onscreen), win->window); +#endif + return win; } Modified: trunk/gtk/gtkgaim.h =================================================================== --- trunk/gtk/gtkgaim.h 2006-09-17 22:43:01 UTC (rev 17297) +++ trunk/gtk/gtkgaim.h 2006-09-17 23:13:55 UTC (rev 17298) @@ -32,6 +32,10 @@ #include <gtk/gtk.h> +#ifdef _WIN32 +# include "gtkwin32dep.h" +#endif + /** * Our UI's identifier. */ Modified: trunk/gtk/gtkmain.c =================================================================== --- trunk/gtk/gtkmain.c 2006-09-17 22:43:01 UTC (rev 17297) +++ trunk/gtk/gtkmain.c 2006-09-17 23:13:55 UTC (rev 17298) @@ -77,12 +77,8 @@ # include <gdk/gdkx.h> #endif -#ifdef _WIN32 -# include "gtkwin32dep.h" -#endif - #ifdef HAVE_STARTUP_NOTIFICATION static SnLauncheeContext *sn_context = NULL; static SnDisplay *sn_display = NULL; @@ -476,17 +472,15 @@ int sig_indx; /* for setting up signal catching */ sigset_t sigset; RETSIGTYPE (*prev_sig_disp)(int); -#endif - int opt; - gboolean gui_check; - gboolean debug_enabled; -#ifdef HAVE_SIGNAL_H char errmsg[BUFSIZ]; #ifndef DEBUG char *segfault_message_tmp; GError *error = NULL; #endif #endif + int opt; + gboolean gui_check; + gboolean debug_enabled; struct option long_options[] = { {"config", required_argument, NULL, 'c'}, Modified: trunk/gtk/gtknotify.c =================================================================== --- trunk/gtk/gtknotify.c 2006-09-17 22:43:01 UTC (rev 17297) +++ trunk/gtk/gtknotify.c 2006-09-17 23:13:55 UTC (rev 17298) @@ -38,10 +38,6 @@ #include "gtknotify.h" #include "gtkutils.h" -#ifdef _WIN32 -# include "gtkwin32dep.h" -#endif - typedef struct { GaimConnection *gc; Modified: trunk/gtk/gtkprefs.c =================================================================== --- trunk/gtk/gtkprefs.c 2006-09-17 22:43:01 UTC (rev 17297) +++ trunk/gtk/gtkprefs.c 2006-09-17 23:13:55 UTC (rev 17298) @@ -50,10 +50,6 @@ #include "gtkutils.h" #include "gaimstock.h" -#ifdef _WIN32 -# include "gtkwin32dep.h" -#endif - #define PROXYHOST 0 #define PROXYPORT 1 #define PROXYUSER 2 @@ -2080,7 +2076,7 @@ /* Convert old queuing prefs to hide_new 3-way pref. */ if (gaim_prefs_exists("/plugins/gtk/docklet/queue_messages") && - gaim_prefs_get_bool("/plugins/gtk/docklet/queue_messages")) + gaim_prefs_get_bool("/plugins/gtk/docklet/queue_messages")) { gaim_prefs_set_string("/gaim/gtk/conversations/im/hide_new", "always"); } Modified: trunk/gtk/win32/gtkwin32dep.c =================================================================== --- trunk/gtk/win32/gtkwin32dep.c 2006-09-17 22:43:01 UTC (rev 17297) +++ trunk/gtk/win32/gtkwin32dep.c 2006-09-17 23:13:55 UTC (rev 17298) @@ -23,6 +23,9 @@ * */ #define _WIN32_IE 0x500 +#ifndef WINVER +#define WINVER 0x0500 /* W2K */ +#endif #include <windows.h> #include <io.h> #include <stdlib.h> @@ -32,6 +35,7 @@ #include <glib.h> #include <glib/gstdio.h> #include <gtk/gtk.h> +#include <gdk/gdkwin32.h> #include "gaim.h" #include "debug.h" @@ -46,6 +50,8 @@ #include "gtkwin32dep.h" +#include "win32dep.h" + #include "wspell.h" /* @@ -147,7 +153,7 @@ uri, (int) wsinfo.hInstApp); g_free(w_uri); - } else { + } else { SHELLEXECUTEINFOA sinfo; gchar *locale_uri; @@ -248,7 +254,85 @@ } /* DLL initializer */ -BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) { +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { gtkgaimdll_hInstance = hinstDLL; return TRUE; } + +typedef HMONITOR WINAPI gaim_MonitorFromWindow(HWND, DWORD); +typedef BOOL WINAPI gaim_GetMonitorInfo(HMONITOR, LPMONITORINFO); + +static gboolean +get_WorkingAreaRectForWindow(HWND hwnd, RECT *workingAreaRc) { + static gaim_MonitorFromWindow *the_MonitorFromWindow; + static gaim_GetMonitorInfo *the_GetMonitorInfo; + static gboolean initialized = FALSE; + + HMONITOR monitor; + MONITORINFO info; + + if(!initialized) { + the_MonitorFromWindow = (gaim_MonitorFromWindow*) + wgaim_find_and_loadproc("user32", "MonitorFromWindow"); + the_GetMonitorInfo = (gaim_GetMonitorInfo*) + wgaim_find_and_loadproc("user32", "GetMonitorInfoA"); + initialized = TRUE; + } + + if(!the_MonitorFromWindow) + return FALSE; + + if(!the_GetMonitorInfo) + return FALSE; + + monitor = the_MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY); + + info.cbSize = sizeof(info); + if(!the_GetMonitorInfo(monitor, &info)) + return FALSE; + + CopyRect(workingAreaRc, &(info.rcWork)); + return TRUE; +} + +void gtkwgaim_ensure_onscreen(GtkWidget *win) { + RECT windowRect, workingAreaRect, intersectionRect; + HWND hwnd = GDK_WINDOW_HWND(win->window); + + g_return_if_fail(hwnd != NULL); + GetWindowRect(hwnd, &windowRect); + + gaim_debug_info("win32placement", + "Window RECT: L:%ld R:%ld T:%ld B:%ld\n", + windowRect.left, windowRect.right, + windowRect.top, windowRect.bottom); + + if(!get_WorkingAreaRectForWindow(hwnd, &workingAreaRect)) { + gaim_debug_info("win32placement", + "Couldn't get multimonitor working area\n"); + if(!SystemParametersInfo(SPI_GETWORKAREA, 0, &workingAreaRect, FALSE)) { + /* I don't think this will ever happen */ + workingAreaRect.left = 0; + workingAreaRect.top = 0; + workingAreaRect.bottom = GetSystemMetrics(SM_CYSCREEN); + workingAreaRect.right = GetSystemMetrics(SM_CXSCREEN); + } + } + + gaim_debug_info("win32placement", + "Working Area RECT: L:%ld R:%ld T:%ld B:%ld\n", + workingAreaRect.left, workingAreaRect.right, + workingAreaRect.top, workingAreaRect.bottom); + + /** If the conversation window doesn't intersect perfectly with the working area, + * move it to the top left corner of the working area */ + if(!(IntersectRect(&intersectionRect, &windowRect, &workingAreaRect) + && EqualRect(&intersectionRect, &windowRect))) { + gaim_debug_info("win32placement", + "conversation window out of working area, relocating\n"); + MoveWindow(hwnd, workingAreaRect.left, workingAreaRect.top, + (windowRect.right - windowRect.left), + (windowRect.bottom - windowRect.top), TRUE); + } +} + Modified: trunk/gtk/win32/gtkwin32dep.h =================================================================== --- trunk/gtk/win32/gtkwin32dep.h 2006-09-17 22:43:01 UTC (rev 17297) +++ trunk/gtk/win32/gtkwin32dep.h 2006-09-17 23:13:55 UTC (rev 17298) @@ -28,6 +28,7 @@ /* Utility */ int gtkwgaim_gz_decompress(const char* in, const char* out); int gtkwgaim_gz_untar(const char* filename, const char* destdir); +void gtkwgaim_ensure_onscreen(GtkWidget *win); /* Misc */ void gtkwgaim_notify_uri(const char *uri); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |