Menu
▾
▴
pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits
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: <sa...@us...> - 2006-09-17 22:43:17
|
Revision: 17297
http://svn.sourceforge.net/gaim/?rev=17297&view=rev
Author: sadrul
Date: 2006-09-17 15:43:01 -0700 (Sun, 17 Sep 2006)
Log Message:
-----------
Use the correct function for send_raw in jabber.
Modified Paths:
--------------
trunk/libgaim/protocols/jabber/jabber.c
Modified: trunk/libgaim/protocols/jabber/jabber.c
===================================================================
--- trunk/libgaim/protocols/jabber/jabber.c 2006-09-17 21:29:59 UTC (rev 17296)
+++ trunk/libgaim/protocols/jabber/jabber.c 2006-09-17 22:43:01 UTC (rev 17297)
@@ -328,7 +328,7 @@
return;
}
-int jabber_prpl_send_raw(GaimConnection *gc, const char *buf, int len)
+static int jabber_prpl_send_raw(GaimConnection *gc, const char *buf, int len)
{
JabberStream *js = (JabberStream*)gc->proto_data;
jabber_send_raw(js, buf, len);
@@ -1891,7 +1891,7 @@
jabber_si_new_xfer, /* new_xfer */
jabber_offline_message, /* offline_message */
NULL, /* whiteboard_prpl_ops */
- jabber_send_raw, /* send_raw */
+ jabber_prpl_send_raw, /* send_raw */
};
static gboolean load_plugin(GaimPlugin *plugin)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-09-17 21:30:05
|
Revision: 17296
http://svn.sourceforge.net/gaim/?rev=17296&view=rev
Author: datallah
Date: 2006-09-17 14:29:59 -0700 (Sun, 17 Sep 2006)
Log Message:
-----------
"all" should be the default target
Modified Paths:
--------------
trunk/gtk/Makefile.mingw
Modified: trunk/gtk/Makefile.mingw
===================================================================
--- trunk/gtk/Makefile.mingw 2006-09-17 19:25:00 UTC (rev 17295)
+++ trunk/gtk/Makefile.mingw 2006-09-17 21:29:59 UTC (rev 17296)
@@ -131,14 +131,14 @@
##
.PHONY: all clean clean_exe
+all: $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll
+ $(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE)
+
./win32/gaimrc.rc: ./win32/gaimrc.rc.in $(GAIM_TOP)/VERSION
sed -e 's/@GAIM_VERSION@/$(GAIM_VERSION)/g' \
-e 's/@ORIGINAL_FILENAME@/$(EXE_NAME)/' \
$@.in > $@
-all: $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll
- $(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE)
-
install: all $(GAIM_INSTALL_DIR)
$(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
$(MAKE) -C $(GAIM_GTK_PIXMAPS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-09-17 19:25:05
|
Revision: 17295
http://svn.sourceforge.net/gaim/?rev=17295&view=rev
Author: datallah
Date: 2006-09-17 12:25:00 -0700 (Sun, 17 Sep 2006)
Log Message:
-----------
Compile fixes
Modified Paths:
--------------
trunk/gtk/Makefile.mingw
trunk/gtk/plugins/perl/common/Makefile.mingw
Modified: trunk/gtk/Makefile.mingw
===================================================================
--- trunk/gtk/Makefile.mingw 2006-09-17 07:09:54 UTC (rev 17294)
+++ trunk/gtk/Makefile.mingw 2006-09-17 19:25:00 UTC (rev 17295)
@@ -60,6 +60,7 @@
gtkblist.c \
gtkconn.c \
gtkconv.c \
+ gtkcellrendererexpander.c \
gtkcellrendererprogress.c \
gtkdebug.c \
gtkdialogs.c \
Modified: trunk/gtk/plugins/perl/common/Makefile.mingw
===================================================================
--- trunk/gtk/plugins/perl/common/Makefile.mingw 2006-09-17 07:09:54 UTC (rev 17294)
+++ trunk/gtk/plugins/perl/common/Makefile.mingw 2006-09-17 19:25:00 UTC (rev 17295)
@@ -7,7 +7,7 @@
GAIM_TOP := ../../../..
include $(GAIM_TOP)/libgaim/win32/global.mak
-TARGET = Gtk
+TARGET = GtkUI
EXTUTILS := C:/perl/lib/ExtUtils
CFLAGS += -Wno-comment
@@ -38,7 +38,7 @@
## SOURCES, OBJECTS
##
XS_FILES = \
- Gtk.xs \
+ GtkUI.xs \
GtkAccount.xs \
GtkBlist.xs \
GtkConn.xs \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2006-09-17 07:10:00
|
Revision: 17294
http://svn.sourceforge.net/gaim/?rev=17294&view=rev
Author: deryni9
Date: 2006-09-17 00:09:54 -0700 (Sun, 17 Sep 2006)
Log Message:
-----------
These were getting in the way of some other things I was working on. Stupid
svn.
Modified Paths:
--------------
trunk/gtk/plugins/perl/common/GtkIMHtml.xs
Modified: trunk/gtk/plugins/perl/common/GtkIMHtml.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkIMHtml.xs 2006-09-17 06:30:12 UTC (rev 17293)
+++ trunk/gtk/plugins/perl/common/GtkIMHtml.xs 2006-09-17 07:09:54 UTC (rev 17294)
@@ -307,7 +307,7 @@
gtk_imhtml_get_markup(imhtml)
Gaim::GtkUI::IMHtml imhtml
-# ETAN Test this, and document well that it returns an arrayref
+# /* ETAN Test this, and document well that it returns an arrayref */
void
gtk_imhtml_get_markup_lines(imhtml)
Gaim::GtkUI::IMHtml imhtml
@@ -318,7 +318,7 @@
PPCODE:
bufs = gtk_imhtml_get_markup_lines(imhtml);
lines = newAV();
- for (i = 0; bufs[i]; i++) {
+ for (i = 0; bufs[i] != NULL; i++) {
av_push(lines, newSVpv(bufs[i], 0));
}
XPUSHs(sv_2mortal(newRV_noinc((SV *)lines)));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2006-09-17 06:30:17
|
Revision: 17293
http://svn.sourceforge.net/gaim/?rev=17293&view=rev
Author: deryni9
Date: 2006-09-16 23:30:12 -0700 (Sat, 16 Sep 2006)
Log Message:
-----------
Here's the oops connected to my big commit, I knew there would be at least
one. Fix the main gtkperl module bootstrap stuff.
Modified Paths:
--------------
trunk/gtk/plugins/perl/common/GtkUI.xs
Modified: trunk/gtk/plugins/perl/common/GtkUI.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkUI.xs 2006-09-17 05:44:22 UTC (rev 17292)
+++ trunk/gtk/plugins/perl/common/GtkUI.xs 2006-09-17 06:30:12 UTC (rev 17293)
@@ -47,7 +47,7 @@
GAIM_PERL_BOOT_PROTO(GtkUI__Utils);
GAIM_PERL_BOOT_PROTO(GtkUI__Xfer);
-MODULE = Gaim::Gtk PACKAGE = Gaim::Gtk PREFIX = gaim_gtk_
+MODULE = Gaim::GtkUI PACKAGE = Gaim::GtkUI PREFIX = gaim_gtk_
PROTOTYPES: ENABLE
BOOT:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2006-09-17 05:44:26
|
Revision: 17292
http://svn.sourceforge.net/gaim/?rev=17292&view=rev
Author: deryni9
Date: 2006-09-16 22:44:22 -0700 (Sat, 16 Sep 2006)
Log Message:
-----------
An oops unrelated to my last commit, go figure.
Gaim::GtkUI::StatusBox functions don't need a leading _.
Modified Paths:
--------------
trunk/gtk/plugins/perl/common/GtkStatusBox.xs
Modified: trunk/gtk/plugins/perl/common/GtkStatusBox.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkStatusBox.xs 2006-09-17 05:35:46 UTC (rev 17291)
+++ trunk/gtk/plugins/perl/common/GtkStatusBox.xs 2006-09-17 05:44:22 UTC (rev 17292)
@@ -20,7 +20,7 @@
gpointer data
*/
-MODULE = Gaim::GtkUI::StatusBox PACKAGE = Gaim::GtkUI::StatusBox PREFIX = gtk_gaim_status_box
+MODULE = Gaim::GtkUI::StatusBox PACKAGE = Gaim::GtkUI::StatusBox PREFIX = gtk_gaim_status_box_
PROTOTYPES: ENABLE
void
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2006-09-17 05:36:12
|
Revision: 17291
http://svn.sourceforge.net/gaim/?rev=17291&view=rev
Author: deryni9
Date: 2006-09-16 22:35:46 -0700 (Sat, 16 Sep 2006)
Log Message:
-----------
This is a really huge commit for basically nothing, I decided that Gaim::Gtk
should really be Gaim::GtkUI (which will line up better with any eventual
Gaim::GntUI that might exist, etc.). So that's what this is, I think I got
everything, it builds here at least.
Modified Paths:
--------------
trunk/gtk/plugins/perl/Makefile.am
trunk/gtk/plugins/perl/common/GtkAccount.xs
trunk/gtk/plugins/perl/common/GtkBlist.xs
trunk/gtk/plugins/perl/common/GtkConn.xs
trunk/gtk/plugins/perl/common/GtkConv.xs
trunk/gtk/plugins/perl/common/GtkConvWin.xs
trunk/gtk/plugins/perl/common/GtkDebug.xs
trunk/gtk/plugins/perl/common/GtkDialogs.xs
trunk/gtk/plugins/perl/common/GtkFt.xs
trunk/gtk/plugins/perl/common/GtkIMHtml.xs
trunk/gtk/plugins/perl/common/GtkIMHtmlToolbar.xs
trunk/gtk/plugins/perl/common/GtkLog.xs
trunk/gtk/plugins/perl/common/GtkMenuTray.xs
trunk/gtk/plugins/perl/common/GtkPlugin.xs
trunk/gtk/plugins/perl/common/GtkPluginPref.xs
trunk/gtk/plugins/perl/common/GtkPounce.xs
trunk/gtk/plugins/perl/common/GtkPrefs.xs
trunk/gtk/plugins/perl/common/GtkPrivacy.xs
trunk/gtk/plugins/perl/common/GtkRoomlist.xs
trunk/gtk/plugins/perl/common/GtkSavedStatuses.xs
trunk/gtk/plugins/perl/common/GtkSession.xs
trunk/gtk/plugins/perl/common/GtkSound.xs
trunk/gtk/plugins/perl/common/GtkStatusBox.xs
trunk/gtk/plugins/perl/common/GtkThemes.xs
trunk/gtk/plugins/perl/common/GtkUtils.xs
trunk/gtk/plugins/perl/common/MANIFEST
trunk/gtk/plugins/perl/common/Makefile.PL.in
trunk/gtk/plugins/perl/common/gtkmodule.h
trunk/gtk/plugins/perl/common/typemap
Added Paths:
-----------
trunk/gtk/plugins/perl/common/GtkUI.pm
trunk/gtk/plugins/perl/common/GtkUI.xs
Removed Paths:
-------------
trunk/gtk/plugins/perl/common/Gtk.pm
trunk/gtk/plugins/perl/common/Gtk.xs
Modified: trunk/gtk/plugins/perl/Makefile.am
===================================================================
--- trunk/gtk/plugins/perl/Makefile.am 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/Makefile.am 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,8 +1,6 @@
perl_dirs = common
common_sources = \
- common/Gtk.pm \
- common/Gtk.xs \
common/GtkAccount.xs \
common/GtkBlist.xs \
common/GtkConn.xs \
@@ -26,9 +24,11 @@
common/GtkSound.xs \
common/GtkStatusBox.xs \
common/GtkThemes.xs \
+ common/GtkUI.pm \
+ common/GtkUI.xs \
common/GtkUtils.xs \
+ common/Makefile.PL.in \
common/gtkmodule.h \
- common/Makefile.PL.in \
common/typemap
EXTRA_DIST = \
Deleted: trunk/gtk/plugins/perl/common/Gtk.pm
===================================================================
--- trunk/gtk/plugins/perl/common/Gtk.pm 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/Gtk.pm 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,61 +0,0 @@
-package Gaim::Gtk;
-
-use 5.008;
-use strict;
-use warnings;
-use Carp;
-
-our $VERSION = '0.01';
-
-use Gaim;
-
-require XSLoader;
-XSLoader::load('Gaim::Gtk', $VERSION);
-
-1;
-__END__
-
-=head1 NAME
-
-Gaim::Gtk - Perl extension for the Gaim instant messenger.
-
-=head1 SYNOPSIS
-
- use Gaim::Gtk;
-
-=head1 ABSTRACT
-
- This module provides the interface for using perl scripts as plugins in
- Gaim, with access to the Gaim Gtk interface functions.
-
-=head1 DESCRIPTION
-
-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.
-
-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
-in the Gaim source tree.
-
-=head1 FUNCTIONS
-
-=over
-
-=back
-
-=head1 SEE ALSO
-Gaim C API documentation - http://gaim.sourceforge.net/api/
-
-The Gaim perl module.
-
-Gaim website - http://gaim.sourceforge.net/
-
-=head1 AUTHOR
-
-Etan Reisner, E<lt>de...@gm...E<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2006 by Etan Reisner
Deleted: trunk/gtk/plugins/perl/common/Gtk.xs
===================================================================
--- trunk/gtk/plugins/perl/common/Gtk.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/Gtk.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,80 +0,0 @@
-#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(Gtk__Account);
-GAIM_PERL_BOOT_PROTO(Gtk__BuddyList);
-GAIM_PERL_BOOT_PROTO(Gtk__Connection);
-GAIM_PERL_BOOT_PROTO(Gtk__Conversation);
-GAIM_PERL_BOOT_PROTO(Gtk__Conversation__Window);
-GAIM_PERL_BOOT_PROTO(Gtk__Debug);
-GAIM_PERL_BOOT_PROTO(Gtk__Dialogs);
-GAIM_PERL_BOOT_PROTO(Gtk__IMHtml);
-GAIM_PERL_BOOT_PROTO(Gtk__IMHtmlToolbar);
-GAIM_PERL_BOOT_PROTO(Gtk__Log);
-GAIM_PERL_BOOT_PROTO(Gtk__MenuTray);
-GAIM_PERL_BOOT_PROTO(Gtk__Plugin);
-GAIM_PERL_BOOT_PROTO(Gtk__PluginPref);
-GAIM_PERL_BOOT_PROTO(Gtk__Pounce);
-GAIM_PERL_BOOT_PROTO(Gtk__Prefs);
-GAIM_PERL_BOOT_PROTO(Gtk__Privacy);
-GAIM_PERL_BOOT_PROTO(Gtk__Roomlist);
-GAIM_PERL_BOOT_PROTO(Gtk__Status);
-#ifndef _WIN32
-GAIM_PERL_BOOT_PROTO(Gtk__Session);
-#endif
-GAIM_PERL_BOOT_PROTO(Gtk__Sound);
-GAIM_PERL_BOOT_PROTO(Gtk__StatusBox);
-GAIM_PERL_BOOT_PROTO(Gtk__Themes);
-GAIM_PERL_BOOT_PROTO(Gtk__Utils);
-GAIM_PERL_BOOT_PROTO(Gtk__Xfer);
-
-MODULE = Gaim::Gtk PACKAGE = Gaim::Gtk PREFIX = gaim_gtk_
-PROTOTYPES: ENABLE
-
-BOOT:
- GAIM_PERL_BOOT(Gtk__Debug);
-GAIM_PERL_BOOT(Gtk__Account);
-GAIM_PERL_BOOT(Gtk__BuddyList);
-GAIM_PERL_BOOT(Gtk__Connection);
-GAIM_PERL_BOOT(Gtk__Conversation);
-GAIM_PERL_BOOT(Gtk__Conversation__Window);
-GAIM_PERL_BOOT(Gtk__Debug);
-GAIM_PERL_BOOT(Gtk__Dialogs);
-GAIM_PERL_BOOT(Gtk__IMHtml);
-GAIM_PERL_BOOT(Gtk__IMHtmlToolbar);
-GAIM_PERL_BOOT(Gtk__Log);
-GAIM_PERL_BOOT(Gtk__MenuTray);
-GAIM_PERL_BOOT(Gtk__Plugin);
-GAIM_PERL_BOOT(Gtk__PluginPref);
-GAIM_PERL_BOOT(Gtk__Pounce);
-GAIM_PERL_BOOT(Gtk__Prefs);
-GAIM_PERL_BOOT(Gtk__Privacy);
-GAIM_PERL_BOOT(Gtk__Roomlist);
-GAIM_PERL_BOOT(Gtk__Status);
-#ifndef _WIN32
-GAIM_PERL_BOOT(Gtk__Session);
-#endif
-GAIM_PERL_BOOT(Gtk__Sound);
-GAIM_PERL_BOOT(Gtk__StatusBox);
-GAIM_PERL_BOOT(Gtk__Themes);
-GAIM_PERL_BOOT(Gtk__Utils);
-GAIM_PERL_BOOT(Gtk__Xfer);
Modified: trunk/gtk/plugins/perl/common/GtkAccount.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkAccount.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkAccount.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,20 +1,20 @@
#include "gtkmodule.h"
-MODULE = Gaim::Gtk::Account PACKAGE = Gaim::Gtk::Account PREFIX = gaim_gtk_account_
+MODULE = Gaim::GtkUI::Account PACKAGE = Gaim::GtkUI::Account PREFIX = gaim_gtk_account_
PROTOTYPES: ENABLE
void *
gaim_gtk_account_get_handle()
-MODULE = Gaim::Gtk::Account PACKAGE = Gaim::Gtk::Account::Dialog PREFIX = gaim_gtk_account_dialog_
+MODULE = Gaim::GtkUI::Account PACKAGE = Gaim::GtkUI::Account::Dialog PREFIX = gaim_gtk_account_dialog_
PROTOTYPES: ENABLE
void
gaim_gtk_account_dialog_show(type, account)
- Gaim::Gtk::Account::Dialog::Type type
+ Gaim::GtkUI::Account::Dialog::Type type
Gaim::Account account
-MODULE = Gaim::Gtk::Account PACKAGE = Gaim::Gtk::Account::Window PREFIX = gaim_gtk_accounts_window_
+MODULE = Gaim::GtkUI::Account PACKAGE = Gaim::GtkUI::Account::Window PREFIX = gaim_gtk_accounts_window_
PROTOTYPES: ENABLE
void
Modified: trunk/gtk/plugins/perl/common/GtkBlist.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkBlist.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkBlist.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -38,13 +38,13 @@
Gaim::BuddyList::Node node
*/
-MODULE = Gaim::Gtk::BuddyList PACKAGE = Gaim::Gtk::BuddyList PREFIX = gaim_gtk_blist_
+MODULE = Gaim::GtkUI::BuddyList PACKAGE = Gaim::GtkUI::BuddyList PREFIX = gaim_gtk_blist_
PROTOTYPES: ENABLE
void *
gaim_gtk_blist_get_handle()
-Gaim::Gtk::BuddyList
+Gaim::GtkUI::BuddyList
gaim_gtk_blist_get_default_gtk_blist()
void
@@ -73,14 +73,14 @@
GList *l;
PPCODE:
for (l = gaim_gtk_blist_get_sort_methods(); l != NULL; l = l->next) {
- XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Gtk::BuddyList::SortMethod")));
+ XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::GtkUI::BuddyList::SortMethod")));
}
void
gaim_gtk_blist_sort_method_reg(id, name, func)
const char * id
const char * name
- Gaim::Gtk::BuddyList::SortFunction func
+ Gaim::GtkUI::BuddyList::SortFunction func
void
gaim_gtk_blist_sort_method_unreg(id)
Modified: trunk/gtk/plugins/perl/common/GtkConn.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkConn.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkConn.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,6 +1,6 @@
#include "gtkmodule.h"
-MODULE = Gaim::Gtk::Connection PACKAGE = Gaim::Gtk::Connection PREFIX = gaim_gtk_connection_
+MODULE = Gaim::GtkUI::Connection PACKAGE = Gaim::GtkUI::Connection PREFIX = gaim_gtk_connection_
PROTOTYPES: ENABLE
void *
Modified: trunk/gtk/plugins/perl/common/GtkConv.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkConv.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkConv.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -33,13 +33,13 @@
/* 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::Gtk::Conversation::Window win
+ Gaim::GtkUI::Conversation::Window win
int x
int y
gboolean * to_right
*/
-MODULE = Gaim::Gtk::Conversation PACKAGE = Gaim::Gtk::Conversation PREFIX = gaim_gtkconv_
+MODULE = Gaim::GtkUI::Conversation PACKAGE = Gaim::GtkUI::Conversation PREFIX = gaim_gtkconv_
PROTOTYPES: ENABLE
void
@@ -58,9 +58,9 @@
gaim_gtkconv_present_conversation(conv)
Gaim::Conversation conv
-Gaim::Gtk::Conversation::Window
+Gaim::GtkUI::Conversation::Window
gaim_gtkconv_get_window(conv)
- Gaim::Gtk::Conversation conv
+ Gaim::GtkUI::Conversation conv
void
gaim_gtkconv_new(conv)
@@ -68,9 +68,9 @@
gboolean
gaim_gtkconv_is_hidden(gtkconv)
- Gaim::Gtk::Conversation gtkconv
+ Gaim::GtkUI::Conversation gtkconv
-MODULE = Gaim::Gtk::Conversation PACKAGE = Gaim::Gtk::Conversations PREFIX = gaim_gtk_conversations_
+MODULE = Gaim::GtkUI::Conversation PACKAGE = Gaim::GtkUI::Conversations PREFIX = gaim_gtk_conversations_
PROTOTYPES: ENABLE
void
Modified: trunk/gtk/plugins/perl/common/GtkConvWin.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkConvWin.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkConvWin.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,54 +1,54 @@
#include "gtkmodule.h"
-MODULE = Gaim::Gtk::Conversation::Window PACKAGE = Gaim::Gtk::Conversation::Window PREFIX = gaim_gtk_conv_window_
+MODULE = Gaim::GtkUI::Conversation::Window PACKAGE = Gaim::GtkUI::Conversation::Window PREFIX = gaim_gtk_conv_window_
PROTOTYPES: ENABLE
-Gaim::Gtk::Conversation::Window
+Gaim::GtkUI::Conversation::Window
gaim_gtk_conv_window_new()
void
gaim_gtk_conv_window_destroy(win)
- Gaim::Gtk::Conversation::Window win
+ Gaim::GtkUI::Conversation::Window win
void
gaim_gtk_conv_window_show(win)
- Gaim::Gtk::Conversation::Window win
+ Gaim::GtkUI::Conversation::Window win
void
gaim_gtk_conv_window_hide(win)
- Gaim::Gtk::Conversation::Window win
+ Gaim::GtkUI::Conversation::Window win
void
gaim_gtk_conv_window_raise(win)
- Gaim::Gtk::Conversation::Window win
+ Gaim::GtkUI::Conversation::Window win
void
gaim_gtk_conv_window_switch_gtkconv(win, gtkconv)
- Gaim::Gtk::Conversation::Window win
- Gaim::Gtk::Conversation gtkconv
+ Gaim::GtkUI::Conversation::Window win
+ Gaim::GtkUI::Conversation gtkconv
void
gaim_gtk_conv_window_add_gtkconv(win, gtkconv)
- Gaim::Gtk::Conversation::Window win
- Gaim::Gtk::Conversation gtkconv
+ Gaim::GtkUI::Conversation::Window win
+ Gaim::GtkUI::Conversation gtkconv
void
gaim_gtk_conv_window_remove_gtkconv(win, gtkconv)
- Gaim::Gtk::Conversation::Window win
- Gaim::Gtk::Conversation gtkconv
+ Gaim::GtkUI::Conversation::Window win
+ Gaim::GtkUI::Conversation gtkconv
-Gaim::Gtk::Conversation
+Gaim::GtkUI::Conversation
gaim_gtk_conv_window_get_gtkconv_at_index(win, index)
- Gaim::Gtk::Conversation::Window win
+ Gaim::GtkUI::Conversation::Window win
int index
-Gaim::Gtk::Conversation
+Gaim::GtkUI::Conversation
gaim_gtk_conv_window_get_active_gtkconv(win)
- Gaim::Gtk::Conversation::Window win
+ Gaim::GtkUI::Conversation::Window win
Gaim::Conversation
gaim_gtk_conv_window_get_active_conversation(win)
- Gaim::Gtk::Conversation::Window win
+ Gaim::GtkUI::Conversation::Window win
gboolean
gaim_gtk_conv_window_is_active_conversation(conv)
@@ -56,36 +56,36 @@
gboolean
gaim_gtk_conv_window_has_focus(win)
- Gaim::Gtk::Conversation::Window win
+ Gaim::GtkUI::Conversation::Window win
-Gaim::Gtk::Conversation::Window
+Gaim::GtkUI::Conversation::Window
gaim_gtk_conv_window_get_at_xy(x, y)
int x
int y
void
gaim_gtk_conv_window_get_gtkconvs(win)
- Gaim::Gtk::Conversation::Window win
+ Gaim::GtkUI::Conversation::Window win
PREINIT:
GList *l;
PPCODE:
for (l = gaim_gtk_conv_window_get_gtkconvs(win); l != NULL; l = l->next) {
- XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Gtk::Conversation")));
+ XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::GtkUI::Conversation")));
}
guint
gaim_gtk_conv_window_get_gtkconv_count(win)
- Gaim::Gtk::Conversation::Window win
+ Gaim::GtkUI::Conversation::Window win
-Gaim::Gtk::Conversation::Window
+Gaim::GtkUI::Conversation::Window
gaim_gtk_conv_window_first_with_type(type)
Gaim::ConversationType type
-Gaim::Gtk::Conversation::Window
+Gaim::GtkUI::Conversation::Window
gaim_gtk_conv_window_last_with_type(type)
Gaim::ConversationType type
-MODULE = Gaim::Gtk::Conversation::Window PACKAGE = Gaim::Gtk::Conversation::Placement PREFIX = gaim_gtkconv_placement_
+MODULE = Gaim::GtkUI::Conversation::Window PACKAGE = Gaim::GtkUI::Conversation::Placement PREFIX = gaim_gtkconv_placement_
PROTOTYPES: ENABLE
void
@@ -94,7 +94,7 @@
GList *l;
PPCODE:
for (l = gaim_gtkconv_placement_get_options(); l != NULL; l = l->next) {
- XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Gtk::Conversation::Window")));
+ XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::GtkUI::Conversation::Window")));
}
void
@@ -124,9 +124,9 @@
void
gaim_gtkconv_placement_place(gtkconv)
- Gaim::Gtk::Conversation gtkconv
+ Gaim::GtkUI::Conversation gtkconv
-MODULE = Gaim::Gtk::Conversation::Window PACKAGE = Gaim::Gtk::Conversation::Windows PREFIX = gaim_gtk_conv_windows_
+MODULE = Gaim::GtkUI::Conversation::Window PACKAGE = Gaim::GtkUI::Conversation::Windows PREFIX = gaim_gtk_conv_windows_
PROTOTYPES: ENABLE
void
@@ -135,5 +135,5 @@
GList *l;
PPCODE:
for (l = gaim_gtk_conv_windows_get_list(); l != NULL; l = l->next) {
- XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Gtk::Conversation::Window")));
+ XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::GtkUI::Conversation::Window")));
}
Modified: trunk/gtk/plugins/perl/common/GtkDebug.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkDebug.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkDebug.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,12 +1,12 @@
#include "gtkmodule.h"
-MODULE = Gaim::Gtk::Debug PACKAGE = Gaim::Gtk::Debug PREFIX = gaim_gtk_debug_
+MODULE = Gaim::GtkUI::Debug PACKAGE = Gaim::GtkUI::Debug PREFIX = gaim_gtk_debug_
PROTOTYPES: ENABLE
void *
gaim_gtk_debug_get_handle()
-MODULE = Gaim::Gtk::Debug PACKAGE = Gaim::Gtk::Debug::Window PREFIX = gaim_gtk_debug_window_
+MODULE = Gaim::GtkUI::Debug PACKAGE = Gaim::GtkUI::Debug::Window PREFIX = gaim_gtk_debug_window_
PROTOTYPES: ENABLE
void
Modified: trunk/gtk/plugins/perl/common/GtkDialogs.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkDialogs.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkDialogs.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,6 +1,6 @@
#include "gtkmodule.h"
-MODULE = Gaim::Gtk::Dialogs PACKAGE = Gaim::Gtk::Dialogs PREFIX = gaim_gtkdialogs_
+MODULE = Gaim::GtkUI::Dialogs PACKAGE = Gaim::GtkUI::Dialogs PREFIX = gaim_gtkdialogs_
PROTOTYPES: ENABLE
void
Modified: trunk/gtk/plugins/perl/common/GtkFt.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkFt.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkFt.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,49 +1,49 @@
#include "gtkmodule.h"
-MODULE = Gaim::Gtk::Xfer PACKAGE = Gaim::Gtk::Xfer PREFIX = gaim_gtk_xfer_
+MODULE = Gaim::GtkUI::Xfer PACKAGE = Gaim::GtkUI::Xfer PREFIX = gaim_gtk_xfer_
PROTOTYPES: ENABLE
void
gaim_set_gtkxfer_dialog(dialog)
- Gaim::Gtk::Xfer::Dialog dialog
+ Gaim::GtkUI::Xfer::Dialog dialog
-Gaim::Gtk::Xfer::Dialog
+Gaim::GtkUI::Xfer::Dialog
gaim_get_gtkxfer_dialog()
-MODULE = Gaim::Gtk::Xfer PACKAGE = Gaim::Gtk::Xfer::Dialog PREFIX = gaim_gtkxfer_dialog_
+MODULE = Gaim::GtkUI::Xfer PACKAGE = Gaim::GtkUI::Xfer::Dialog PREFIX = gaim_gtkxfer_dialog_
PROTOTYPES: ENABLE
-Gaim::Gtk::Xfer::Dialog
+Gaim::GtkUI::Xfer::Dialog
gaim_gtkxfer_dialog_new()
void
gaim_gtkxfer_dialog_destroy(dialog)
- Gaim::Gtk::Xfer::Dialog dialog
+ Gaim::GtkUI::Xfer::Dialog dialog
void
gaim_gtkxfer_dialog_show(dialog = NULL)
- Gaim::Gtk::Xfer::Dialog dialog
+ Gaim::GtkUI::Xfer::Dialog dialog
void
gaim_gtkxfer_dialog_hide(dialog)
- Gaim::Gtk::Xfer::Dialog dialog
+ Gaim::GtkUI::Xfer::Dialog dialog
void
gaim_gtkxfer_dialog_add_xfer(dialog, xfer)
- Gaim::Gtk::Xfer::Dialog dialog
+ Gaim::GtkUI::Xfer::Dialog dialog
Gaim::Xfer xfer
void
gaim_gtkxfer_dialog_remove_xfer(dialog, xfer)
- Gaim::Gtk::Xfer::Dialog dialog
+ Gaim::GtkUI::Xfer::Dialog dialog
Gaim::Xfer xfer
void
gaim_gtkxfer_dialog_cancel_xfer(dialog, xfer)
- Gaim::Gtk::Xfer::Dialog dialog
+ Gaim::GtkUI::Xfer::Dialog dialog
Gaim::Xfer xfer
void
gaim_gtkxfer_dialog_update_xfer(dialog, xfer)
- Gaim::Gtk::Xfer::Dialog dialog
+ Gaim::GtkUI::Xfer::Dialog dialog
Gaim::Xfer xfer
Modified: trunk/gtk/plugins/perl/common/GtkIMHtml.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkIMHtml.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkIMHtml.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -13,9 +13,9 @@
* about doing that.
void
gtk_imhtml_insert_html_at_iter(imhtml, text, options, iter)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
const gchar * text
- Gaim::Gtk::IMHtml::Options options
+ Gaim::GtkUI::IMHtml::Options options
Gtk::TextIter iter
*/
@@ -24,7 +24,7 @@
* about doing that.
void
gtk_imhtml_delete(imhtml, start, end)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
Gtk::TextIter start
Gtk::TextIter end
*/
@@ -34,7 +34,7 @@
* about doing that.
void
gtk_imhtml_insert_link(imhtml, mark, url, text)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
Gtk::TextMark mark
const char * url
const char * text
@@ -45,14 +45,14 @@
* about doing that.
void
gtk_imhtml_insert_smiley_at_iter(imhtml, sml, smiley, iter)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
const char * sml
char * smiley
Gtk::TextIter iter
void
gtk_imhtml_insert_image_at_iter(imhtml, id, iter)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
int id
Gtk::TextIter iter
*/
@@ -62,7 +62,7 @@
* about doing that.
char *
gtk_imhtml_get_markup_range(imhtml, start, end)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
Gtk::TextIter start
Gtk::TextIter end
*/
@@ -72,7 +72,7 @@
* about doing that.
char *
gtk_imhtml_get_text(imhtml, start, end)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
Gtk::TextIter start
Gtk::TextIter end
*/
@@ -80,7 +80,7 @@
/* 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.
-Gaim::Gtk::IMHtml::Scalable
+Gaim::GtkUI::IMHtml::Scalable
gtk_imhtml_image_new(img, filename, id)
Gdk::Pixbuf img
const gchar * filename
@@ -92,8 +92,8 @@
* about doing that.
void
gtk_imhtml_image_add_to(scale, imhtml, iter)
- Gaim::Gtk::IMHtml::Scalable scale
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml::Scalable scale
+ Gaim::GtkUI::IMHtml imhtml
Gtk::TextIter iter
*/
@@ -102,69 +102,69 @@
* about doing that.
void
gtk_imhtml_hr_add_to(scale, imhtml, iter)
- Gaim::Gtk::IMHtml::Scalable scale
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml::Scalable scale
+ Gaim::GtkUI::IMHtml imhtml
Gtk::TextIter iter
*/
/* This can't work at the moment since I don't have a typemap for gboolean *.
void
gtk_imhtml_get_current_format(imhtml, bold, italic, underline)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
gboolean * bold
gboolean * italic
gboolean * underline
*/
-MODULE = Gaim::Gtk::IMHtml PACKAGE = Gaim::Gtk::IMHtml PREFIX = gtk_imhtml_
+MODULE = Gaim::GtkUI::IMHtml PACKAGE = Gaim::GtkUI::IMHtml PREFIX = gtk_imhtml_
PROTOTYPES: ENABLE
-Gaim::Gtk::IMHtml::Smiley
+Gaim::GtkUI::IMHtml::Smiley
gtk_imhtml_smiley_get(imhtml, sml, text)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
const gchar * sml
const gchar * text
void
gtk_imhtml_associate_smiley(imhtml, sml, smiley)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
const gchar * sml
- Gaim::Gtk::IMHtml::Smiley smiley
+ Gaim::GtkUI::IMHtml::Smiley smiley
void
gtk_imhtml_remove_smileys(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
void
gtk_imhtml_set_funcs(imhtml, f)
- Gaim::Gtk::IMHtml imhtml
- Gaim::Gtk::IMHtml::Funcs f
+ Gaim::GtkUI::IMHtml imhtml
+ Gaim::GtkUI::IMHtml::Funcs f
void
gtk_imhtml_show_comments(imhtml, show)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
gboolean show
const char *
gtk_imhtml_get_protocol_name(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
void
gtk_imhtml_set_protocol_name(imhtml, protocol_name)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
const gchar * protocol_name
void
gtk_imhtml_append_text(imhtml, text, options)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
const gchar * text
- Gaim::Gtk::IMHtml::Options options
+ Gaim::GtkUI::IMHtml::Options options
void
gtk_imhtml_append_text_with_images(imhtml, text, options, unused = NULL)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
const gchar * text
- Gaim::Gtk::IMHtml::Options options
+ Gaim::GtkUI::IMHtml::Options options
SV *unused
PREINIT:
GSList *t_GL;
@@ -181,173 +181,185 @@
void
gtk_imhtml_scroll_to_end(imhtml, smooth)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
gboolean smooth
void
gtk_imhtml_clear(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
void
gtk_imhtml_page_up(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
void
gtk_imhtml_page_down(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
void
gtk_imhtml_set_editable(imhtml, editable)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
gboolean editable
void
gtk_imhtml_set_whole_buffer_formatting_only(imhtml, wbo)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
gboolean wbo
void
gtk_imhtml_set_format_functions(imhtml, buttons)
- Gaim::Gtk::IMHtml imhtml
- Gaim::Gtk::IMHtml::Buttons buttons
+ Gaim::GtkUI::IMHtml imhtml
+ Gaim::GtkUI::IMHtml::Buttons buttons
-Gaim::Gtk::IMHtml::Buttons
+Gaim::GtkUI::IMHtml::Buttons
gtk_imhtml_get_format_functions(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
char *
gtk_imhtml_get_current_fontface(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
char *
gtk_imhtml_get_current_forecolor(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
char *
gtk_imhtml_get_current_backcolor(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
char *
gtk_imhtml_get_current_background(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
gint
gtk_imhtml_get_current_fontsize(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
gboolean
gtk_imhtml_get_editable(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
void
gtk_imhtml_clear_formatting(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
void
gtk_imhtml_toggle_bold(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
void
gtk_imhtml_toggle_italic(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
void
gtk_imhtml_toggle_underline(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
void
gtk_imhtml_toggle_strike(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
void
gtk_imhtml_toggle_forecolor(imhtml, color)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
const char * color
void
gtk_imhtml_toggle_backcolor(imhtml, color)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
const char * color
void
gtk_imhtml_toggle_background(imhtml, color)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
const char * color
void
gtk_imhtml_toggle_fontface(imhtml, face)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
const char * face
void
gtk_imhtml_toggle_link(imhtml, url)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
const char * url
void
gtk_imhtml_insert_smiley(imhtml, sml, smiley)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
const char * sml
char * smiley
void
gtk_imhtml_font_set_size(imhtml, size)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
gint size
void
gtk_imhtml_font_shrink(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
void
gtk_imhtml_font_grow(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
char *
gtk_imhtml_get_markup(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
-char **
+# ETAN Test this, and document well that it returns an arrayref
+void
gtk_imhtml_get_markup_lines(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
+PREINIT:
+ gint i;
+ AV *lines;
+ gchar **bufs;
+PPCODE:
+ bufs = gtk_imhtml_get_markup_lines(imhtml);
+ lines = newAV();
+ for (i = 0; bufs[i]; i++) {
+ av_push(lines, newSVpv(bufs[i], 0));
+ }
+ XPUSHs(sv_2mortal(newRV_noinc((SV *)lines)));
-MODULE = Gaim::Gtk::IMHtml PACKAGE = Gaim::Gtk::IMHtml::Scalable PREFIX = gtk_imhtml_image_
+MODULE = Gaim::GtkUI::IMHtml PACKAGE = Gaim::GtkUI::IMHtml::Scalable PREFIX = gtk_imhtml_image_
PROTOTYPES: ENABLE
void
gtk_imhtml_image_free(scale)
- Gaim::Gtk::IMHtml::Scalable scale
+ Gaim::GtkUI::IMHtml::Scalable scale
void
gtk_imhtml_image_scale(scale, width, height)
- Gaim::Gtk::IMHtml::Scalable scale
+ Gaim::GtkUI::IMHtml::Scalable scale
int width
int height
-MODULE = Gaim::Gtk::IMHtml PACKAGE = Gaim::Gtk::IMHtml::Hr PREFIX = gtk_imhtml_hr_
+MODULE = Gaim::GtkUI::IMHtml PACKAGE = Gaim::GtkUI::IMHtml::Hr PREFIX = gtk_imhtml_hr_
PROTOTYPES: ENABLE
-Gaim::Gtk::IMHtml::Scalable
+Gaim::GtkUI::IMHtml::Scalable
gtk_imhtml_hr_new()
void
gtk_imhtml_hr_free(scale)
- Gaim::Gtk::IMHtml::Scalable scale
+ Gaim::GtkUI::IMHtml::Scalable scale
void
gtk_imhtml_hr_scale(scale, width, height)
- Gaim::Gtk::IMHtml::Scalable scale
+ Gaim::GtkUI::IMHtml::Scalable scale
int width
int height
-MODULE = Gaim::Gtk::IMHtml PACKAGE = Gaim::Gtk::IMHtml::Search PREFIX = gtk_imhtml_search_
+MODULE = Gaim::GtkUI::IMHtml PACKAGE = Gaim::GtkUI::IMHtml::Search PREFIX = gtk_imhtml_search_
PROTOTYPES: ENABLE
gboolean
gtk_imhtml_search_find(imhtml, text)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
const gchar * text
void
gtk_imhtml_search_clear(imhtml)
- Gaim::Gtk::IMHtml imhtml
+ Gaim::GtkUI::IMHtml imhtml
Modified: trunk/gtk/plugins/perl/common/GtkIMHtmlToolbar.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkIMHtmlToolbar.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkIMHtmlToolbar.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -9,14 +9,14 @@
void
gtk_imhtmltoolbar_attach(toolbar, imhtml)
- Gaim::Gtk::IMHtmlToolbar toolbar
+ Gaim::GtkUI::IMHtmlToolbar toolbar
Gtk::Widget imhtml
*/
-MODULE = Gaim::Gtk::IMHtmlToolbar PACKAGE = Gaim::Gtk::IMHtmlToolbar PREFIX = gtk_imhtmltoolbar_
+MODULE = Gaim::GtkUI::IMHtmlToolbar PACKAGE = Gaim::GtkUI::IMHtmlToolbar PREFIX = gtk_imhtmltoolbar_
PROTOTYPES: ENABLE
void
gtk_imhtmltoolbar_associate_smileys(toolbar, proto_id)
- Gaim::Gtk::IMHtmlToolbar toolbar
+ Gaim::GtkUI::IMHtmlToolbar toolbar
const char * proto_id
Modified: trunk/gtk/plugins/perl/common/GtkLog.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkLog.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkLog.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,6 +1,6 @@
#include "gtkmodule.h"
-MODULE = Gaim::Gtk::Log PACKAGE = Gaim::Gtk::Log PREFIX = gaim_gtk_log_
+MODULE = Gaim::GtkUI::Log PACKAGE = Gaim::GtkUI::Log PREFIX = gaim_gtk_log_
PROTOTYPES: ENABLE
void *
@@ -16,7 +16,7 @@
gaim_gtk_log_show_contact(contact)
Gaim::BuddyList::Contact contact
-MODULE = Gaim::Gtk::Log PACKAGE = Gaim::Gtk::SysLog PREFIX = gaim_gtk_syslog_
+MODULE = Gaim::GtkUI::Log PACKAGE = Gaim::GtkUI::SysLog PREFIX = gaim_gtk_syslog_
PROTOTYPES: ENABLE
void
Modified: trunk/gtk/plugins/perl/common/GtkMenuTray.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkMenuTray.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkMenuTray.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -8,26 +8,26 @@
Gtk::Widget
gaim_gtk_menu_tray_get_box(menu_tray)
- Gaim::Gtk::MenuTray menu_tray
+ Gaim::GtkUI::MenuTray menu_tray
void
gaim_gtk_menu_tray_append(menu_tray, widget, tooltip)
- Gaim::Gtk::MenuTray menu_tray
+ Gaim::GtkUI::MenuTray menu_tray
Gtk::Widget widget
const char * tooltip
void
gaim_gtk_menu_tray_prepend(menu_tray, widget, tooltip)
- Gaim::Gtk::MenuTray menu_tray
+ Gaim::GtkUI::MenuTray menu_tray
Gtk::Widget widget
const char * tooltip
void
gaim_gtk_menu_tray_set_tooltip(menu_tray, widget, tooltip)
- Gaim::Gtk::MenuTray menu_tray
+ Gaim::GtkUI::MenuTray menu_tray
Gtk::Widget widget
const char * tooltip
*/
-MODULE = Gaim::Gtk::MenuTray PACKAGE = Gaim::Gtk::MenuTray PREFIX = gaim_gtk_menu_tray
+MODULE = Gaim::GtkUI::MenuTray PACKAGE = Gaim::GtkUI::MenuTray PREFIX = gaim_gtk_menu_tray
PROTOTYPES: ENABLE
Modified: trunk/gtk/plugins/perl/common/GtkPlugin.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkPlugin.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkPlugin.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -8,16 +8,16 @@
Gaim::Plugin plugin
*/
-MODULE = Gaim::Gtk::Plugin PACKAGE = Gaim::Gtk::Plugin PREFIX = gaim_gtk_plugin_
+MODULE = Gaim::GtkUI::Plugin PACKAGE = Gaim::GtkUI::Plugin PREFIX = gaim_gtk_plugin_
PROTOTYPES: ENABLE
-MODULE = Gaim::Gtk::Plugin PACKAGE = Gaim::Gtk::Plugins PREFIX = gaim_gtk_plugins_
+MODULE = Gaim::GtkUI::Plugin PACKAGE = Gaim::GtkUI::Plugins PREFIX = gaim_gtk_plugins_
PROTOTYPES: ENABLE
void
gaim_gtk_plugins_save()
-MODULE = Gaim::Gtk::Plugin PACKAGE = Gaim::Gtk::Plugin::Dialog PREFIX = gaim_gtk_plugin_dialog_
+MODULE = Gaim::GtkUI::Plugin PACKAGE = Gaim::GtkUI::Plugin::Dialog PREFIX = gaim_gtk_plugin_dialog_
PROTOTYPES: ENABLE
void
Modified: trunk/gtk/plugins/perl/common/GtkPluginPref.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkPluginPref.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkPluginPref.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -8,5 +8,5 @@
Gaim::PluginPref::Frame frame
*/
-MODULE = Gaim::Gtk::PluginPref PACKAGE = Gaim::Gtk::PluginPref PREFIX = gaim_gtk_plugin_pref_
+MODULE = Gaim::GtkUI::PluginPref PACKAGE = Gaim::GtkUI::PluginPref PREFIX = gaim_gtk_plugin_pref_
PROTOTYPES: ENABLE
Modified: trunk/gtk/plugins/perl/common/GtkPounce.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkPounce.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkPounce.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,6 +1,6 @@
#include "gtkmodule.h"
-MODULE = Gaim::Gtk::Pounce PACKAGE = Gaim::Gtk::Pounce PREFIX = gaim_gtk_pounce_
+MODULE = Gaim::GtkUI::Pounce PACKAGE = Gaim::GtkUI::Pounce PREFIX = gaim_gtk_pounce_
PROTOTYPES: ENABLE
void
@@ -9,13 +9,13 @@
const char * name
Gaim::Pounce cur_pounce
-MODULE = Gaim::Gtk::Pounce PACKAGE = Gaim::Gtk::Pounces PREFIX = gaim_gtk_pounces_
+MODULE = Gaim::GtkUI::Pounce PACKAGE = Gaim::GtkUI::Pounces PREFIX = gaim_gtk_pounces_
PROTOTYPES: ENABLE
void *
gaim_gtk_pounces_get_handle()
-MODULE = Gaim::Gtk::Pounce PACKAGE = Gaim::Gtk::Pounces::Manager PREFIX = gaim_gtk_pounces_manager_
+MODULE = Gaim::GtkUI::Pounce PACKAGE = Gaim::GtkUI::Pounces::Manager PREFIX = gaim_gtk_pounces_manager_
PROTOTYPES: ENABLE
void
Modified: trunk/gtk/plugins/perl/common/GtkPrefs.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkPrefs.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkPrefs.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -67,7 +67,7 @@
RETVAL
*/
-MODULE = Gaim::Gtk::Prefs PACKAGE = Gaim::Gtk::Prefs PREFIX = gaim_gtk_prefs_
+MODULE = Gaim::GtkUI::Prefs PACKAGE = Gaim::GtkUI::Prefs PREFIX = gaim_gtk_prefs_
PROTOTYPES: ENABLE
void
Modified: trunk/gtk/plugins/perl/common/GtkPrivacy.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkPrivacy.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkPrivacy.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,6 +1,6 @@
#include "gtkmodule.h"
-MODULE = Gaim::Gtk::Privacy PACKAGE = Gaim::Gtk::Privacy PREFIX = gaim_gtk_
+MODULE = Gaim::GtkUI::Privacy PACKAGE = Gaim::GtkUI::Privacy PREFIX = gaim_gtk_
PROTOTYPES: ENABLE
void
@@ -13,7 +13,7 @@
Gaim::Account account
const char * name
-MODULE = Gaim::Gtk::Privacy PACKAGE = Gaim::Gtk::Privacy::Dialog PREFIX = gaim_gtk_privacy_dialog_
+MODULE = Gaim::GtkUI::Privacy PACKAGE = Gaim::GtkUI::Privacy::Dialog PREFIX = gaim_gtk_privacy_dialog_
PROTOTYPES: ENABLE
void
Modified: trunk/gtk/plugins/perl/common/GtkRoomlist.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkRoomlist.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkRoomlist.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,23 +1,23 @@
#include "gtkmodule.h"
-MODULE = Gaim::Gtk::Roomlist PACKAGE = Gaim::Gtk::Roomlist PREFIX = gaim_gtk_roomlist_
+MODULE = Gaim::GtkUI::Roomlist PACKAGE = Gaim::GtkUI::Roomlist PREFIX = gaim_gtk_roomlist_
PROTOTYPES: ENABLE
gboolean
gaim_gtk_roomlist_is_showable()
-MODULE = Gaim::Gtk::Roomlist PACKAGE = Gaim::Gtk::Roomlist::Dialog PREFIX = gaim_gtk_roomlist_dialog_
+MODULE = Gaim::GtkUI::Roomlist PACKAGE = Gaim::GtkUI::Roomlist::Dialog PREFIX = gaim_gtk_roomlist_dialog_
PROTOTYPES: ENABLE
void
gaim_gtk_roomlist_dialog_show(class)
C_ARGS: /* void */
-Gaim::Gtk::Roomlist::Dialog
+Gaim::GtkUI::Roomlist::Dialog
gaim_gtk_roomlist_dialog_new(class)
C_ARGS: /* void */
-Gaim::Gtk::Roomlist::Dialog
+Gaim::GtkUI::Roomlist::Dialog
gaim_gtk_roomlist_dialog_new_with_account(class, account)
Gaim::Account account
C_ARGS:
Modified: trunk/gtk/plugins/perl/common/GtkSavedStatuses.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkSavedStatuses.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkSavedStatuses.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -11,13 +11,13 @@
GCallback callback
*/
-MODULE = Gaim::Gtk::Status PACKAGE = Gaim::Gtk::Status PREFIX = gaim_gtk_status_
+MODULE = Gaim::GtkUI::Status PACKAGE = Gaim::GtkUI::Status PREFIX = gaim_gtk_status_
PROTOTYPES: ENABLE
void *
gaim_gtk_status_get_handle()
-MODULE = Gaim::Gtk::Status PACKAGE = Gaim::Gtk::Status::Editor PREFIX = gaim_gtk_status_editor_
+MODULE = Gaim::GtkUI::Status PACKAGE = Gaim::GtkUI::Status::Editor PREFIX = gaim_gtk_status_editor_
PROTOTYPES: ENABLE
void
@@ -25,7 +25,7 @@
gboolean edit
Gaim::SavedStatus status
-MODULE = Gaim::Gtk::Status PACKAGE = Gaim::Gtk::Status::Window PREFIX = gaim_gtk_status_window_
+MODULE = Gaim::GtkUI::Status PACKAGE = Gaim::GtkUI::Status::Window PREFIX = gaim_gtk_status_window_
PROTOTYPES: ENABLE
void
Modified: trunk/gtk/plugins/perl/common/GtkSession.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkSession.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkSession.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,6 +1,6 @@
#include "gtkmodule.h"
-MODULE = Gaim::Gtk::Session PACKAGE = Gaim::Gtk::Session PREFIX = gaim_gtk_session_
+MODULE = Gaim::GtkUI::Session PACKAGE = Gaim::GtkUI::Session PREFIX = gaim_gtk_session_
PROTOTYPES: ENABLE
void
Modified: trunk/gtk/plugins/perl/common/GtkSound.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkSound.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkSound.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,6 +1,6 @@
#include "gtkmodule.h"
-MODULE = Gaim::Gtk::Sound PACKAGE = Gaim::Gtk::Sound PREFIX = gaim_gtk_sound_
+MODULE = Gaim::GtkUI::Sound PACKAGE = Gaim::GtkUI::Sound PREFIX = gaim_gtk_sound_
PROTOTYPES: ENABLE
const char *
Modified: trunk/gtk/plugins/perl/common/GtkStatusBox.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkStatusBox.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkStatusBox.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -12,39 +12,39 @@
void
gtk_gaim_status_box_add(status_box, type, pixbuf, text, sec_text, data)
- Gaim::Gtk::StatusBox status_box
- Gaim::Gtk::StatusBox::ItemType type
+ Gaim::GtkUI::StatusBox status_box
+ Gaim::GtkUI::StatusBox::ItemType type
GdkPixbuf pixbuf
const char * text
const char * sec_text
gpointer data
*/
-MODULE = Gaim::Gtk::StatusBox PACKAGE = Gaim::Gtk::StatusBox PREFIX = gtk_gaim_status_box
+MODULE = Gaim::GtkUI::StatusBox PACKAGE = Gaim::GtkUI::StatusBox PREFIX = gtk_gaim_status_box
PROTOTYPES: ENABLE
void
gtk_gaim_status_box_add_separator(status_box)
- Gaim::Gtk::StatusBox status_box
+ Gaim::GtkUI::StatusBox status_box
void
gtk_gaim_status_box_set_connecting(status_box, connecting)
- Gaim::Gtk::StatusBox status_box
+ Gaim::GtkUI::StatusBox status_box
gboolean connecting
void
gtk_gaim_status_box_pulse_connecting(status_box)
- Gaim::Gtk::StatusBox status_box
+ Gaim::GtkUI::StatusBox status_box
void
gtk_gaim_status_box_set_buddy_icon(status_box, filename)
- Gaim::Gtk::StatusBox status_box
+ Gaim::GtkUI::StatusBox status_box
const char * filename
const char *
gtk_gaim_status_box_get_buddy_icon(status_box)
- Gaim::Gtk::StatusBox status_box
+ Gaim::GtkUI::StatusBox status_box
char *
gtk_gaim_status_box_get_message(status_box)
- Gaim::Gtk::StatusBox status_box
+ Gaim::GtkUI::StatusBox status_box
Modified: trunk/gtk/plugins/perl/common/GtkThemes.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkThemes.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkThemes.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -8,7 +8,7 @@
Gtk::Widget * widget
*/
-MODULE = Gaim::Gtk::Themes PACKAGE = Gaim::Gtk::Themes PREFIX = gaim_gtkthemes_
+MODULE = Gaim::GtkUI::Themes PACKAGE = Gaim::GtkUI::Themes PREFIX = gaim_gtkthemes_
PROTOTYPES: ENABLE
void
Copied: trunk/gtk/plugins/perl/common/GtkUI.pm (from rev 17193, trunk/gtk/plugins/perl/common/Gtk.pm)
===================================================================
--- trunk/gtk/plugins/perl/common/GtkUI.pm (rev 0)
+++ trunk/gtk/plugins/perl/common/GtkUI.pm 2006-09-17 05:35:46 UTC (rev 17291)
@@ -0,0 +1,61 @@
+package Gaim::GtkUI;
+
+use 5.008;
+use strict;
+use warnings;
+use Carp;
+
+our $VERSION = '0.01';
+
+use Gaim;
+
+require XSLoader;
+XSLoader::load('Gaim::GtkUI', $VERSION);
+
+1;
+__END__
+
+=head1 NAME
+
+Gaim::GtkUI - Perl extension for the Gaim instant messenger.
+
+=head1 SYNOPSIS
+
+ use Gaim::GtkUI;
+
+=head1 ABSTRACT
+
+ This module provides the interface for using perl scripts as plugins in
+ Gaim, with access to the Gaim Gtk interface functions.
+
+=head1 DESCRIPTION
+
+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.
+
+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
+in the Gaim source tree.
+
+=head1 FUNCTIONS
+
+=over
+
+=back
+
+=head1 SEE ALSO
+Gaim C API documentation - http://gaim.sourceforge.net/api/
+
+The Gaim perl module.
+
+Gaim website - http://gaim.sourceforge.net/
+
+=head1 AUTHOR
+
+Etan Reisner, E<lt>de...@gm...E<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2006 by Etan Reisner
Copied: trunk/gtk/plugins/perl/common/GtkUI.xs (from rev 17193, trunk/gtk/plugins/perl/common/Gtk.xs)
===================================================================
--- trunk/gtk/plugins/perl/common/GtkUI.xs (rev 0)
+++ trunk/gtk/plugins/perl/common/GtkUI.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -0,0 +1,79 @@
+#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);
+GAIM_PERL_BOOT_PROTO(GtkUI__Connection);
+GAIM_PERL_BOOT_PROTO(GtkUI__Conversation);
+GAIM_PERL_BOOT_PROTO(GtkUI__Conversation__Window);
+GAIM_PERL_BOOT_PROTO(GtkUI__Debug);
+GAIM_PERL_BOOT_PROTO(GtkUI__Dialogs);
+GAIM_PERL_BOOT_PROTO(GtkUI__IMHtml);
+GAIM_PERL_BOOT_PROTO(GtkUI__IMHtmlToolbar);
+GAIM_PERL_BOOT_PROTO(GtkUI__Log);
+GAIM_PERL_BOOT_PROTO(GtkUI__MenuTray);
+GAIM_PERL_BOOT_PROTO(GtkUI__Plugin);
+GAIM_PERL_BOOT_PROTO(GtkUI__PluginPref);
+GAIM_PERL_BOOT_PROTO(GtkUI__Pounce);
+GAIM_PERL_BOOT_PROTO(GtkUI__Prefs);
+GAIM_PERL_BOOT_PROTO(GtkUI__Privacy);
+GAIM_PERL_BOOT_PROTO(GtkUI__Roomlist);
+GAIM_PERL_BOOT_PROTO(GtkUI__Status);
+#ifndef _WIN32
+GAIM_PERL_BOOT_PROTO(GtkUI__Session);
+#endif
+GAIM_PERL_BOOT_PROTO(GtkUI__Sound);
+GAIM_PERL_BOOT_PROTO(GtkUI__StatusBox);
+GAIM_PERL_BOOT_PROTO(GtkUI__Themes);
+GAIM_PERL_BOOT_PROTO(GtkUI__Utils);
+GAIM_PERL_BOOT_PROTO(GtkUI__Xfer);
+
+MODULE = Gaim::Gtk PACKAGE = Gaim::Gtk PREFIX = gaim_gtk_
+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);
+#ifndef _WIN32
+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);
Modified: trunk/gtk/plugins/perl/common/GtkUtils.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkUtils.xs 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/GtkUtils.xs 2006-09-17 05:35:46 UTC (rev 17291)
@@ -192,7 +192,7 @@
Gtk::Widget widget
*/
-MODULE = Gaim::Gtk::Utils PACKAGE = Gaim::Gtk::Utils PREFIX = gaim_gtk_utils_
+MODULE = Gaim::GtkUI::Utils PACKAGE = Gaim::GtkUI::Utils PREFIX = gaim_gtk_utils_
PROTOTYPES: ENABLE
gboolean
Modified: trunk/gtk/plugins/perl/common/MANIFEST
===================================================================
--- trunk/gtk/plugins/perl/common/MANIFEST 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/MANIFEST 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,5 +1,3 @@
-Gtk.pm
-Gtk.xs
GtkAccount.xs
GtkBlist.xs
GtkConn.xs
@@ -23,6 +21,8 @@
GtkSound.xs
GtkStatusBox.xs
GtkThemes.xs
+GtkUI.pm
+GtkUI.xs
GtkUtils.xs
MANIFEST
typemap
Modified: trunk/gtk/plugins/perl/common/Makefile.PL.in
===================================================================
--- trunk/gtk/plugins/perl/common/Makefile.PL.in 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/Makefile.PL.in 2006-09-17 05:35:46 UTC (rev 17291)
@@ -2,10 +2,10 @@
use ExtUtils::MakeMaker;
WriteMakefile(
- 'NAME' => 'Gaim::Gtk',
- 'VERSION_FROM' => '@srcdir@/Gtk.pm', # finds $VERSION
+ 'NAME' => 'Gaim::GtkUI',
+ 'VERSION_FROM' => '@srcdir@/GtkUI.pm', # finds $VERSION
($] >= 5.005 ? ## Add these new keywords supported since 5.005
- ('ABSTRACT_FROM' => '@srcdir@/Gtk.pm', # finds $ABSTRACT
+ ('ABSTRACT_FROM' => '@srcdir@/GtkUI.pm', # finds $ABSTRACT
'AUTHOR' => 'Gaim <http://gaim.sourceforge.net/>') : ()),
'DEFINE' => '@DEBUG_CFLAGS@',
'INC' => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libgaim -I@top_srcdir@/gtk @GTK_CFLAGS@',
Modified: trunk/gtk/plugins/perl/common/gtkmodule.h
===================================================================
--- trunk/gtk/plugins/perl/common/gtkmodule.h 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/gtkmodule.h 2006-09-17 05:35:46 UTC (rev 17291)
@@ -1,4 +1,4 @@
-typedef struct group *Gaim__Gtk__Group;
+typedef struct group *Gaim__GtkUI__Group;
#define group perl_group
@@ -41,39 +41,39 @@
#include "gtkutils.h"
/* gtkaccount.h */
-typedef GaimGtkAccountDialogType Gaim__Gtk__Account__Dialog__Type;
+typedef GaimGtkAccountDialogType Gaim__GtkUI__Account__Dialog__Type;
/* gtkblist.h */
-typedef GaimGtkBuddyList * Gaim__Gtk__BuddyList;
-typedef gaim_gtk_blist_sort_function Gaim__Gtk__BuddyList__SortFunction;
+typedef GaimGtkBuddyList * Gaim__GtkUI__BuddyList;
+typedef gaim_gtk_blist_sort_function Gaim__GtkUI__BuddyList__SortFunction;
/* gtkconv.h */
-typedef GaimGtkConversation * Gaim__Gtk__Conversation;
+typedef GaimGtkConversation * Gaim__GtkUI__Conversation;
typedef GaimUnseenState Gaim__UnseenState;
/* gtkconvwin.h */
-typedef GaimGtkWindow * Gaim__Gtk__Conversation__Window;
+typedef GaimGtkWindow * Gaim__GtkUI__Conversation__Window;
typedef GaimConvPlacementFunc Gaim__Conversation__PlacementFunc;
/* gtkft.h */
-typedef GaimGtkXferDialog * Gaim__Gtk__Xfer__Dialog;
+typedef GaimGtkXferDialog * Gaim__GtkUI__Xfer__Dialog;
/* gtkimhtml.h */
-typedef GtkIMHtml * Gaim__Gtk__IMHtml;
-typedef GtkIMHtmlButtons Gaim__Gtk__IMHtml__Buttons;
-typedef GtkIMHtmlFuncs * Gaim__Gtk__IMHtml__Funcs;
-typedef GtkIMHtmlScalable * Gaim__Gtk__IMHtml__Scalable;
-typedef GtkIMHtmlSmiley * Gaim__Gtk__IMHtml__Smiley;
-typedef GtkIMHtmlOptions Gaim__Gtk__IMHtml__Options;
+typedef GtkIMHtml * Gaim__GtkUI__IMHtml;
+typedef GtkIMHtmlButtons Gaim__GtkUI__IMHtml__Buttons;
+typedef GtkIMHtmlFuncs * Gaim__GtkUI__IMHtml__Funcs;
+typedef GtkIMHtmlScalable * Gaim__GtkUI__IMHtml__Scalable;
+typedef GtkIMHtmlSmiley * Gaim__GtkUI__IMHtml__Smiley;
+typedef GtkIMHtmlOptions Gaim__GtkUI__IMHtml__Options;
/* gtkimhtmltoolbar.h */
-typedef GtkIMHtmlToolbar * Gaim__Gtk__IMHtmlToolbar;
+typedef GtkIMHtmlToolbar * Gaim__GtkUI__IMHtmlToolbar;
/* gtkmenutray.h */
-typedef GaimGtkMenuTray * Gaim__Gtk__MenuTray;
+typedef GaimGtkMenuTray * Gaim__GtkUI__MenuTray;
/* gtkroomlist.h */
-typedef GaimGtkRoomlistDialog * Gaim__Gtk__Roomlist__Dialog;
+typedef GaimGtkRoomlistDialog * Gaim__GtkUI__Roomlist__Dialog;
/* gtkstatusbox.h */
-typedef GtkGaimStatusBox * Gaim__Gtk__StatusBox;
+typedef GtkGaimStatusBox * Gaim__GtkUI__StatusBox;
Modified: trunk/gtk/plugins/perl/common/typemap
===================================================================
--- trunk/gtk/plugins/perl/common/typemap 2006-09-17 04:42:42 UTC (rev 17290)
+++ trunk/gtk/plugins/perl/common/typemap 2006-09-17 05:35:46 UTC (rev 17291)
@@ -3,19 +3,19 @@
Gaim::UnseenState T_IV
Gaim::ButtonOrientation T_IV
-Gaim::Gtk::Account::Dialog::Type T_IV
-Gaim::Gtk::BuddyList T_GaimObj
-Gaim::Gtk::BuddyList::SortFunction T_GaimObj
-Gaim::Gtk::Conversation T_GaimObj
-Gaim::Gtk::Conversation::Window T_GaimObj
-Gaim::Gtk::Xfer::Dialog T_GaimObj
-Gaim::Gtk::IMHtml T_GaimObj
-Gaim::Gtk::IMHtml::Buttons T_IV
-Gaim::Gtk::IMHtml::Funcs T_GaimObj
-Gaim::Gtk::IMHtml::Scalable T_GaimObj
-Gaim::Gtk::IMHtml::Smiley T_GaimObj
-Gaim::Gtk::IMHtml::Options T_IV
-Gaim::Gtk::IMHtmlToolbar T_GaimObj
-Gaim::Gtk::MenuTray T_GaimObj
-Gaim::Gtk::Roomlist::Dialog T_GaimObj
-Gaim::Gtk::StatusBox T_GaimObj
+Gaim::GtkUI::Account::Dialog::Type T_IV
+Gaim::GtkUI::BuddyList T_GaimObj
+Gaim::GtkUI::BuddyList::SortFunction T_GaimObj
+Gaim::GtkUI::Conversation T_GaimObj
+Gaim::GtkUI::Conversation::Window T_GaimObj
+Gaim::GtkUI::Xfer::Dialog T_GaimObj
+Gaim::GtkUI::IMHtml T_GaimObj
+Gaim::GtkUI::IMHtml::Buttons T_IV
+Gaim::GtkUI::IMHtml::Funcs T_GaimObj
+Gaim::GtkUI::IMHtml::Scalable T_GaimObj
+Gaim::GtkUI::IMHtml::Smiley T_GaimObj
+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: <sa...@us...> - 2006-09-17 04:42:47
|
Revision: 17290
http://svn.sourceforge.net/gaim/?rev=17290&view=rev
Author: sadrul
Date: 2006-09-16 21:42:42 -0700 (Sat, 16 Sep 2006)
Log Message:
-----------
If a group is selected, and one of the buddies change status/goes
online/offline, the color of the selected group sometimes gets changed.
This fixes that.
Modified Paths:
--------------
trunk/gtk/gtkblist.c
Modified: trunk/gtk/gtkblist.c
===================================================================
--- trunk/gtk/gtkblist.c 2006-09-16 20:16:47 UTC (rev 17289)
+++ trunk/gtk/gtkblist.c 2006-09-17 04:42:42 UTC (rev 17290)
@@ -4357,7 +4357,7 @@
int count;
gboolean show = FALSE;
GaimBlistNode* gnode;
- gboolean selected = gtkblist ? (gtkblist->selected_node == node) : FALSE;
+ gboolean selected;
g_return_if_fail(node != NULL);
@@ -4370,6 +4370,7 @@
else
return;
+ selected = gtkblist ? (gtkblist->selected_node == gnode) : FALSE;
group = (GaimGroup*)gnode;
if(gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies"))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2006-09-16 20:16:56
|
Revision: 17289
http://svn.sourceforge.net/gaim/?rev=17289&view=rev
Author: markhuetsch
Date: 2006-09-16 13:16:47 -0700 (Sat, 16 Sep 2006)
Log Message:
-----------
This is easier to read and slightly more efficient.
Modified Paths:
--------------
trunk/libgaim/protocols/qq/crypt.c
Modified: trunk/libgaim/protocols/qq/crypt.c
===================================================================
--- trunk/libgaim/protocols/qq/crypt.c 2006-09-16 18:27:25 UTC (rev 17288)
+++ trunk/libgaim/protocols/qq/crypt.c 2006-09-16 20:16:47 UTC (rev 17289)
@@ -20,13 +20,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*
- * OICQ encryption algorithm
+ * QQ encryption algorithm
* Convert from ASM code provided by PerlOICQ
*
* Puzzlebird, Nov-Dec 2002
*/
-/*Notes: (OICQ uses 0x10 iterations, and modified something...)
+/*Notes: (QQ uses 16 rounds, and modified something...)
IN : 64 bits of data in v[0] - v[1].
OUT: 64 bits of data in w[0] - w[1].
@@ -53,6 +53,7 @@
* encryption
*******************************************************************/
+/* Tiny Encryption Algorithm (TEA) */
static void qq_encipher(guint32 *const v, const guint32 *const k, guint32 *const w)
{
register guint32 y = ntohl(v[0]),
@@ -79,97 +80,92 @@
return 0xdead;
} /* override with number, convenient for debug */
-/* we encrypt every eight byte chunk */
-static void encrypt_every_8_byte(guint8 *plain, guint8 *plain_pre_8, guint8 **crypted,
+/* 64-bit blocks and some kind of feedback mode of operation */
+static void encrypt_block(guint8 *plain, guint8 *plain_pre_8, guint8 **crypted,
guint8 **crypted_pre_8, const guint8 *const key, gint *count,
- gint *pos_in_byte, gint *is_header)
+ gint *pos_in_block, gint *is_header)
{
- /* prepare plain text */
- for (*pos_in_byte = 0; *pos_in_byte < 8; (*pos_in_byte)++) {
- if (*is_header) {
- plain[*pos_in_byte] ^= plain_pre_8[*pos_in_byte];
- } else {
- plain[*pos_in_byte] ^= (*crypted_pre_8)[*pos_in_byte];
- }
- }
+ /* prepare input text */
+ if (!*is_header)
+ *(guint64 *) plain ^= **(guint64 **) crypted_pre_8;
+
/* encrypt it */
qq_encipher((guint32 *) plain, (guint32 *) key, (guint32 *) *crypted);
- for (*pos_in_byte = 0; *pos_in_byte < 8; (*pos_in_byte)++) {
- (*crypted)[*pos_in_byte] ^= plain_pre_8[*pos_in_byte];
- }
+ **(guint64 **) crypted ^= *(guint64 *) plain_pre_8;
+
memcpy(plain_pre_8, plain, 8); /* prepare next */
*crypted_pre_8 = *crypted; /* store position of previous 8 byte */
*crypted += 8; /* prepare next output */
*count += 8; /* outstrlen increase by 8 */
- *pos_in_byte = 0; /* back to start */
+ *pos_in_block = 0; /* back to start */
*is_header = 0; /* and exit header */
-} /* encrypt_every_8_byte */
+} /* encrypt_block */
-
static void qq_encrypt(const guint8 *const instr, gint instrlen,
const guint8 *const key,
- guint8 *outstr, gint *outstrlen_prt)
+ guint8 *outstr, gint *outstrlen_ptr)
{
guint8 plain[8], /* plain text buffer */
plain_pre_8[8], /* plain text buffer, previous 8 bytes */
*crypted, /* crypted text */
- *crypted_pre_8; /* crypted test, previous 8 bytes */
+ *crypted_pre_8; /* crypted text, previous 8 bytes */
const guint8 *inp; /* current position in instr */
- gint pos_in_byte = 1, /* loop in the byte */
+ gint pos_in_block = 1, /* loop in the byte */
is_header = 1, /* header is one byte */
count = 0, /* number of bytes being crypted */
padding = 0; /* number of padding stuff */
- pos_in_byte = (instrlen + 0x0a) % 8; /* header padding decided by instrlen */
- if (pos_in_byte) {
- pos_in_byte = 8 - pos_in_byte;
- }
- plain[0] = (rand() & 0xf8) | pos_in_byte;
+ pos_in_block = (instrlen + 0x0a) % 8; /* header padding decided by instrlen */
+ if (pos_in_block)
+ pos_in_block = 8 - pos_in_block;
- memset(plain + 1, rand() & 0xff, pos_in_byte++);
+ /* initialization vector */
+ plain[0] = (rand() & 0xf8) | pos_in_block;
+ memset(plain + 1, rand() & 0xff, pos_in_block++);
+
memset(plain_pre_8, 0x00, sizeof(plain_pre_8));
crypted = crypted_pre_8 = outstr;
padding = 1; /* pad some stuff in header */
while (padding <= 2) { /* at most two bytes */
- if (pos_in_byte < 8) {
- plain[pos_in_byte++] = rand() & 0xff;
+ if (pos_in_block < 8) {
+ plain[pos_in_block++] = rand() & 0xff;
padding++;
}
- if (pos_in_byte == 8) {
- encrypt_every_8_byte(plain, plain_pre_8, &crypted, &crypted_pre_8,
- key, &count, &pos_in_byte, &is_header);
+ if (pos_in_block == 8) {
+ encrypt_block(plain, plain_pre_8, &crypted, &crypted_pre_8,
+ key, &count, &pos_in_block, &is_header);
}
}
inp = instr;
while (instrlen > 0) {
- if (pos_in_byte < 8) {
- plain[pos_in_byte++] = *(inp++);
+ if (pos_in_block < 8) {
+ plain[pos_in_block++] = *(inp++);
instrlen--;
}
- if (pos_in_byte == 8) {
- encrypt_every_8_byte(plain, plain_pre_8, &crypted, &crypted_pre_8,
- key, &count, &pos_in_byte, &is_header);
+ if (pos_in_block == 8) {
+ encrypt_block(plain, plain_pre_8, &crypted, &crypted_pre_8,
+ key, &count, &pos_in_block, &is_header);
}
}
padding = 1; /* pad some stuff in tail */
while (padding <= 7) { /* at most seven bytes */
- if (pos_in_byte < 8) {
- plain[pos_in_byte++] = 0x00;
+ if (pos_in_block < 8) {
+ plain[pos_in_block++] = 0x00;
padding++;
}
- if (pos_in_byte == 8) {
- encrypt_every_8_byte(plain, plain_pre_8, &crypted, &crypted_pre_8,
- key, &count, &pos_in_byte, &is_header);
+ if (pos_in_block == 8) {
+ encrypt_block(plain, plain_pre_8, &crypted, &crypted_pre_8,
+ key, &count, &pos_in_block, &is_header);
}
}
- *outstrlen_prt = count;
+ *outstrlen_ptr = count;
}
@@ -200,20 +196,20 @@
w[1] = htonl(z);
}
-static gint decrypt_every_8_byte(const guint8 **crypt_buff, const gint instrlen,
+static gint decrypt_block(const guint8 **crypt_buff, const gint instrlen,
const guint8 *const key, gint *context_start,
- guint8 *decrypted, gint *pos_in_byte)
+ guint8 *decrypted, gint *pos_in_block)
{
- for (*pos_in_byte = 0; *pos_in_byte < 8; (*pos_in_byte)++) {
- if (*context_start + *pos_in_byte >= instrlen)
- return 1;
- decrypted[*pos_in_byte] ^= (*crypt_buff)[*pos_in_byte];
- }
+ if (*context_start == instrlen)
+ return 1;
+
+ *(guint64 *) decrypted ^= **(guint64 **) crypt_buff;
+
qq_decipher((guint32 *) decrypted, (guint32 *) key, (guint32 *) decrypted);
*context_start += 8;
*crypt_buff += 8;
- *pos_in_byte = 0;
+ *pos_in_block = 0;
return 1;
}
@@ -225,19 +221,19 @@
{
guint8 decrypted[8], m[8], *outp;
const guint8 *crypt_buff, *crypt_buff_pre_8;
- gint count, context_start, pos_in_byte, padding;
+ gint count, context_start, pos_in_block, padding;
/* at least 16 bytes and %8 == 0 */
if ((instrlen % 8) || (instrlen < 16)) {
gaim_debug(GAIM_DEBUG_ERROR, "QQ",
- "Packet len is either too short or not a multiple of 8 bytes, read %d bytes\n",
+ "Ciphertext len is either too short or not a multiple of 8 bytes, read %d bytes\n",
instrlen);
return 0;
}
/* get information from header */
qq_decipher((guint32 *) instr, (guint32 *) key, (guint32 *) decrypted);
- pos_in_byte = decrypted[0] & 0x7;
- count = instrlen - pos_in_byte - 10; /* this is the plaintext length */
+ pos_in_block = decrypted[0] & 0x7;
+ count = instrlen - pos_in_block - 10; /* this is the plaintext length */
/* return if outstr buffer is not large enough or error plaintext length */
if (*outstrlen_ptr < count || count < 0) {
gaim_debug(GAIM_DEBUG_ERROR, "QQ", "Buffer len %d is less than real len %d",
@@ -251,18 +247,18 @@
crypt_buff = instr + 8; /* address of real data start */
context_start = 8; /* context is at the second block of 8 bytes */
- pos_in_byte++; /* start of paddng stuff */
+ pos_in_block++; /* start of paddng stuff */
padding = 1; /* at least one in header */
while (padding <= 2) { /* there are 2 byte padding stuff in header */
- if (pos_in_byte < 8) { /* bypass the padding stuff, it's nonsense data */
- pos_in_byte++;
+ if (pos_in_block < 8) { /* bypass the padding stuff, it's nonsense data */
+ pos_in_block++;
padding++;
}
- if (pos_in_byte == 8) {
+ if (pos_in_block == 8) {
crypt_buff_pre_8 = instr;
- if (!decrypt_every_8_byte(&crypt_buff, instrlen, key,
- &context_start, decrypted, &pos_in_byte)) {
+ if (!decrypt_block(&crypt_buff, instrlen, key,
+ &context_start, decrypted, &pos_in_block)) {
gaim_debug(GAIM_DEBUG_ERROR, "QQ", "decrypt every 8 bytes error A");
return 0;
}
@@ -271,16 +267,16 @@
outp = outstr;
while (count != 0) {
- if (pos_in_byte < 8) {
- *outp = crypt_buff_pre_8[pos_in_byte] ^ decrypted[pos_in_byte];
+ if (pos_in_block < 8) {
+ *outp = crypt_buff_pre_8[pos_in_block] ^ decrypted[pos_in_block];
outp++;
count--;
- pos_in_byte++;
+ pos_in_block++;
}
- if (pos_in_byte == 8) {
+ if (pos_in_block == 8) {
crypt_buff_pre_8 = crypt_buff - 8;
- if (!decrypt_every_8_byte(&crypt_buff, instrlen, key,
- &context_start, decrypted, &pos_in_byte)) {
+ if (!decrypt_block(&crypt_buff, instrlen, key,
+ &context_start, decrypted, &pos_in_block)) {
gaim_debug(GAIM_DEBUG_ERROR, "QQ", "decrypt every 8 bytes error B");
return 0;
}
@@ -288,15 +284,15 @@
}
for (padding = 1; padding < 8; padding++) {
- if (pos_in_byte < 8) {
- if (crypt_buff_pre_8[pos_in_byte] ^ decrypted[pos_in_byte])
+ if (pos_in_block < 8) {
+ if (crypt_buff_pre_8[pos_in_block] ^ decrypted[pos_in_block])
return 0;
- pos_in_byte++;
+ pos_in_block++;
}
- if (pos_in_byte == 8) {
+ if (pos_in_block == 8) {
crypt_buff_pre_8 = crypt_buff;
- if (!decrypt_every_8_byte(&crypt_buff, instrlen, key,
- &context_start, decrypted, &pos_in_byte)) {
+ if (!decrypt_block(&crypt_buff, instrlen, key,
+ &context_start, decrypted, &pos_in_block)) {
gaim_debug(GAIM_DEBUG_ERROR, "QQ", "decrypt every 8 bytes error C");
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <may...@us...> - 2006-09-16 18:27:35
|
Revision: 17288
http://svn.sourceforge.net/gaim/?rev=17288&view=rev
Author: mayuan2006
Date: 2006-09-16 11:27:25 -0700 (Sat, 16 Sep 2006)
Log Message:
-----------
Update the contact update soap request method,
Modified Paths:
--------------
branches/soc-2006-msnp13/src/protocols/msn/contact.c
branches/soc-2006-msnp13/src/protocols/msn/contact.h
Modified: branches/soc-2006-msnp13/src/protocols/msn/contact.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/contact.c 2006-09-16 05:38:33 UTC (rev 17287)
+++ branches/soc-2006-msnp13/src/protocols/msn/contact.c 2006-09-16 18:27:25 UTC (rev 17288)
@@ -585,6 +585,43 @@
}
static void
+msn_update_contact_read_cb(gpointer data, gint source, GaimInputCondition cond)
+{
+ gaim_debug_info("MaYuan","update contact read done\n");
+}
+
+static void
+msn_update_contact_written_cb(gpointer data, gint source, GaimInputCondition cond)
+{
+ MsnSoapConn * soapconn = data;
+
+ gaim_debug_info("MaYuan","update contact written\n");
+ soapconn->read_cb = msn_update_contact_read_cb;
+// msn_soap_read_cb(data,source,cond);
+}
+
+/*update a contact's Nickname*/
+void
+msn_update_contact(MsnContact *contact,const char* nickname)
+{
+ MsnSoapReq *soap_request;
+ char *body = NULL;
+
+ gaim_debug_info("MaYuan","msn unblock a contact...\n");
+
+ body = g_strdup_printf(MSN_CONTACT_UPDATE_TEMPLATE,nickname);
+ /*build SOAP and POST it*/
+ soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
+ MSN_ADDRESS_BOOK_POST_URL,MSN_CONTACT_UPDATE_SOAP_ACTION,
+ body,
+ msn_update_contact_read_cb,
+ msn_update_contact_written_cb);
+ msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
+
+ g_free(body);
+}
+
+static void
msn_block_read_cb(gpointer data, gint source, GaimInputCondition cond)
{
gaim_debug_info("MaYuan","block read done\n");
Modified: branches/soc-2006-msnp13/src/protocols/msn/contact.h
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/contact.h 2006-09-16 05:38:33 UTC (rev 17287)
+++ branches/soc-2006-msnp13/src/protocols/msn/contact.h 2006-09-16 18:27:25 UTC (rev 17288)
@@ -142,6 +142,36 @@
#define MSN_CONTACT_UNBLOCK_SOAP_ACTION "http://www.msn.com/webservices/AddressBook/DeleteMember"
#define MSN_UNBLOCK_CONTACT_TEMPLATE "<?xml version=\"1.0\" encoding=\"utf-8\"?><soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"><soap:Header><ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>BlockUnblock</PartnerScenario></ABApplicationHeader><ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ManagedGroupRequest>false</ManagedGroupRequest></ABAuthHeader></soap:Header><soap:Body><DeleteMember xmlns=\"http://www.msn.com/webservices/AddressBook\"><serviceHandle><Id>0</Id><Type>Messenger</Type><ForeignId></ForeignId></serviceHandle><memberships><Membership><MemberRole>Block</MemberRole><Members>%s</Members></Membership></memberships></DeleteMember></soap:Body></soap:Envelope>"
+/*Update Contact Nickname*/
+#define MSN_CONTACT_UPDATE_SOAP_ACTION "http://www.msn.com/webservices/AddressBook/ABContactUpdate"
+#define MSN_CONTACT_UPDATE_TEMPLATE "<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
+"<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\">"\
+"<soap:Header>"\
+ "<ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+ "<ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId>"\
+ "<IsMigration>false</IsMigration>"\
+ "<PartnerScenario>Timer</PartnerScenario>"\
+ "</ABApplicationHeader>"\
+ "<ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+ "<ManagedGroupRequest>false</ManagedGroupRequest>"\
+ "</ABAuthHeader>"\
+ "</soap:Header>"\
+ "<soap:Body>"\
+ "<ABContactUpdate xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+ "<abId>00000000-0000-0000-0000-000000000000</abId>"\
+ "<contacts>"\
+ "<Contact xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
+ "<contactInfo>"\
+ "<contactType>Me</contactType>"\
+ "<displayName>%s</displayName>"\
+ "</contactInfo>"\
+ "<propertiesChanged>DisplayName</propertiesChanged>"\
+ "</Contact>"\
+ "</contacts>"\
+ "</ABContactUpdate>"\
+ "</soap:Body>"\
+"</soap:Envelope> "
+
/*******************************************************
* Group SOAP Action
*******************************************************/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-09-16 05:38:38
|
Revision: 17287
http://svn.sourceforge.net/gaim/?rev=17287&view=rev
Author: sadrul
Date: 2006-09-15 22:38:33 -0700 (Fri, 15 Sep 2006)
Log Message:
-----------
I think this is slightly better.
Modified Paths:
--------------
trunk/gtk/gtkblist.c
trunk/gtk/gtkcellrendererexpander.c
Modified: trunk/gtk/gtkblist.c
===================================================================
--- trunk/gtk/gtkblist.c 2006-09-16 03:29:21 UTC (rev 17286)
+++ trunk/gtk/gtkblist.c 2006-09-16 05:38:33 UTC (rev 17287)
@@ -3984,6 +3984,7 @@
gtk_tree_view_column_pack_start(column, rend, FALSE);
gtk_tree_view_column_set_attributes(column, rend,
"expander-visible", GROUP_EXPANDER_COLUMN,
+ "sensitive", GROUP_EXPANDER_COLUMN,
"cell-background-gdk", BGCOLOR_COLUMN,
NULL);
@@ -3991,6 +3992,7 @@
gtk_tree_view_column_pack_start(column, rend, FALSE);
gtk_tree_view_column_set_attributes(column, rend,
"expander-visible", CONTACT_EXPANDER_COLUMN,
+ "sensitive", CONTACT_EXPANDER_COLUMN,
"visible", CONTACT_EXPANDER_VISIBLE_COLUMN,
"cell-background-gdk", BGCOLOR_COLUMN,
NULL);
@@ -4528,7 +4530,6 @@
if(gtknode->contact_expanded) {
GdkPixbuf *status;
char *mark;
- char *white;
status = gaim_gtk_blist_get_status_icon(cnode,
(gaim_prefs_get_bool("/gaim/gtk/blist/show_buddy_icons") ?
Modified: trunk/gtk/gtkcellrendererexpander.c
===================================================================
--- trunk/gtk/gtkcellrendererexpander.c 2006-09-16 03:29:21 UTC (rev 17286)
+++ trunk/gtk/gtkcellrendererexpander.c 2006-09-16 05:38:33 UTC (rev 17287)
@@ -265,7 +265,7 @@
cell->is_expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED);
}
-static gint gaim_gtk_cell_renderer_expander_activate(GtkCellRenderer *r,
+static gboolean gaim_gtk_cell_renderer_expander_activate(GtkCellRenderer *r,
GdkEvent *event,
GtkWidget *widget,
const gchar *p,
@@ -280,4 +280,5 @@
else
gtk_tree_view_expand_row(GTK_TREE_VIEW(widget),path,FALSE);
gtk_tree_path_free(path);
+ return FALSE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-09-16 03:29:25
|
Revision: 17286
http://svn.sourceforge.net/gaim/?rev=17286&view=rev
Author: sadrul
Date: 2006-09-15 20:29:21 -0700 (Fri, 15 Sep 2006)
Log Message:
-----------
Whether the prpl supports sending inline images or not is not relevant here.
Modified Paths:
--------------
trunk/gtk/gtkaccount.c
Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c 2006-09-16 00:56:13 UTC (rev 17285)
+++ trunk/gtk/gtkaccount.c 2006-09-16 03:29:21 UTC (rev 17286)
@@ -1123,7 +1123,7 @@
/* Buddy Icon */
prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(dialog->plugin);
- if ((prpl_info != NULL) && (prpl_info->options & OPT_PROTO_IM_IMAGE))
+ if (prpl_info != NULL && prpl_info->icon_spec.format != NULL)
{
if (new || gaim_account_get_ui_bool(account, GAIM_GTK_UI, "use-global-buddyicon", TRUE) ==
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check)))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-09-16 00:56:15
|
Revision: 17285
http://svn.sourceforge.net/gaim/?rev=17285&view=rev
Author: seanegan
Date: 2006-09-15 17:56:13 -0700 (Fri, 15 Sep 2006)
Log Message:
-----------
Thinking about it, group counts are kinda stupid. I think I've been their major
defender in the various prefslashes, so I don't think anyone objects to me
removing them.
Modified Paths:
--------------
trunk/gtk/gtkblist.c
Modified: trunk/gtk/gtkblist.c
===================================================================
--- trunk/gtk/gtkblist.c 2006-09-15 22:05:34 UTC (rev 17284)
+++ trunk/gtk/gtkblist.c 2006-09-16 00:56:13 UTC (rev 17285)
@@ -4401,14 +4401,11 @@
esc = g_markup_escape_text(group->name, -1);
if (selected)
- mark = g_strdup_printf("<span weight='bold'>%s</span> (%d/%d)",
- esc, gaim_blist_get_group_online_count(group),
- gaim_blist_get_group_size(group, FALSE));
+ mark = g_strdup_printf("<span weight='bold'>%s</span>",esc);
else
- mark = g_strdup_printf("<span color='#%02x%02x%02x'><span weight='bold'>%s</span> (%d/%d)</span>",
+ mark = g_strdup_printf("<span color='#%02x%02x%02x' weight='bold'>%s</span>",
textcolor.red>>8, textcolor.green>>8, textcolor.blue>>8,
- esc, gaim_blist_get_group_online_count(group),
- gaim_blist_get_group_size(group, FALSE));
+ esc);
g_free(esc);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-09-15 22:05:40
|
Revision: 17284
http://svn.sourceforge.net/gaim/?rev=17284&view=rev
Author: seanegan
Date: 2006-09-15 15:05:34 -0700 (Fri, 15 Sep 2006)
Log Message:
-----------
GtkCellRendererExpander draws an expander in a renderer to avoid a large, needless margin.
The approach is a bit hacky, but it's a good job.
- RTL fix in GtkStatusBox
- Drag-and-drop image into the global buddy icon selector to set a buddy icon
Modified Paths:
--------------
trunk/gtk/Makefile.am
trunk/gtk/gaimstock.c
trunk/gtk/gaimstock.h
trunk/gtk/gtkblist.c
trunk/gtk/gtkblist.h
trunk/gtk/gtkmain.c
trunk/gtk/gtkstatusbox.c
trunk/gtk/pixmaps/Makefile.am
Added Paths:
-----------
trunk/gtk/gtkcellrendererexpander.c
trunk/gtk/gtkcellrendererexpander.h
Removed Paths:
-------------
trunk/gtk/pixmaps/expander-collapsed.png
trunk/gtk/pixmaps/expander-expanded.png
Modified: trunk/gtk/Makefile.am
===================================================================
--- trunk/gtk/Makefile.am 2006-09-15 17:10:37 UTC (rev 17283)
+++ trunk/gtk/Makefile.am 2006-09-15 22:05:34 UTC (rev 17284)
@@ -64,6 +64,7 @@
gtkaccount.c \
gtkblist.c \
gtkcelllayout.c \
+ gtkcellrendererexpander.c \
gtkcellrendererprogress.c \
gtkcellview.c \
gtkcellviewmenuitem.c \
@@ -102,6 +103,7 @@
gtkaccount.h \
gtkblist.h \
gtkcelllayout.h \
+ gtkcellrendererexpander.h \
gtkcellrendererprogress.h \
gtkcellview.h \
gtkcellviewmenuitem.h \
Modified: trunk/gtk/gaimstock.c
===================================================================
--- trunk/gtk/gaimstock.c 2006-09-15 17:10:37 UTC (rev 17283)
+++ trunk/gtk/gaimstock.c 2006-09-15 22:05:34 UTC (rev 17284)
@@ -130,8 +130,6 @@
{ GAIM_STOCK_STATUS_CONNECT2, "gaim", "status-connect2.png" },
{ GAIM_STOCK_STATUS_CONNECT3, "gaim", "status-connect3.png" },
{ GAIM_STOCK_UPLOAD, NULL, GTK_STOCK_GO_UP },
- { GAIM_STOCK_EXPANDER_EXPANDED,"gaim", "expander-expanded.png" },
- { GAIM_STOCK_EXPANDER_COLLAPSED,"gaim", "expander-collapsed.png" },
};
static const GtkStockItem stock_items[] =
Modified: trunk/gtk/gaimstock.h
===================================================================
--- trunk/gtk/gaimstock.h 2006-09-15 17:10:37 UTC (rev 17283)
+++ trunk/gtk/gaimstock.h 2006-09-15 22:05:34 UTC (rev 17284)
@@ -98,8 +98,6 @@
#define GAIM_STOCK_TYPING "gaim-typing"
#define GAIM_STOCK_UPLOAD "gaim-upload"
#define GAIM_STOCK_VOICE_CHAT "gaim-voice-chat"
-#define GAIM_STOCK_EXPANDER_EXPANDED "gaim-stock-expander-expanded"
-#define GAIM_STOCK_EXPANDER_COLLAPSED "gaim-stock-expander-collapsed"
/*@}*/
/**
Modified: trunk/gtk/gtkblist.c
===================================================================
--- trunk/gtk/gtkblist.c 2006-09-15 17:10:37 UTC (rev 17283)
+++ trunk/gtk/gtkblist.c 2006-09-15 22:05:34 UTC (rev 17284)
@@ -41,6 +41,7 @@
#include "gtkaccount.h"
#include "gtkblist.h"
+#include "gtkcellrendererexpander.h"
#include "gtkconv.h"
#include "gtkdebug.h"
#include "gtkdialogs.h"
@@ -810,10 +811,10 @@
} else if (GAIM_BLIST_NODE_IS_CHAT(node)) {
gtk_blist_join_chat((GaimChat *)node);
} else if (GAIM_BLIST_NODE_IS_GROUP(node)) {
- if (gtk_tree_view_row_expanded(tv, path))
+/* if (gtk_tree_view_row_expanded(tv, path))
gtk_tree_view_collapse_row(tv, path);
else
- gtk_tree_view_expand_row(tv,path,FALSE);
+ gtk_tree_view_expand_row(tv,path,FALSE);*/
}
}
@@ -3928,10 +3929,18 @@
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtkblist->treemodel = gtk_tree_store_new(BLIST_COLUMNS,
- GDK_TYPE_PIXBUF, G_TYPE_BOOLEAN, G_TYPE_STRING,
- G_TYPE_STRING, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_BOOLEAN,
- G_TYPE_POINTER, GDK_TYPE_COLOR, GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF,
- G_TYPE_BOOLEAN);
+ GDK_TYPE_PIXBUF, /* Status icon */
+ G_TYPE_BOOLEAN, /* Status icon visible */
+ G_TYPE_STRING, /* Name */
+ G_TYPE_STRING, /* Idle */
+ G_TYPE_BOOLEAN, /* Idle visible */
+ GDK_TYPE_PIXBUF, /* Buddy icon */
+ G_TYPE_BOOLEAN, /* Buddy icon visible */
+ G_TYPE_POINTER, /* Node */
+ GDK_TYPE_COLOR, /* bgcolor */
+ G_TYPE_BOOLEAN, /* Group expander */
+ G_TYPE_BOOLEAN, /* Contact expander */
+ G_TYPE_BOOLEAN); /* Contact expander visible */
gtkblist->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(gtkblist->treemodel));
@@ -3971,17 +3980,17 @@
gtk_tree_view_set_expander_column(GTK_TREE_VIEW(gtkblist->treeview), column);
gtkblist->text_column = column = gtk_tree_view_column_new ();
- rend = gtk_cell_renderer_pixbuf_new();
+ rend = gaim_gtk_cell_renderer_expander_new();
gtk_tree_view_column_pack_start(column, rend, FALSE);
gtk_tree_view_column_set_attributes(column, rend,
- "pixbuf", GROUP_EXPANDER_COLUMN,
+ "expander-visible", GROUP_EXPANDER_COLUMN,
"cell-background-gdk", BGCOLOR_COLUMN,
NULL);
- rend = gtk_cell_renderer_pixbuf_new();
+ rend = gaim_gtk_cell_renderer_expander_new();
gtk_tree_view_column_pack_start(column, rend, FALSE);
gtk_tree_view_column_set_attributes(column, rend,
- "pixbuf", CONTACT_EXPANDER_COLUMN,
+ "expander-visible", CONTACT_EXPANDER_COLUMN,
"visible", CONTACT_EXPANDER_VISIBLE_COLUMN,
"cell-background-gdk", BGCOLOR_COLUMN,
NULL);
@@ -4026,9 +4035,6 @@
NULL);
- gtkblist->expander_expanded = gtk_widget_render_icon(gtkblist->treeview, GAIM_STOCK_EXPANDER_EXPANDED, -1, NULL);
- gtkblist->expander_collapsed = gtk_widget_render_icon(gtkblist->treeview, GAIM_STOCK_EXPANDER_COLLAPSED, -1, NULL);
-
g_signal_connect(G_OBJECT(gtkblist->treeview), "row-activated", G_CALLBACK(gtk_blist_row_activated_cb), NULL);
g_signal_connect(G_OBJECT(gtkblist->treeview), "row-expanded", G_CALLBACK(gtk_blist_row_expanded_cb), NULL);
g_signal_connect(G_OBJECT(gtkblist->treeview), "row-collapsed", G_CALLBACK(gtk_blist_row_collapsed_cb), NULL);
@@ -4412,7 +4418,7 @@
NAME_COLUMN, mark,
NODE_COLUMN, gnode,
BGCOLOR_COLUMN, &bgcolor,
- GROUP_EXPANDER_COLUMN, expanded ? gtkblist->expander_expanded : gtkblist->expander_collapsed,
+ GROUP_EXPANDER_COLUMN, TRUE,
CONTACT_EXPANDER_VISIBLE_COLUMN, FALSE,
BUDDY_ICON_VISIBLE_COLUMN, FALSE,
IDLE_VISIBLE_COLUMN, FALSE,
@@ -4540,7 +4546,7 @@
IDLE_VISIBLE_COLUMN, FALSE,
BGCOLOR_COLUMN, NULL,
BUDDY_ICON_COLUMN, NULL,
- CONTACT_EXPANDER_COLUMN, gtkblist->expander_expanded,
+ CONTACT_EXPANDER_COLUMN, TRUE,
CONTACT_EXPANDER_VISIBLE_COLUMN, TRUE,
-1);
g_free(mark);
Modified: trunk/gtk/gtkblist.h
===================================================================
--- trunk/gtk/gtkblist.h 2006-09-15 17:10:37 UTC (rev 17283)
+++ trunk/gtk/gtkblist.h 2006-09-15 22:05:34 UTC (rev 17284)
@@ -94,10 +94,6 @@
GaimBlistNode *selected_node; /**< The currently selected node */
GtkWidget *error_buttons; /**< Box containing the connection error buttons */
GtkWidget *statusbox; /**< The status selector dropdown */
- GdkPixbuf *east, *south; /**< Drop shadow stuff */
- GdkWindow *east_shadow, *south_shadow; /**< Drop shadow stuff */
- GdkPixbuf *expander_collapsed; /**< A collapsed expander */
- GdkPixbuf *expander_expanded; /**< An expanded expander */
};
#define GAIM_GTK_BLIST(list) ((GaimGtkBuddyList *)(list)->ui_data)
Added: trunk/gtk/gtkcellrendererexpander.c
===================================================================
--- trunk/gtk/gtkcellrendererexpander.c (rev 0)
+++ trunk/gtk/gtkcellrendererexpander.c 2006-09-15 22:05:34 UTC (rev 17284)
@@ -0,0 +1,283 @@
+/*
+ * @file gtkcellrendererexpander.c GTK+ Cell Renderer Expander
+ * @ingroup gtkui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+/* This is taken largely from GtkCellRenderer[Text|Pixbuf|Toggle] by
+ * Jonathon Blandford <jr...@re...> for RedHat, Inc.
+ */
+
+#include <gtk/gtktreeview.h>
+#include "gtkcellrendererexpander.h"
+
+static void gaim_gtk_cell_renderer_expander_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void gaim_gtk_cell_renderer_expander_set_property (GObject *object,
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gaim_gtk_cell_renderer_expander_init (GaimGtkCellRendererExpander *cellexpander);
+static void gaim_gtk_cell_renderer_expander_class_init (GaimGtkCellRendererExpanderClass *class);
+static void gaim_gtk_cell_renderer_expander_get_size (GtkCellRenderer *cell,
+ GtkWidget *widget,
+ GdkRectangle *cell_area,
+ gint *x_offset,
+ gint *y_offset,
+ gint *width,
+ gint *height);
+static void gaim_gtk_cell_renderer_expander_render (GtkCellRenderer *cell,
+ GdkWindow *window,
+ GtkWidget *widget,
+ GdkRectangle *background_area,
+ GdkRectangle *cell_area,
+ GdkRectangle *expose_area,
+ guint flags);
+static gboolean gaim_gtk_cell_renderer_expander_activate (GtkCellRenderer *cell,
+ GdkEvent *event,
+ GtkWidget *widget,
+ const gchar *path,
+ GdkRectangle *background_area,
+ GdkRectangle *cell_area,
+ guint flags);
+static void gaim_gtk_cell_renderer_expander_finalize (GObject *gobject);
+
+enum {
+ LAST_SIGNAL
+};
+
+enum {
+ PROP_0,
+ PROP_IS_EXPANDER
+};
+
+static gpointer parent_class;
+/* static guint expander_cell_renderer_signals [LAST_SIGNAL]; */
+
+GType gaim_gtk_cell_renderer_expander_get_type (void)
+{
+ static GType cell_expander_type = 0;
+
+ if (!cell_expander_type)
+ {
+ static const GTypeInfo cell_expander_info =
+ {
+ sizeof (GaimGtkCellRendererExpanderClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gaim_gtk_cell_renderer_expander_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GaimGtkCellRendererExpander),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gaim_gtk_cell_renderer_expander_init,
+ NULL /* value_table */
+ };
+
+ cell_expander_type =
+ g_type_register_static (GTK_TYPE_CELL_RENDERER,
+ "GaimGtkCellRendererExpander",
+ &cell_expander_info, 0);
+ }
+
+ return cell_expander_type;
+}
+
+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)->ypad = 2;
+}
+
+static void gaim_gtk_cell_renderer_expander_class_init (GaimGtkCellRendererExpanderClass *class)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS(class);
+ GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS(class);
+
+ parent_class = g_type_class_peek_parent (class);
+ object_class->finalize = gaim_gtk_cell_renderer_expander_finalize;
+
+ object_class->get_property = gaim_gtk_cell_renderer_expander_get_property;
+ object_class->set_property = gaim_gtk_cell_renderer_expander_set_property;
+
+ cell_class->get_size = gaim_gtk_cell_renderer_expander_get_size;
+ cell_class->render = gaim_gtk_cell_renderer_expander_render;
+ cell_class->activate = gaim_gtk_cell_renderer_expander_activate;
+
+ g_object_class_install_property (object_class,
+ PROP_IS_EXPANDER,
+ g_param_spec_boolean ("expander-visible",
+ "Is Expander",
+ "True if the renderer should draw an expander",
+ FALSE,
+ G_PARAM_READWRITE));
+}
+
+static void gaim_gtk_cell_renderer_expander_finalize (GObject *object)
+{
+/*
+ GaimGtkCellRendererExpander *cellexpander = GAIM_GTK_CELL_RENDERER_EXPANDER(object);
+*/
+
+ (* G_OBJECT_CLASS (parent_class)->finalize) (object);
+}
+
+static void gaim_gtk_cell_renderer_expander_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
+ GParamSpec *psec)
+{
+ GaimGtkCellRendererExpander *cellexpander = GAIM_GTK_CELL_RENDERER_EXPANDER(object);
+
+ switch (param_id)
+ {
+ case PROP_IS_EXPANDER:
+ g_value_set_boolean(value, cellexpander->is_expander);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, psec);
+ break;
+
+ }
+}
+
+static void gaim_gtk_cell_renderer_expander_set_property (GObject *object,
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GaimGtkCellRendererExpander *cellexpander = GAIM_GTK_CELL_RENDERER_EXPANDER (object);
+
+ switch (param_id)
+ {
+ case PROP_IS_EXPANDER:
+ cellexpander->is_expander = g_value_get_boolean(value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
+ break;
+ }
+}
+
+GtkCellRenderer *gaim_gtk_cell_renderer_expander_new(void)
+{
+ return g_object_new(GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, NULL);
+}
+
+static void gaim_gtk_cell_renderer_expander_get_size (GtkCellRenderer *cell,
+ GtkWidget *widget,
+ GdkRectangle *cell_area,
+ gint *x_offset,
+ gint *y_offset,
+ gint *width,
+ gint *height)
+{
+ gint calc_width;
+ gint calc_height;
+ gint expander_size;
+
+ gtk_widget_style_get(widget, "expander-size", &expander_size, NULL);
+
+ calc_width = (gint) cell->xpad * 2 + expander_size;
+ calc_height = (gint) cell->ypad * 2 + expander_size;
+
+ if (width)
+ *width = calc_width;
+
+ if (height)
+ *height = calc_height;
+
+ if (cell_area)
+ {
+ if (x_offset)
+ {
+ *x_offset = cell->xalign * (cell_area->width - calc_width);
+ *x_offset = MAX (*x_offset, 0);
+ }
+ if (y_offset)
+ {
+ *y_offset = cell->yalign * (cell_area->height - calc_height);
+ *y_offset = MAX (*y_offset, 0);
+ }
+ }
+}
+
+
+static void gaim_gtk_cell_renderer_expander_render (GtkCellRenderer *cell,
+ GdkWindow *window,
+ GtkWidget *widget,
+ GdkRectangle *background_area,
+ GdkRectangle *cell_area,
+ GdkRectangle *expose_area,
+ guint flags)
+{
+ GaimGtkCellRendererExpander *cellexpander = (GaimGtkCellRendererExpander *) cell;
+
+ gint width, height;
+ GtkStateType state;
+
+ if (!cellexpander->is_expander)
+ return;
+
+ width = cell_area->width;
+ height = cell_area->height;
+
+ if (!cell->sensitive)
+ state = GTK_STATE_INSENSITIVE;
+ else if (flags & GTK_CELL_RENDERER_PRELIT)
+ state = GTK_STATE_PRELIGHT;
+ else if (GTK_WIDGET_HAS_FOCUS (widget) && flags & GTK_CELL_RENDERER_SELECTED)
+ state = GTK_STATE_ACTIVE;
+ else
+ state = GTK_STATE_NORMAL;
+
+ width -= cell->xpad*2;
+ height -= cell->ypad*2;
+
+ gtk_paint_expander (widget->style,
+ window, state,
+ NULL, widget, "treeview",
+ cell_area->x + cell->xpad + (width / 2),
+ cell_area->y + cell->ypad + (height / 2),
+ cell->is_expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED);
+}
+
+static gint gaim_gtk_cell_renderer_expander_activate(GtkCellRenderer *r,
+ GdkEvent *event,
+ GtkWidget *widget,
+ const gchar *p,
+ GdkRectangle *bg,
+ GdkRectangle *cell,
+ 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
+ gtk_tree_view_expand_row(GTK_TREE_VIEW(widget),path,FALSE);
+ gtk_tree_path_free(path);
+}
Property changes on: trunk/gtk/gtkcellrendererexpander.c
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/gtk/gtkcellrendererexpander.h
===================================================================
--- trunk/gtk/gtkcellrendererexpander.h (rev 0)
+++ trunk/gtk/gtkcellrendererexpander.h 2006-09-15 22:05:34 UTC (rev 17284)
@@ -0,0 +1,59 @@
+/* gtkxcellrendererexpander.h
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+#ifndef _GAIM_GTKCELLRENDEREREXPANDER_H_
+#define _GAIM_GTKCELLRENDEREREXPANDER_H_
+
+#include <gtk/gtkcellrenderer.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+#define GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER (gaim_gtk_cell_renderer_expander_get_type())
+#define GAIM_GTK_CELL_RENDERER_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, GaimGtkCellRendererExpander))
+#define GAIM_GTK_CELL_RENDERER_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, GaimGtkCellRendererExpanderClass))
+#define GAIM_IS_GTK_CELL_RENDERER_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER))
+#define GAIM_IS_GTK_CELL_RENDERER_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER))
+#define GAIM_GTK_CELL_RENDERER_EXPANDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, GaimGtkCellRendererExpanderClass))
+
+typedef struct _GaimGtkCellRendererExpander GaimGtkCellRendererExpander;
+typedef struct _GaimGtkCellRendererExpanderClass GaimGtkCellRendererExpanderClass;
+
+struct _GaimGtkCellRendererExpander {
+ GtkCellRenderer parent;
+
+ gboolean is_expander;
+};
+
+struct _GaimGtkCellRendererExpanderClass {
+ GtkCellRendererClass parent_class;
+};
+
+GType gaim_gtk_cell_renderer_expander_get_type (void);
+GtkCellRenderer *gaim_gtk_cell_renderer_expander_new (void);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _GAIM_GTKCELLRENDEREREXPANDER_H_ */
Property changes on: trunk/gtk/gtkcellrendererexpander.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/gtk/gtkmain.c
===================================================================
--- trunk/gtk/gtkmain.c 2006-09-15 17:10:37 UTC (rev 17283)
+++ trunk/gtk/gtkmain.c 2006-09-15 22:05:34 UTC (rev 17284)
@@ -796,7 +796,6 @@
#ifdef HAVE_STARTUP_NOTIFICATION
startup_notification_complete();
#endif
-
gtk_main();
#ifdef HAVE_SIGNAL_H
Modified: trunk/gtk/gtkstatusbox.c
===================================================================
--- trunk/gtk/gtkstatusbox.c 2006-09-15 17:10:37 UTC (rev 17283)
+++ trunk/gtk/gtkstatusbox.c 2006-09-15 22:05:34 UTC (rev 17284)
@@ -238,6 +238,36 @@
return FALSE;
}
+static void
+icon_box_dnd_cb(GtkWidget *widget, GdkDragContext *dc, gint x, gint y,
+ GtkSelectionData *sd, guint info, guint t, GtkGaimStatusBox *box)
+{
+ gchar *name = (gchar *)sd->data;
+
+ if ((sd->length >= 0) && (sd->format == 8)) {
+ /* Well, it looks like the drag event was cool.
+ * Let's do something with it */
+ if (!g_ascii_strncasecmp(name, "file://", 7)) {
+ GError *converr = NULL;
+ gchar *tmp, *rtmp;
+
+ if(!(tmp = g_filename_from_uri(name, NULL, &converr))) {
+ gaim_debug(GAIM_DEBUG_ERROR, "buddyicon", "%s\n",
+ (converr ? converr->message :
+ "g_filename_from_uri error"));
+ return;
+ }
+ if ((rtmp = strchr(tmp, '\r')) || (rtmp = strchr(tmp, '\n')))
+ *rtmp = '\0';
+ icon_choose_cb(tmp, box);
+ g_free(tmp);
+ }
+ gtk_drag_finish(dc, TRUE, FALSE, t);
+ }
+ gtk_drag_finish(dc, FALSE, FALSE, t);
+}
+
+
static gboolean
icon_box_enter_cb(GtkWidget *widget, GdkEventCrossing *event, GtkGaimStatusBox *box)
{
@@ -254,6 +284,13 @@
return FALSE;
}
+
+static const GtkTargetEntry dnd_targets[] = {
+ {"text/plain", 0, 0},
+ {"text/uri-list", 0, 1},
+ {"STRING", 0, 2}
+};
+
static void
setup_icon_box(GtkGaimStatusBox *status_box)
{
@@ -273,9 +310,19 @@
}
status_box->icon = gtk_image_new_from_pixbuf(status_box->buddy_icon);
status_box->icon_box = gtk_event_box_new();
+
status_box->hand_cursor = gdk_cursor_new (GDK_HAND2);
status_box->arrow_cursor = gdk_cursor_new (GDK_LEFT_PTR);
+ /* Set up DND */
+ gtk_drag_dest_set(status_box->icon_box,
+ GTK_DEST_DEFAULT_MOTION |
+ GTK_DEST_DEFAULT_DROP,
+ dnd_targets,
+ sizeof(dnd_targets) / sizeof(GtkTargetEntry),
+ GDK_ACTION_COPY);
+
+ g_signal_connect(G_OBJECT(status_box->icon_box), "drag_data_received", G_CALLBACK(icon_box_dnd_cb), status_box);
g_signal_connect(G_OBJECT(status_box->icon_box), "enter-notify-event", G_CALLBACK(icon_box_enter_cb), status_box);
g_signal_connect(G_OBJECT(status_box->icon_box), "leave-notify-event", G_CALLBACK(icon_box_leave_cb), status_box);
g_signal_connect(G_OBJECT(status_box->icon_box), "button-press-event", G_CALLBACK(icon_box_press_cb), status_box);
@@ -1272,11 +1319,17 @@
if (status_box->icon_box)
{
+ GtkTextDirection dir = gtk_widget_get_direction(widget);
parent_alc.width -= (parent_alc.height + border_width);
icon_alc = *allocation;
icon_alc.height = MAX(1,req.height) - (border_width);
icon_alc.width = icon_alc.height;
- icon_alc.x = allocation->width - (icon_alc.width + border_width);
+ if (dir == GTK_TEXT_DIR_RTL) {
+ icon_alc.x = parent_alc.x;
+ parent_alc.x += icon_alc.width + border_width;
+ } else {
+ icon_alc.x = allocation->width - (icon_alc.width + border_width);
+ }
icon_alc.y += border_width;
if (status_box->icon_size != icon_alc.height)
Modified: trunk/gtk/pixmaps/Makefile.am
===================================================================
--- trunk/gtk/pixmaps/Makefile.am 2006-09-15 17:10:37 UTC (rev 17283)
+++ trunk/gtk/pixmaps/Makefile.am 2006-09-15 22:05:34 UTC (rev 17284)
@@ -8,8 +8,6 @@
change-fgcolor-small.png \
connect.png \
edit.png \
- expander-expanded.png \
- expander-collapsed.png \
gaim.png \
gaim.svg \
gaim_auth.png \
@@ -84,7 +82,7 @@
gaimiconpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png stock_connect_16.png stock_disconnect_16.png
gaimdistpixdir = $(datadir)/pixmaps/gaim
-gaimdistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png expander-expanded.png expander-collapsed.png
+gaimdistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png
distpixmapdir = $(datadir)/pixmaps
distpixmap_DATA = gaim.png gaim.svg
Deleted: trunk/gtk/pixmaps/expander-collapsed.png
===================================================================
(Binary files differ)
Deleted: trunk/gtk/pixmaps/expander-expanded.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-09-15 17:10:43
|
Revision: 17283
http://svn.sourceforge.net/gaim/?rev=17283&view=rev
Author: seanegan
Date: 2006-09-15 10:10:37 -0700 (Fri, 15 Sep 2006)
Log Message:
-----------
Only color the group name when not selected
Modified Paths:
--------------
trunk/gtk/gtkblist.c
Modified: trunk/gtk/gtkblist.c
===================================================================
--- trunk/gtk/gtkblist.c 2006-09-15 02:05:23 UTC (rev 17282)
+++ trunk/gtk/gtkblist.c 2006-09-15 17:10:37 UTC (rev 17283)
@@ -4349,6 +4349,7 @@
int count;
gboolean show = FALSE;
GaimBlistNode* gnode;
+ gboolean selected = gtkblist ? (gtkblist->selected_node == node) : FALSE;
g_return_if_fail(node != NULL);
@@ -4393,10 +4394,16 @@
gtk_tree_path_free(path);
esc = g_markup_escape_text(group->name, -1);
- mark = g_strdup_printf("<span color='#%02x%02x%02x'><span weight='bold'>%s</span> (%d/%d)</span>",
- textcolor.red>>8, textcolor.green>>8, textcolor.blue>>8,
- esc, gaim_blist_get_group_online_count(group),
- gaim_blist_get_group_size(group, FALSE));
+ if (selected)
+ mark = g_strdup_printf("<span weight='bold'>%s</span> (%d/%d)",
+ esc, gaim_blist_get_group_online_count(group),
+ gaim_blist_get_group_size(group, FALSE));
+ else
+ mark = g_strdup_printf("<span color='#%02x%02x%02x'><span weight='bold'>%s</span> (%d/%d)</span>",
+ textcolor.red>>8, textcolor.green>>8, textcolor.blue>>8,
+ esc, gaim_blist_get_group_online_count(group),
+ gaim_blist_get_group_size(group, FALSE));
+
g_free(esc);
gtk_tree_store_set(gtkblist->treemodel, &iter,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nos...@us...> - 2006-09-15 02:05:30
|
Revision: 17282
http://svn.sourceforge.net/gaim/?rev=17282&view=rev
Author: nosnilmot
Date: 2006-09-14 19:05:23 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
Sometimes the order in which things happen is quite important. In
this case the chicken quite definitely came before the egg.
Also make the libxml2 check explicit to what minimum version we need.
Modified Paths:
--------------
trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-09-15 01:21:53 UTC (rev 17281)
+++ trunk/configure.ac 2006-09-15 02:05:23 UTC (rev 17282)
@@ -207,6 +207,22 @@
[compile without Contact Availability Prediction plugin])],
enable_cap="no", enable_cap="yes")
+
+AC_PATH_XTRA
+# We can't assume that $x_libraries will be set, because autoconf does not
+# set it in the case when the X libraries are in a standard place.
+# Ditto for $x_includes
+if test X"$x_libraries" = X"" || test X"$x_libraries" = XNONE; then
+ x_libpath_add=
+else
+ x_libpath_add="-L$x_libraries"
+fi
+if test X"$x_includes" = X"" || test X"$x_includes" = XNONE; then
+ x_incpath_add=
+else
+ x_incpath_add="-I$x_includes"
+fi
+
if test "x$enable_gtkui" = "xyes" ; then
PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0], , [
AC_MSG_RESULT(no)
@@ -413,11 +429,11 @@
dnl #######################################################################
dnl # Check for LibXML2 (required)
dnl #######################################################################
-PKG_CHECK_MODULES(LIBXML, [libxml-2.0], , [
+PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.6.0], , [
AC_MSG_RESULT(no)
AC_MSG_ERROR([
-You must have the libxml2 development headers installed to build Gaim.
+You must have libxml2 >= 2.6.0 development headers installed to build Gaim.
])])
AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)
@@ -851,21 +867,6 @@
AC_PATH_PROG(gaimpath, gaim)
-AC_PATH_XTRA
-# We can't assume that $x_libraries will be set, because autoconf does not
-# set it in the case when the X libraries are in a standard place.
-# Ditto for $x_includes
-if test X"$x_libraries" = X"" || test X"$x_libraries" = XNONE; then
- x_libpath_add=
-else
- x_libpath_add="-L$x_libraries"
-fi
-if test X"$x_includes" = X"" || test X"$x_includes" = XNONE; then
- x_incpath_add=
-else
- x_incpath_add="-I$x_includes"
-fi
-
dnl #######################################################################
dnl # Check for DBUS libraries
dnl #######################################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-09-15 01:22:09
|
Revision: 17281
http://svn.sourceforge.net/gaim/?rev=17281&view=rev
Author: sadrul
Date: 2006-09-14 18:21:53 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
Doxygen for console/
Modified Paths:
--------------
trunk/console/gntaccount.c
trunk/console/gntaccount.h
trunk/console/gntblist.c
trunk/console/gntblist.h
trunk/console/gntconn.c
trunk/console/gntconn.h
trunk/console/gntconv.c
trunk/console/gntconv.h
trunk/console/gntdebug.c
trunk/console/gntdebug.h
trunk/console/gntgaim.c
trunk/console/gntgaim.h
trunk/console/gntnotify.c
trunk/console/gntnotify.h
trunk/console/gntplugin.c
trunk/console/gntplugin.h
trunk/console/gntprefs.c
trunk/console/gntprefs.h
trunk/console/gntrequest.c
trunk/console/gntrequest.h
trunk/console/gntstatus.c
trunk/console/gntstatus.h
trunk/console/gntui.c
trunk/console/gntui.h
Modified: trunk/console/gntaccount.c
===================================================================
--- trunk/console/gntaccount.c 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntaccount.c 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntaccount.c GNT Account API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#include <gnt.h>
#include <gntbox.h>
#include <gntbutton.h>
Modified: trunk/console/gntaccount.h
===================================================================
--- trunk/console/gntaccount.h 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntaccount.h 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntaccount.h GNT Account API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#ifndef _GNT_ACCOUNT_H
#define _GNT_ACCOUNT_H
@@ -3,11 +27,32 @@
#include "account.h"
+/**********************************************************************
+ * @name GNT Account API
+ **********************************************************************/
+/*@{*/
+
+/**
+ * Get the ui-functions.
+ *
+ * @return The GaimAccountUiOps structure populated with the appropriate functions.
+ */
GaimAccountUiOps *gg_accounts_get_ui_ops(void);
+/**
+ * Perform necessary initializations.
+ */
void gg_accounts_init(void);
+/**
+ * Perform necessary uninitializations.
+ */
void gg_accounts_uninit(void);
+/**
+ * Show the account-manager dialog.
+ */
void gg_accounts_show_all(void);
+/*@}*/
+
#endif
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntblist.c 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntblist.c GNT BuddyList API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#include <account.h>
#include <blist.h>
#include <notify.h>
Modified: trunk/console/gntblist.h
===================================================================
--- trunk/console/gntblist.h 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntblist.h 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntblist.h GNT BuddyList API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#ifndef _GNT_BLIST_H
#define _GNT_BLIST_H
@@ -3,19 +27,68 @@
#include "blist.h"
+/**********************************************************************
+ * @name GNT BuddyList API
+ **********************************************************************/
+/*@{*/
+
+/**
+ * Get the ui-functions.
+ *
+ * @return The GaimBlistUiOps structure populated with the appropriate functions.
+ */
GaimBlistUiOps * gg_blist_get_ui_ops(void);
+/**
+ * Perform necessary initializations.
+ */
void gg_blist_init(void);
+/**
+ * Perform necessary uninitializations.
+ */
void gg_blist_uninit(void);
+/**
+ * Show the buddy list.
+ */
void gg_blist_show(void);
+/**
+ * Get the position of the buddy list.
+ *
+ * @param x The x-coordinate is set here if not @ NULL.
+ * @param y The y-coordinate is set here if not @c NULL.
+ *
+ * @return Returns @c TRUE if the values were set, @c FALSE otherwise.
+ */
gboolean gg_blist_get_position(int *x, int *y);
+/**
+ * Set the position of the buddy list.
+ *
+ * @param x The x-coordinate of the buddy list.
+ * @param y The y-coordinate of the buddy list.
+ */
void gg_blist_set_position(int x, int y);
+/**
+ * Get the size of the buddy list.
+ *
+ * @param width The width is set here if not @ NULL.
+ * @param height The height is set here if not @c NULL.
+ *
+ * @return Returns @c TRUE if the values were set, @c FALSE otherwise.
+ */
gboolean gg_blist_get_size(int *width, int *height);
+/**
+ * Set the size of the buddy list.
+ *
+ * @param width The width of the buddy list.
+ * @param height The height of the buddy list.
+ */
void gg_blist_set_size(int width, int height);
+/*@}*/
+
#endif
Modified: trunk/console/gntconn.c
===================================================================
--- trunk/console/gntconn.c 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntconn.c 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntconn.c GNT Connection API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#include "notify.h"
#include "gntconn.h"
Modified: trunk/console/gntconn.h
===================================================================
--- trunk/console/gntconn.h 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntconn.h 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntconn.h GNT Connection API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#ifndef _GNT_CONN_H
#define _GNT_CONN_H
@@ -3,9 +27,27 @@
#include "connection.h"
+/**********************************************************************
+ * @name GNT Connection API
+ **********************************************************************/
+/*@{*/
+
+/**
+ * Get the ui-functions.
+ *
+ * @return The GaimConnectionUiOps structure populated with the appropriate functions.
+ */
GaimConnectionUiOps *gg_connections_get_ui_ops(void);
+/**
+ * Perform necessary initializations.
+ */
void gg_connections_init(void);
+/**
+ * Perform necessary uninitializations.
+ */
void gg_connections_uninit(void);
+/*@}*/
+
#endif
Modified: trunk/console/gntconv.c
===================================================================
--- trunk/console/gntconv.c 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntconv.c 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntconv.c GNT Conversation API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#include <string.h>
#include <cmds.h>
Modified: trunk/console/gntconv.h
===================================================================
--- trunk/console/gntconv.h 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntconv.h 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntconv.h GNT Conversation API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#ifndef _GNT_CONV_H
#define _GNT_CONV_H
@@ -3,12 +27,34 @@
#include "conversation.h"
+/***************************************************************************
+ * @name GNT Conversations API
+ ***************************************************************************/
+/*@{*/
+
+/**
+ * Get the ui-functions.
+ *
+ * @return The GaimConversationUiOps populated with the appropriate functions.
+ */
GaimConversationUiOps *gg_conv_get_ui_ops(void);
+/**
+ * Perform the necessary initializations.
+ */
void gg_conversation_init(void);
+/**
+ * Perform the necessary uninitializations.
+ */
void gg_conversation_uninit(void);
-/* Set a conversation as active in a contactized conversation */
+/**
+ * Set a conversation as active in a contactized conversation
+ *
+ * @param conv The conversation to make active.
+ */
void gg_conversation_set_active(GaimConversation *conv);
+/*@}*/
+
#endif
Modified: trunk/console/gntdebug.c
===================================================================
--- trunk/console/gntdebug.c 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntdebug.c 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntdebug.c GNT Debug API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#include <gnt.h>
#include <gntbox.h>
#include <gnttextview.h>
Modified: trunk/console/gntdebug.h
===================================================================
--- trunk/console/gntdebug.h 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntdebug.h 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntdebug.h GNT Debug API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#ifndef _GNT_DEBUG_H
#define _GNT_DEBUG_H
@@ -3,11 +27,32 @@
#include "debug.h"
+/**********************************************************************
+ * @name GNT Debug API
+ **********************************************************************/
+/*@{*/
+
+/**
+ * Get the ui-functions.
+ *
+ * @return The GaimDebugUiOps structure populated with the appropriate functions.
+ */
GaimDebugUiOps *gg_debug_get_ui_ops(void);
+/**
+ * Perform necessary initializations.
+ */
void gg_debug_init(void);
+/**
+ * Perform necessary uninitializations.
+ */
void gg_debug_uninit(void);
+/**
+ * Show the debug window.
+ */
void gg_debug_window_show(void);
+/*@}*/
+
#endif
Modified: trunk/console/gntgaim.c
===================================================================
--- trunk/console/gntgaim.c 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntgaim.c 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,24 @@
+/**
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#include "account.h"
#include "conversation.h"
#include "core.h"
Modified: trunk/console/gntgaim.h
===================================================================
--- trunk/console/gntgaim.h 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntgaim.h 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,24 @@
+/**
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#include <glib.h>
#include "libgaim/internal.h"
Modified: trunk/console/gntnotify.c
===================================================================
--- trunk/console/gntnotify.c 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntnotify.c 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntnotify.c GNT Notify API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#include <gnt.h>
#include <gntbox.h>
#include <gntbutton.h>
Modified: trunk/console/gntnotify.h
===================================================================
--- trunk/console/gntnotify.h 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntnotify.h 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntnotify.h GNT Notify API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#ifndef _GNT_NOTIFY_H
#define _GNT_NOTIFY_H
@@ -3,10 +27,28 @@
#include "notify.h"
+/**********************************************************************
+ * @name GNT Notify API
+ **********************************************************************/
+/*@{*/
+
+/**
+ * Get the ui-functions.
+ *
+ * @return The GaimNotifyUiOps structure populated with the appropriate functions.
+ */
GaimNotifyUiOps *gg_notify_get_ui_ops(void);
+/**
+ * Perform necessary initializations.
+ */
void gg_notify_init(void);
+/**
+ * Perform necessary uninitializations.
+ */
void gg_notify_uninit(void);
+/*@}*/
+
#endif
Modified: trunk/console/gntplugin.c
===================================================================
--- trunk/console/gntplugin.c 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntplugin.c 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntplugin.c GNT Plugins API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#include <gnt.h>
#include <gntbox.h>
#include <gntbutton.h>
Modified: trunk/console/gntplugin.h
===================================================================
--- trunk/console/gntplugin.h 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntplugin.h 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntplugin.h GNT Plugins API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#ifndef _GNT_PLUGIN_H
#define _GNT_PLUGIN_H
@@ -7,20 +31,39 @@
#include <string.h>
+/**********************************************************************
+ * @name GNT Plugins API
+ **********************************************************************/
+/*@{*/
+
typedef GntWidget* (*GGPluginFrame) ();
/* Guess where these came from */
#define GAIM_GNT_PLUGIN_TYPE "gnt"
+/**
+ * Decide whether a plugin is a GNT-plugin.
+ */
#define GAIM_IS_GNT_PLUGIN(plugin) \
((plugin)->info != NULL && (plugin)->info->ui_info != NULL && \
!strcmp((plugin)->info->ui_requirement, GAIM_GNT_PLUGIN_TYPE))
+/**
+ * Get the ui-info from GNT-plugins.
+ */
#define GAIM_GNT_PLUGIN_UI_INFO(plugin) \
(GGPluginFrame)((plugin)->info->ui_info)
+/**
+ * Show a list of plugins.
+ */
void gg_plugins_show_all(void);
+/**
+ * Save the list of loaded plugins.
+ */
void gg_plugins_save_loaded(void);
+/*@}*/
+
#endif
Modified: trunk/console/gntprefs.c
===================================================================
--- trunk/console/gntprefs.c 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntprefs.c 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntprefs.c GNT Preferences API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#include <prefs.h>
#include "gntgaim.h"
Modified: trunk/console/gntprefs.h
===================================================================
--- trunk/console/gntprefs.h 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntprefs.h 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,8 +1,45 @@
+/**
+ * @file gntprefs.h GNT Preferences API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#ifndef _GNT_PREFS_H
#define _GNT_PREFS_H
+/**********************************************************************
+ * @name GNT Preferences API
+ **********************************************************************/
+/*@{*/
+
+/**
+ * Perform necessary initializations.
+ */
void gg_prefs_init(void);
+/**
+ * Show the preferences dialog.
+ */
void gg_prefs_show_all(void);
+/*@}*/
+
#endif
Modified: trunk/console/gntrequest.c
===================================================================
--- trunk/console/gntrequest.c 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntrequest.c 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntrequest.c GNT Request API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#include <gnt.h>
#include <gntbox.h>
#include <gntbutton.h>
Modified: trunk/console/gntrequest.h
===================================================================
--- trunk/console/gntrequest.h 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntrequest.h 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntrequest.h GNT Request API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#ifndef _GNT_REQUEST_H
#define _GNT_REQUEST_H
@@ -3,9 +27,27 @@
#include "request.h"
+/**********************************************************************
+ * @name GNT Request API
+ **********************************************************************/
+/*@{*/
+
+/**
+ * Get the ui-functions.
+ *
+ * @return The GaimRequestUiOps structure populated with the appropriate functions.
+ */
GaimRequestUiOps *gg_request_get_ui_ops(void);
+/**
+ * Perform necessary initializations.
+ */
void gg_request_init(void);
+/**
+ * Perform necessary uninitializations.
+ */
void gg_request_uninit(void);
+/*@}*/
+
#endif
Modified: trunk/console/gntstatus.c
===================================================================
--- trunk/console/gntstatus.c 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntstatus.c 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntstatus.c GNT Status API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#include <gnt.h>
#include <gntbox.h>
#include <gntbutton.h>
Modified: trunk/console/gntstatus.h
===================================================================
--- trunk/console/gntstatus.h 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntstatus.h 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,27 @@
+/**
+ * @file gntstatus.h GNT Status API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#ifndef _GNT_STATUS_H
#define _GNT_STATUS_H
@@ -4,8 +28,23 @@
#include <status.h>
#include <savedstatuses.h>
+/**********************************************************************
+ * @name GNT BuddyList API
+ **********************************************************************/
+/*@{*/
+
+/**
+ * Show a dialog with all the saved statuses.
+ */
void gg_savedstatus_show_all(void);
+/**
+ * Show a dialog to edit a status.
+ *
+ * @param saved The saved status to edit. Set it to @c NULL to create a new status.
+ */
void gg_savedstatus_edit(GaimSavedStatus *saved);
+/*@}*/
+
#endif
Modified: trunk/console/gntui.c
===================================================================
--- trunk/console/gntui.c 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntui.c 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,24 @@
+/**
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#include "gntui.h"
#include "gntaccount.h"
Modified: trunk/console/gntui.h
===================================================================
--- trunk/console/gntui.h 2006-09-14 22:21:52 UTC (rev 17280)
+++ trunk/console/gntui.h 2006-09-15 01:21:53 UTC (rev 17281)
@@ -1,3 +1,24 @@
+/**
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 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 program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#ifndef _GNT_UI_H
#define _GNT_UI_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-14 22:22:01
|
Revision: 17280
http://svn.sourceforge.net/gaim/?rev=17280&view=rev
Author: thekingant
Date: 2006-09-14 15:21:52 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
Fix a misnamed define. UTF8 is wrong. The actual encoding
used is UCS-2BE. No functionality change.
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/family_locate.c
trunk/libgaim/protocols/oscar/oscar.c
trunk/libgaim/protocols/oscar/oscar.h
Modified: trunk/libgaim/protocols/oscar/family_locate.c
===================================================================
--- trunk/libgaim/protocols/oscar/family_locate.c 2006-09-14 21:53:30 UTC (rev 17279)
+++ trunk/libgaim/protocols/oscar/family_locate.c 2006-09-14 22:21:52 UTC (rev 17280)
@@ -172,11 +172,11 @@
{0x09, 0x46, 0x13, 0x4d, 0x4c, 0x7f, 0x11, 0xd1,
0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
- {OSCAR_CAPABILITY_ICQUTF8,
+ {OSCAR_CAPABILITY_UNICODE,
{0x09, 0x46, 0x13, 0x4e, 0x4c, 0x7f, 0x11, 0xd1,
0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
- {OSCAR_CAPABILITY_ICQUTF8OLD,
+ {OSCAR_CAPABILITY_UNICODEOLD,
{0x2e, 0x7a, 0x64, 0x75, 0xfa, 0xdf, 0x4d, 0xc8,
0x88, 0x6f, 0xea, 0x35, 0x95, 0xfd, 0xb6, 0xdf}},
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-09-14 21:53:30 UTC (rev 17279)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-09-14 22:21:52 UTC (rev 17280)
@@ -68,7 +68,7 @@
#define OSCAR_DEFAULT_WEB_AWARE FALSE
#define OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY FALSE
-static OscarCapability gaim_caps = OSCAR_CAPABILITY_CHAT | OSCAR_CAPABILITY_BUDDYICON | OSCAR_CAPABILITY_DIRECTIM | OSCAR_CAPABILITY_SENDFILE | OSCAR_CAPABILITY_ICQUTF8 | OSCAR_CAPABILITY_INTEROPERATE | OSCAR_CAPABILITY_ICHAT;
+static OscarCapability gaim_caps = OSCAR_CAPABILITY_CHAT | OSCAR_CAPABILITY_BUDDYICON | OSCAR_CAPABILITY_DIRECTIM | OSCAR_CAPABILITY_SENDFILE | OSCAR_CAPABILITY_UNICODE | OSCAR_CAPABILITY_INTEROPERATE | OSCAR_CAPABILITY_ICHAT;
static guint8 features_aim[] = {0x01, 0x01, 0x01, 0x02};
static guint8 features_icq[] = {0x01, 0x06};
@@ -460,7 +460,7 @@
if ((destsn != NULL) && aim_sn_is_icq(destsn))
userinfo = aim_locate_finduserinfo(od, destsn);
- if ((userinfo != NULL) && (userinfo->capabilities & OSCAR_CAPABILITY_ICQUTF8))
+ if ((userinfo != NULL) && (userinfo->capabilities & OSCAR_CAPABILITY_UNICODE))
{
GaimBuddy *b;
b = gaim_find_buddy(account, destsn);
@@ -639,13 +639,13 @@
case OSCAR_CAPABILITY_ICQSERVERRELAY:
tmp = _("ICQ Server Relay");
break;
- case OSCAR_CAPABILITY_ICQUTF8OLD:
+ case OSCAR_CAPABILITY_UNICODEOLD:
tmp = _("Old ICQ UTF8");
break;
case OSCAR_CAPABILITY_TRILLIANCRYPT:
tmp = _("Trillian Encryption");
break;
- case OSCAR_CAPABILITY_ICQUTF8:
+ case OSCAR_CAPABILITY_UNICODE:
tmp = _("ICQ UTF8");
break;
case OSCAR_CAPABILITY_HIPTOP:
Modified: trunk/libgaim/protocols/oscar/oscar.h
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.h 2006-09-14 21:53:30 UTC (rev 17279)
+++ trunk/libgaim/protocols/oscar/oscar.h 2006-09-14 22:21:52 UTC (rev 17280)
@@ -315,9 +315,9 @@
OSCAR_CAPABILITY_ICQRTF = 0x00001000,
OSCAR_CAPABILITY_EMPTY = 0x00002000,
OSCAR_CAPABILITY_ICQSERVERRELAY = 0x00004000,
- OSCAR_CAPABILITY_ICQUTF8OLD = 0x00008000,
+ OSCAR_CAPABILITY_UNICODEOLD = 0x00008000,
OSCAR_CAPABILITY_TRILLIANCRYPT = 0x00010000,
- OSCAR_CAPABILITY_ICQUTF8 = 0x00020000,
+ OSCAR_CAPABILITY_UNICODE = 0x00020000,
OSCAR_CAPABILITY_INTEROPERATE = 0x00040000,
OSCAR_CAPABILITY_ICHAT = 0x00080000,
OSCAR_CAPABILITY_HIPTOP = 0x00100000,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lsc...@us...> - 2006-09-14 21:53:35
|
Revision: 17279
http://svn.sourceforge.net/gaim/?rev=17279&view=rev
Author: lschiere
Date: 2006-09-14 14:53:30 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
(17:51:22) elb: someone should gaims-funniest-home-convos that, actually
Modified Paths:
--------------
trunk/doc/gaims_funniest_home_convos.txt
Modified: trunk/doc/gaims_funniest_home_convos.txt
===================================================================
--- trunk/doc/gaims_funniest_home_convos.txt 2006-09-14 19:37:46 UTC (rev 17278)
+++ trunk/doc/gaims_funniest_home_convos.txt 2006-09-14 21:53:30 UTC (rev 17279)
@@ -384,3 +384,16 @@
14:14 <Paco-Paco> so true
14:14 <colorshape> ok, is that another client?
14:14 <Err> something like that
+
+(17:44:15) elb: what's that one song that's always played at weddings that's not the processional or recessional
+(17:44:37) tehfox: bridal choral or something?
+(17:45:04) seanegan: elb: The Chicken Dance
+(17:45:12) elb: seanegan: oh that's the one
+(17:45:34) ***LSchiere boggles
+(17:45:56) elb: it's the one that goes
+(17:46:31) elb: dunnn dunnnn dunnnnn dunnnn dunnn DUUNN duun DUUUNNN, dun da-da-di da-da-di da-da-da-di-di-di dunn da-da-di dun-da-di-di-diii-di
+(17:49:13) seanegan: Pachelbel's canon?
+(17:49:18) elb: seanegan: YES
+(17:49:25) seanegan: hell yeah!
+(17:49:25) elb: awesome, thanks
+(17:49:28) elb: Kanon in D
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-09-14 19:38:03
|
Revision: 17278
http://svn.sourceforge.net/gaim/?rev=17278&view=rev
Author: datallah
Date: 2006-09-14 12:37:46 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
Allow `make -f Makefile.mingw` to work directly from the prpl directories.
Modified Paths:
--------------
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/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
Modified: trunk/libgaim/protocols/bonjour/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/bonjour/Makefile.mingw 2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/bonjour/Makefile.mingw 2006-09-14 19:37:46 UTC (rev 17278)
@@ -9,6 +9,7 @@
TARGET = libbonjour
NEEDED_DLLS = $(HOWL_TOP)/bin/libhowl-1.dll
+TYPE = PLUGIN
# Static or Plugin...
ifeq ($(TYPE),STATIC)
@@ -79,7 +80,7 @@
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -f $(OBJECTS)
+ rm -f $(TARGET).dll
include $(GAIM_COMMON_TARGETS)
Modified: trunk/libgaim/protocols/gg/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/gg/Makefile.mingw 2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/gg/Makefile.mingw 2006-09-14 19:37:46 UTC (rev 17278)
@@ -9,6 +9,7 @@
TARGET = libgg
CFLAGS += -include win32dep.h
+TYPE = PLUGIN
# Static or Plugin...
ifeq ($(TYPE),STATIC)
@@ -59,8 +60,6 @@
##
LIBS = \
-lglib-2.0 \
- -lgmodule-2.0 \
- -lgobject-2.0 \
-lintl \
-lgaim \
-lws2_32
@@ -86,7 +85,7 @@
## CLEAN RULES
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -f $(OBJECTS)
+ rm -f $(TARGET).dll
include $(GAIM_COMMON_TARGETS)
Modified: trunk/libgaim/protocols/irc/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/irc/Makefile.mingw 2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/irc/Makefile.mingw 2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,6 +8,7 @@
include $(GAIM_TOP)/libgaim/win32/global.mak
TARGET = libirc
+TYPE = PLUGIN
# Static or Plugin...
ifeq ($(TYPE),STATIC)
@@ -49,7 +50,6 @@
##
LIBS = \
-lglib-2.0 \
- -lgobject-2.0 \
-lws2_32 \
-lintl \
-lgaim
@@ -79,7 +79,7 @@
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -f $(OBJECTS)
+ rm -f $(TARGET).dll
include $(GAIM_COMMON_TARGETS)
Modified: trunk/libgaim/protocols/jabber/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/jabber/Makefile.mingw 2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/jabber/Makefile.mingw 2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,6 +8,7 @@
include $(GAIM_TOP)/libgaim/win32/global.mak
TARGET = libjabber
+TYPE = PLUGIN
# Static or Plugin...
ifeq ($(TYPE),STATIC)
@@ -88,7 +89,7 @@
## CLEAN RULES
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -f $(OBJECTS)
+ rm -f $(TARGET).dll
include $(GAIM_COMMON_TARGETS)
Modified: trunk/libgaim/protocols/msn/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/msn/Makefile.mingw 2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/msn/Makefile.mingw 2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,8 +8,9 @@
include $(GAIM_TOP)/libgaim/win32/global.mak
TARGET = libmsn
+TYPE = PLUGIN
-# Static or Plugin...
+# Static or Plugin...
ifeq ($(TYPE),STATIC)
DEFINES += -DSTATIC
DLL_INSTALL_DIR = $(GAIM_INSTALL_DIR)
@@ -98,7 +99,7 @@
## CLEAN RULES
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -f $(OBJECTS)
+ rm -f $(TARGET).dll
include $(GAIM_COMMON_TARGETS)
Modified: trunk/libgaim/protocols/novell/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/novell/Makefile.mingw 2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/novell/Makefile.mingw 2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,6 +8,7 @@
include $(GAIM_TOP)/libgaim/win32/global.mak
TARGET = libnovell
+TYPE = PLUGIN
# Static or Plugin...
ifeq ($(TYPE),STATIC)
@@ -81,7 +82,7 @@
## CLEAN RULES
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -f $(OBJECTS)
+ rm -f $(TARGET).dll
include $(GAIM_COMMON_TARGETS)
Modified: trunk/libgaim/protocols/oscar/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/oscar/Makefile.mingw 2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/oscar/Makefile.mingw 2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,6 +8,7 @@
include $(GAIM_TOP)/libgaim/win32/global.mak
TARGET = liboscar
+TYPE = PLUGIN
# Static or Plugin...
ifeq ($(TYPE),STATIC)
@@ -104,7 +105,7 @@
## CLEAN RULES
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -f $(OBJECTS)
+ rm -f $(TARGET).dll
include $(GAIM_COMMON_TARGETS)
Modified: trunk/libgaim/protocols/sametime/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/sametime/Makefile.mingw 2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/sametime/Makefile.mingw 2006-09-14 19:37:46 UTC (rev 17278)
@@ -9,6 +9,7 @@
TARGET = libsametime
NEEDED_DLLS = $(MEANWHILE_TOP)/bin/libmeanwhile-1.dll
+TYPE = PLUGIN
# Static or Plugin...
ifeq ($(TYPE),STATIC)
@@ -76,7 +77,7 @@
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -f $(OBJECTS)
+ rm -f $(TARGET).dll
include $(GAIM_COMMON_TARGETS)
Modified: trunk/libgaim/protocols/silc/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/silc/Makefile.mingw 2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/silc/Makefile.mingw 2006-09-14 19:37:46 UTC (rev 17278)
@@ -10,6 +10,7 @@
TARGET = libsilc
NEEDED_DLLS = $(SILC_TOOLKIT)/lib/silc.dll \
$(SILC_TOOLKIT)/lib/silcclient.dll
+TYPE = PLUGIN
# Static or Plugin...
ifeq ($(TYPE),STATIC)
@@ -84,7 +85,7 @@
## CLEAN RULES
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -f $(OBJECTS)
+ rm -f $(TARGET).dll
include $(GAIM_COMMON_TARGETS)
Modified: trunk/libgaim/protocols/simple/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/simple/Makefile.mingw 2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/simple/Makefile.mingw 2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,6 +8,7 @@
include $(GAIM_TOP)/libgaim/win32/global.mak
TARGET = libsimple
+TYPE = PLUGIN
# Static or Plugin...
ifeq ($(TYPE),STATIC)
@@ -46,7 +47,6 @@
##
LIBS = \
-lglib-2.0 \
- -lgobject-2.0 \
-lws2_32 \
-lintl \
-lgaim
@@ -72,7 +72,7 @@
## CLEAN RULES
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -f $(OBJECTS)
+ rm -f $(TARGET).dll
include $(GAIM_COMMON_TARGETS)
Modified: trunk/libgaim/protocols/toc/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/toc/Makefile.mingw 2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/toc/Makefile.mingw 2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,6 +8,7 @@
include $(GAIM_TOP)/libgaim/win32/global.mak
TARGET = libtoc
+TYPE = PLUGIN
# Static or Plugin...
ifeq ($(TYPE),STATIC)
@@ -71,7 +72,7 @@
## CLEAN RULES
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -f $(OBJECTS)
+ rm -f $(TARGET).dll
include $(GAIM_COMMON_TARGETS)
Modified: trunk/libgaim/protocols/yahoo/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/yahoo/Makefile.mingw 2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/yahoo/Makefile.mingw 2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,6 +8,7 @@
include $(GAIM_TOP)/libgaim/win32/global.mak
TARGET = libyahoo
+TYPE = PLUGIN
# Static or Plugin...
ifeq ($(TYPE),STATIC)
@@ -56,7 +57,6 @@
##
LIBS = \
-lglib-2.0 \
- -lgobject-2.0 \
-lws2_32 \
-lintl \
-lgaim
@@ -83,7 +83,7 @@
## CLEAN RULES
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -f $(OBJECTS)
+ rm -f $(TARGET).dll
include $(GAIM_COMMON_TARGETS)
Modified: trunk/libgaim/protocols/zephyr/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/zephyr/Makefile.mingw 2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/zephyr/Makefile.mingw 2006-09-14 19:37:46 UTC (rev 17278)
@@ -11,6 +11,7 @@
KRB4_TOP := $(WIN32_DEV_TOP)/kfw-2.6.3-final.fixed
USE_KRB4 := false
DEFINES += -DWIN32 -DKRB5_SYSTYPES__
+TYPE = PLUGIN
ifeq ($(USE_KRB4),true)
DEFINES += -DZEPHYR_USES_KERBEROS
@@ -142,7 +143,7 @@
## CLEAN RULES
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -f $(OBJECTS)
+ rm -f $(TARGET).dll
include $(GAIM_COMMON_TARGETS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-09-14 19:26:11
|
Revision: 17277
http://svn.sourceforge.net/gaim/?rev=17277&view=rev
Author: datallah
Date: 2006-09-14 12:26:04 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
Patch from Joymarquis to make qq compile on win32.
Modified Paths:
--------------
trunk/libgaim/protocols/qq/Makefile.mingw
trunk/libgaim/protocols/qq/crypt.c
Property Changed:
----------------
trunk/libgaim/protocols/qq/
Property changes on: trunk/libgaim/protocols/qq
___________________________________________________________________
Name: svn:ignore
- Makefile.in
Makefile
.deps
.libs
*.la
*.lo
+ Makefile.in
Makefile
.deps
.libs
*.la
*.lo
*.dll
Modified: trunk/libgaim/protocols/qq/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/qq/Makefile.mingw 2006-09-14 18:53:56 UTC (rev 17276)
+++ trunk/libgaim/protocols/qq/Makefile.mingw 2006-09-14 19:26:04 UTC (rev 17277)
@@ -1,17 +1,14 @@
#
# Makefile.mingw
#
-# Description: Makefile for win32 (mingw) version of OpenQ src
+# Description: Makefile for win32 (mingw) version of the QQ prpl
#
GAIM_TOP := ../../..
include $(GAIM_TOP)/libgaim/win32/global.mak
-TARGET = openq
-OPENQ_TOP := ..
+TARGET = libqq
TYPE = PLUGIN
-OPENQ_VERSION := $(shell cat $(OPENQ_TOP)/VERSION)
-DEFINES += -DOPENQ_VERSION=\"$(OPENQ_VERSION)\"
# Static or Plugin...
ifeq ($(TYPE),STATIC)
@@ -27,7 +24,6 @@
## INCLUDE PATHS
##
INCLUDE_PATHS += \
- -I$(OPENQ_ROOT) \
-I$(GTK_TOP)/include \
-I$(GTK_TOP)/include/glib-2.0 \
-I$(GTK_TOP)/lib/glib-2.0/include \
@@ -73,7 +69,6 @@
send_core.c \
send_file.c \
sendqueue.c \
- show.c \
sys_msg.c \
udp_proxy_s5.c \
utils.c
@@ -110,7 +105,7 @@
## CLEAN RULES
##
clean:
- rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -f $(OBJECTS)
+ rm -f $(TARGET).dll
include $(GAIM_COMMON_TARGETS)
Modified: trunk/libgaim/protocols/qq/crypt.c
===================================================================
--- trunk/libgaim/protocols/qq/crypt.c 2006-09-14 18:53:56 UTC (rev 17276)
+++ trunk/libgaim/protocols/qq/crypt.c 2006-09-14 19:26:04 UTC (rev 17277)
@@ -38,7 +38,11 @@
0x61C88647 is what we can track on the ASM codes.!!
*/
+#ifdef _WIN32
+#include "win32dep.h"
+#else
#include <arpa/inet.h>
+#endif
#include <string.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lsc...@us...> - 2006-09-14 18:54:02
|
Revision: 17276
http://svn.sourceforge.net/gaim/?rev=17276&view=rev
Author: lschiere
Date: 2006-09-14 11:53:56 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
make docs works now
Modified Paths:
--------------
trunk/Doxyfile.in
Modified: trunk/Doxyfile.in
===================================================================
--- trunk/Doxyfile.in 2006-09-14 18:50:32 UTC (rev 17275)
+++ trunk/Doxyfile.in 2006-09-14 18:53:56 UTC (rev 17276)
@@ -431,7 +431,9 @@
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = src \
+INPUT = libgaim \
+ gtk \
+ console \
doc
# If the value of the INPUT tag contains directories, you can use the
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-14 18:50:36
|
Revision: 17275
http://svn.sourceforge.net/gaim/?rev=17275&view=rev
Author: thekingant
Date: 2006-09-14 11:50:32 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
Advertise the same capabilities for both AIM and ICQ
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/family_oservice.c
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/family_oservice.c
===================================================================
--- trunk/libgaim/protocols/oscar/family_oservice.c 2006-09-14 07:52:26 UTC (rev 17274)
+++ trunk/libgaim/protocols/oscar/family_oservice.c 2006-09-14 18:50:32 UTC (rev 17275)
@@ -801,6 +801,8 @@
*
* These are the same TLVs seen in user info. You can
* also set 0x0008 and 0x000c.
+ *
+ * TODO: Combine this with the function below.
*/
int
aim_setextstatus(OscarData *od, guint32 status)
@@ -843,6 +845,8 @@
*
* These are the same TLVs seen in user info. You can
* also set 0x0008 and 0x000c.
+ *
+ * TODO: Combine this with the above function.
*/
int
aim_srv_setstatusmsg(OscarData *od, const char *msg)
@@ -850,38 +854,31 @@
FlapConnection *conn;
FlapFrame *frame;
aim_snacid_t snacid;
+ int msglen;
if (!od || !(conn = flap_connection_findbygroup(od, 0x0004)))
return -EINVAL;
- if ((msg != NULL) && *msg != '\0') {
- frame = flap_frame_new(od, 0x02, 10 + 4 + strlen(msg) + 8);
+ if (msg == NULL)
+ msglen = 0;
+ else
+ msglen = strlen(msg);
- snacid = aim_cachesnac(od, 0x0001, 0x001e, 0x0000, NULL, 0);
- aim_putsnac(&frame->data, 0x0001, 0x001e, 0x0000, snacid);
+ frame = flap_frame_new(od, 0x02, 10 + 4 + msglen + 8);
- byte_stream_put16(&frame->data, 0x001d); /* userinfo TLV type */
- byte_stream_put16(&frame->data, strlen(msg)+8); /* total length of userinfo TLV data */
- byte_stream_put16(&frame->data, 0x0002);
- byte_stream_put8(&frame->data, 0x04);
- byte_stream_put8(&frame->data, strlen(msg)+4);
- byte_stream_put16(&frame->data, strlen(msg));
+ snacid = aim_cachesnac(od, 0x0001, 0x001e, 0x0000, NULL, 0);
+ aim_putsnac(&frame->data, 0x0001, 0x001e, 0x0000, snacid);
+
+ byte_stream_put16(&frame->data, 0x001d); /* userinfo TLV type */
+ byte_stream_put16(&frame->data, msglen + 8); /* total length of userinfo TLV data */
+ byte_stream_put16(&frame->data, 0x0002);
+ byte_stream_put8(&frame->data, 0x04);
+ byte_stream_put8(&frame->data, msglen+4);
+ byte_stream_put16(&frame->data, msglen);
+ if (msglen > 0)
byte_stream_putstr(&frame->data, msg);
- byte_stream_put16(&frame->data, 0x0000);
- } else {
- frame = flap_frame_new(od, 0x02, 10 + 4 + 8);
+ byte_stream_put16(&frame->data, 0x0000);
- snacid = aim_cachesnac(od, 0x0001, 0x001e, 0x0000, NULL, 0);
- aim_putsnac(&frame->data, 0x0001, 0x001e, 0x0000, snacid);
-
- byte_stream_put16(&frame->data, 0x001d);
- byte_stream_put16(&frame->data, 0x0008);
- byte_stream_put16(&frame->data, 0x0002);
- byte_stream_put16(&frame->data, 0x0404);
- byte_stream_put16(&frame->data, 0x0000);
- byte_stream_put16(&frame->data, 0x0000);
- }
-
flap_connection_send(conn, frame);
return 0;
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-09-14 07:52:26 UTC (rev 17274)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-09-14 18:50:32 UTC (rev 17275)
@@ -68,8 +68,7 @@
#define OSCAR_DEFAULT_WEB_AWARE FALSE
#define OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY FALSE
-static int caps_aim = OSCAR_CAPABILITY_CHAT | OSCAR_CAPABILITY_BUDDYICON | OSCAR_CAPABILITY_DIRECTIM | OSCAR_CAPABILITY_SENDFILE | OSCAR_CAPABILITY_INTEROPERATE | OSCAR_CAPABILITY_ICHAT;
-static int caps_icq = OSCAR_CAPABILITY_BUDDYICON | OSCAR_CAPABILITY_DIRECTIM | OSCAR_CAPABILITY_SENDFILE | OSCAR_CAPABILITY_ICQUTF8 | OSCAR_CAPABILITY_INTEROPERATE | OSCAR_CAPABILITY_ICHAT;
+static OscarCapability gaim_caps = OSCAR_CAPABILITY_CHAT | OSCAR_CAPABILITY_BUDDYICON | OSCAR_CAPABILITY_DIRECTIM | OSCAR_CAPABILITY_SENDFILE | OSCAR_CAPABILITY_ICQUTF8 | OSCAR_CAPABILITY_INTEROPERATE | OSCAR_CAPABILITY_ICHAT;
static guint8 features_aim[] = {0x01, 0x01, 0x01, 0x02};
static guint8 features_icq[] = {0x01, 0x06};
@@ -584,7 +583,7 @@
return g_string_free(cpy, FALSE);
}
-static gchar *oscar_caps_to_string(guint caps)
+static gchar *oscar_caps_to_string(OscarCapability caps)
{
GString *str;
const gchar *tmp;
@@ -1806,9 +1805,9 @@
static void gaim_check_comment(OscarData *od, const char *str) {
if ((str == NULL) || strcmp(str, (const char *)ck))
- aim_locate_setcaps(od, caps_aim);
+ aim_locate_setcaps(od, gaim_caps);
else
- aim_locate_setcaps(od, caps_aim | OSCAR_CAPABILITY_SECUREIM);
+ aim_locate_setcaps(od, gaim_caps | OSCAR_CAPABILITY_SECUREIM);
}
static int gaim_parse_offgoing(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
@@ -3470,10 +3469,7 @@
od->rights.maxsiglen = od->rights.maxawaymsglen = (guint)maxsiglen;
- if (od->icq)
- aim_locate_setcaps(od, caps_icq);
- else
- aim_locate_setcaps(od, caps_aim);
+ aim_locate_setcaps(od, gaim_caps);
oscar_set_info_and_status(account, TRUE, account->user_info, TRUE,
gaim_account_get_active_status(account));
@@ -4804,8 +4800,11 @@
}
if (!aim_sncmp(curitem->name, account->username)) {
char *comment = aim_ssi_getcomment(od->ssi.local, gname, curitem->name);
- gaim_check_comment(od, comment);
- g_free(comment);
+ if (comment != NULL)
+ {
+ gaim_check_comment(od, comment);
+ g_free(comment);
+ }
}
g_free(gname_utf8);
g_free(alias_utf8);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rl...@us...> - 2006-09-14 07:52:32
|
Revision: 17274
http://svn.sourceforge.net/gaim/?rev=17274&view=rev
Author: rlaager
Date: 2006-09-14 00:52:26 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
More UTF-8 fixing by TiCPU.
Modified Paths:
--------------
trunk/gtk/plugins/spellchk.c
Modified: trunk/gtk/plugins/spellchk.c
===================================================================
--- trunk/gtk/plugins/spellchk.c 2006-09-14 01:37:32 UTC (rev 17273)
+++ trunk/gtk/plugins/spellchk.c 2006-09-14 07:52:26 UTC (rev 17274)
@@ -923,7 +923,7 @@
"BAD couldthe\nGOOD could the\n"
"BAD couldve\nGOOD could've\n"
"BAD cpoy\nGOOD copy\n"
- "BAD creme\nGOOD crème\n"
+ "BAD creme\nGOOD cr\303\250me\n"
"BAD ctaegory\nGOOD category\n"
"BAD cu\nGOOD see you\n"
"BAD cusotmer\nGOOD customer\n"
@@ -940,7 +940,7 @@
"BAD decor\nGOOD d\303\251cor\n"
"BAD defendent\nGOOD defendant\n"
"BAD definately\nGOOD definitely\n"
- "COMPLETE 0\nBAD deja vu\nGOOD d\303\251jà vu\n"
+ "COMPLETE 0\nBAD deja vu\nGOOD d\303\251j\303\240 vu\n"
"BAD deptartment\nGOOD department\n"
"BAD desicion\nGOOD decision\n"
"BAD desicions\nGOOD decisions\n"
@@ -1041,7 +1041,7 @@
"BAD exprience\nGOOD experience\n"
"BAD exprienced\nGOOD experienced\n"
"BAD eyt\nGOOD yet\n"
- "BAD facade\nGOOD façade\n"
+ "BAD facade\nGOOD fa\303\247ade\n"
"BAD faeture\nGOOD feature\n"
"BAD faetures\nGOOD feature\n"
"BAD familair\nGOOD familiar\n"
@@ -1640,7 +1640,7 @@
"BAD veyr\nGOOD very\n"
"BAD virtualyl\nGOOD virtually\n"
"BAD visavis\nGOOD vis-a-vis\n"
- "COMPLETE 0\nBAD vis-a-vis\nGOOD vis-à-vis\n"
+ "COMPLETE 0\nBAD vis-a-vis\nGOOD vis-\303\240-vis\n"
"BAD vrey\nGOOD very\n"
"BAD vulnerible\nGOOD vulnerable\n"
"BAD waht\nGOOD what\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-09-14 01:37:38
|
Revision: 17273
http://svn.sourceforge.net/gaim/?rev=17273&view=rev
Author: sadrul
Date: 2006-09-13 18:37:32 -0700 (Wed, 13 Sep 2006)
Log Message:
-----------
Patch #1558308 "gntgaim - Add buddy typing notification" from Richard Nelson (wabz)
"This patch adds/removes to/from the conversation window
title when a buddy starts/stops typing."
Pretty cool!
Modified Paths:
--------------
trunk/console/gntconv.c
Modified: trunk/console/gntconv.c
===================================================================
--- trunk/console/gntconv.c 2006-09-14 00:56:36 UTC (rev 17272)
+++ trunk/console/gntconv.c 2006-09-14 01:37:32 UTC (rev 17273)
@@ -194,7 +194,47 @@
return ret;
}
+static char *
+get_conversation_title(GaimConversation *conv, GaimAccount *account)
+{
+ return g_strdup_printf(_("%s (%s -- %s)"), gaim_conversation_get_title(conv),
+ gaim_account_get_username(account), gaim_account_get_protocol_name(account));
+}
+
static void
+update_buddy_typing(GaimAccount *account, const char *who, gpointer null)
+{
+ GaimConversation *conv;
+ GGConv *ggc;
+ GaimConvIm *im = NULL;
+ char *title, *old_title;
+
+ conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, who, account);
+ im = GAIM_CONV_IM(conv);
+
+ if (!conv)
+ return;
+
+ if (gaim_conv_im_get_typing_state(im) == GAIM_TYPING) {
+ old_title = get_conversation_title(conv, account);
+ title = g_strdup_printf(_("%s [%s]"), old_title,
+ gnt_ascii_only() ? "T" : "\342\243\277");
+ g_free(old_title);
+ } else
+ title = get_conversation_title(conv, account);
+ ggc = conv->ui_data;
+ gnt_screen_rename_widget(ggc->window, title);
+ g_free(title);
+}
+
+static gpointer
+gg_conv_get_handle()
+{
+ static int handle;
+ return &handle;
+}
+
+static void
gg_create_conversation(GaimConversation *conv)
{
GGConv *ggc = conv->ui_data;
@@ -223,9 +263,8 @@
account = gaim_conversation_get_account(conv);
type = gaim_conversation_get_type(conv);
- title = g_strdup_printf(_("%s (%s -- %s)"), gaim_conversation_get_title(conv),
- gaim_account_get_username(account), gaim_account_get_protocol_name(account));
-
+ title = get_conversation_title(conv, account);
+
ggc->window = gnt_box_new(FALSE, TRUE);
gnt_box_set_title(GNT_BOX(ggc->window), title);
gnt_box_set_toplevel(GNT_BOX(ggc->window), TRUE);
@@ -255,6 +294,11 @@
g_signal_connect(G_OBJECT(ggc->tv), "size_changed", G_CALLBACK(size_changed_cb), NULL);
g_signal_connect(G_OBJECT(ggc->window), "position_set", G_CALLBACK(save_position_cb), NULL);
+ gaim_signal_connect(gaim_conversations_get_handle(), "buddy-typing", gg_conv_get_handle(),
+ GAIM_CALLBACK(update_buddy_typing), NULL);
+ gaim_signal_connect(gaim_conversations_get_handle(), "buddy-typing-stopped", gg_conv_get_handle(),
+ GAIM_CALLBACK(update_buddy_typing), NULL);
+
g_free(title);
}
@@ -648,8 +692,7 @@
ggconv->active_conv = conv;
account = gaim_conversation_get_account(conv);
- title = g_strdup_printf(_("%s (%s -- %s)"), gaim_conversation_get_title(conv),
- gaim_account_get_username(account), gaim_account_get_protocol_name(account));
+ title = get_conversation_title(conv, account);
gnt_screen_rename_widget(ggconv->window, title);
g_free(title);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
6 messages has been excluded from this view by a project administrator.
