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: <the...@us...> - 2006-10-30 03:50:19
|
Revision: 17624
http://svn.sourceforge.net/gaim/?rev=17624&view=rev
Author: thekingant
Date: 2006-10-29 19:50:11 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
Alphabet
Modified Paths:
--------------
trunk/COPYRIGHT
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT 2006-10-30 03:40:56 UTC (rev 17623)
+++ trunk/COPYRIGHT 2006-10-30 03:50:11 UTC (rev 17624)
@@ -22,8 +22,8 @@
Curtis Beattie
Dave Bell
Igor Belyi
+Brian Bernas
Paul Betts
-Brian Bernas
Jonas Birmé
Eric Blade
Ethan Blanton
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-10-30 03:41:07
|
Revision: 17623
http://svn.sourceforge.net/gaim/?rev=17623&view=rev
Author: thekingant
Date: 2006-10-29 19:40:56 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
Should fix a rare MSN crash that Evan pointed out on the gaim-devel
mailing list on 6 Oct 2006
Modified Paths:
--------------
trunk/libgaim/protocols/msn/command.c
Modified: trunk/libgaim/protocols/msn/command.c
===================================================================
--- trunk/libgaim/protocols/msn/command.c 2006-10-30 00:40:19 UTC (rev 17622)
+++ trunk/libgaim/protocols/msn/command.c 2006-10-30 03:40:56 UTC (rev 17623)
@@ -53,12 +53,15 @@
if (param_start)
{
+ *param_start++ = '\0';
+ cmd->params = g_strsplit(param_start, " ", 0);
+ }
+
+ if (cmd->params != NULL)
+ {
char *param;
int c;
- *param_start++ = '\0';
- cmd->params = g_strsplit(param_start, " ", 0);
-
for (c = 0; cmd->params[c]; c++);
cmd->param_count = c;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-30 00:40:33
|
Revision: 17622
http://svn.sourceforge.net/gaim/?rev=17622&view=rev
Author: sadrul
Date: 2006-10-29 16:40:19 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
If you have the debug window open, and you activate some menuitem in the
conversation window without focusing on 'Conversation', Gaim freezes. This is a
fix for that (re: "Hang w/ Debug Window" in gaim-devel).
Modified Paths:
--------------
trunk/gtk/gtkconv.c
Modified: trunk/gtk/gtkconv.c
===================================================================
--- trunk/gtk/gtkconv.c 2006-10-29 23:35:57 UTC (rev 17621)
+++ trunk/gtk/gtkconv.c 2006-10-30 00:40:19 UTC (rev 17622)
@@ -166,6 +166,7 @@
static GdkColor* generate_nick_colors(guint *numcolors, GdkColor background);
static gboolean color_is_visible(GdkColor foreground, GdkColor background, int color_contrast, int brightness_contrast);
static void gaim_gtkconv_update_fields(GaimConversation *conv, GaimGtkConvFields fields);
+static void focus_out_from_menubar(GtkWidget *wid, GaimGtkWindow *win);
static GdkColor *get_nick_color(GaimGtkConversation *gtkconv, const char *name) {
static GdkColor col;
@@ -2844,15 +2845,24 @@
static void menubar_activated(GtkWidget *item, gpointer data)
{
- regenerate_options_items(data);
+ GaimGtkWindow *win = data;
+ regenerate_options_items(win);
+
+ /* The following are to make sure the 'More' submenu is not regenerated every time
+ * the focus shifts from 'Conversations' to some other menu and back. */
g_signal_handlers_block_by_func(G_OBJECT(item), G_CALLBACK(menubar_activated), data);
+ g_signal_connect(G_OBJECT(win->menu.menubar), "deactivate", G_CALLBACK(focus_out_from_menubar), data);
}
static void
focus_out_from_menubar(GtkWidget *wid, GaimGtkWindow *win)
{
+ /* The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+ * the 'Conversation' menu pops up. */
GtkWidget *menuitem = gtk_item_factory_get_item(win->menu.item_factory, N_("/Conversation"));
g_signal_handlers_unblock_by_func(G_OBJECT(menuitem), G_CALLBACK(menubar_activated), win);
+ g_signal_handlers_disconnect_by_func(G_OBJECT(win->menu.menubar),
+ G_CALLBACK(focus_out_from_menubar), win);
}
static GtkWidget *
@@ -2878,14 +2888,15 @@
g_signal_connect(G_OBJECT(accel_group), "accel-changed",
G_CALLBACK(gaim_gtk_save_accels_cb), NULL);
+ /* Make sure the 'Conversation -> More' menuitems are regenerated whenever
+ * the 'Conversation' menu pops up because the entries can change after the
+ * conversation is created. */
menuitem = gtk_item_factory_get_item(win->menu.item_factory, N_("/Conversation"));
g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(menubar_activated), win);
win->menu.menubar =
gtk_item_factory_get_widget(win->menu.item_factory, "<main>");
- g_signal_connect(G_OBJECT(win->menu.menubar), "deactivate", G_CALLBACK(focus_out_from_menubar), win);
-
win->menu.view_log =
gtk_item_factory_get_widget(win->menu.item_factory,
N_("/Conversation/View Log"));
@@ -7510,6 +7521,7 @@
gaim_conversation_is_logging(conv));
generate_send_to_items(win);
+ regenerate_options_items(win);
gaim_gtkconv_switch_active_conversation(conv);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-29 23:36:29
|
Revision: 17621
http://svn.sourceforge.net/gaim/?rev=17621&view=rev
Author: sadrul
Date: 2006-10-29 15:35:57 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
Allow custom buddy icons for people in the buddylist. It's done completely in
the UI side. The custom icon does not overwrite the original icon, which is
displayed in the tooltip.
You can set the icon by dragging an image on the conv window, or on the buddy in
the buddylist. You can also set/remove custom icon from the conversation window
by right clicking on the icon in the conv window.
Modified Paths:
--------------
trunk/ChangeLog.API
trunk/gtk/gtkblist.c
trunk/gtk/gtkconv.c
trunk/gtk/gtkutils.c
trunk/gtk/gtkutils.h
Modified: trunk/ChangeLog.API
===================================================================
--- trunk/ChangeLog.API 2006-10-29 23:28:37 UTC (rev 17620)
+++ trunk/ChangeLog.API 2006-10-29 23:35:57 UTC (rev 17621)
@@ -138,6 +138,7 @@
a change in the values stored in the column.
* gaim_find_buddies() returns a list of all buddies in the account if name
is NULL.
+ * gaim_gtk_set_custom_buddy_icon() sets custom icon for a user.
Removed:
* gaim_gtk_sound_{get,set}_mute() (replaced by the /gaim/gtk/sound/mute
Modified: trunk/gtk/gtkblist.c
===================================================================
--- trunk/gtk/gtkblist.c 2006-10-29 23:28:37 UTC (rev 17620)
+++ trunk/gtk/gtkblist.c 2006-10-29 23:35:57 UTC (rev 17621)
@@ -1992,12 +1992,12 @@
}
static GdkPixbuf *gaim_gtk_blist_get_buddy_icon(GaimBlistNode *node,
- gboolean scaled, gboolean greyed)
+ gboolean scaled, gboolean greyed, gboolean custom)
{
GdkPixbuf *buf, *ret = NULL;
GdkPixbufLoader *loader;
GaimBuddyIcon *icon;
- const guchar *data;
+ const guchar *data = NULL;
gsize len;
GaimBuddy *buddy = (GaimBuddy *)node;
@@ -2014,12 +2014,30 @@
return NULL;
#endif
- if (!(icon = gaim_buddy_get_icon(buddy)))
- if (!(icon = gaim_buddy_icons_find(buddy->account, buddy->name))) /* Not sure I like this...*/
- return NULL;
+ if (custom) {
+ const char *file = gaim_blist_node_get_string((GaimBlistNode*)gaim_buddy_get_contact(buddy),
+ "custom_buddy_icon");
+ if (file && *file) {
+ char *contents;
+ GError *err = NULL;
+ if (!g_file_get_contents(file, &contents, &len, &err)) {
+ gaim_debug_info("custom -icon", "Could not open custom-icon %s for %s\n",
+ file, gaim_buddy_get_name(buddy), err->message);
+ g_error_free(err);
+ } else
+ data = (const guchar*)contents;
+ }
+ }
+ if (data == NULL) {
+ if (!(icon = gaim_buddy_get_icon(buddy)))
+ if (!(icon = gaim_buddy_icons_find(buddy->account, buddy->name))) /* Not sure I like this...*/
+ return NULL;
+ data = gaim_buddy_icon_get_data(icon, &len);
+ custom = FALSE; /* We are not using the custom icon */
+ }
+
loader = gdk_pixbuf_loader_new();
- data = gaim_buddy_icon_get_data(icon, &len);
gdk_pixbuf_loader_write(loader, data, len, NULL);
gdk_pixbuf_loader_close(loader, NULL);
buf = gdk_pixbuf_loader_get_pixbuf(loader);
@@ -2027,6 +2045,8 @@
g_object_ref(G_OBJECT(buf));
g_object_unref(G_OBJECT(loader));
+ if (custom)
+ g_free((void*)data);
if (buf) {
GaimAccount *account = gaim_buddy_get_account(buddy);
GaimPluginProtocolInfo *prpl_info = NULL;
@@ -2088,7 +2108,7 @@
struct tooltip_data *td = g_new0(struct tooltip_data, 1);
td->status_icon = gaim_gtk_blist_get_status_icon(node, GAIM_STATUS_ICON_LARGE);
- td->avatar = gaim_gtk_blist_get_buddy_icon(node, !full, FALSE);
+ td->avatar = gaim_gtk_blist_get_buddy_icon(node, !full, FALSE, FALSE);
tooltip_text = gaim_get_tooltip_text(node, full);
td->layout = gtk_widget_create_pango_layout(gtkblist->tipwindow, NULL);
pango_layout_set_markup(td->layout, tooltip_text, -1);
@@ -4470,7 +4490,7 @@
status = gaim_gtk_blist_get_status_icon((GaimBlistNode*)buddy,
biglist ? GAIM_STATUS_ICON_LARGE : GAIM_STATUS_ICON_SMALL);
- avatar = gaim_gtk_blist_get_buddy_icon((GaimBlistNode *)buddy, TRUE, TRUE);
+ avatar = gaim_gtk_blist_get_buddy_icon((GaimBlistNode *)buddy, TRUE, TRUE, TRUE);
mark = gaim_gtk_blist_get_name_markup(buddy, selected);
if (gaim_prefs_get_bool("/gaim/gtk/blist/show_idle_time") &&
Modified: trunk/gtk/gtkconv.c
===================================================================
--- trunk/gtk/gtkconv.c 2006-10-29 23:28:37 UTC (rev 17620)
+++ trunk/gtk/gtkconv.c 2006-10-29 23:35:57 UTC (rev 17621)
@@ -2354,7 +2354,7 @@
}
static void
-remove_icon(GaimGtkConversation *gtkconv)
+remove_icon(GtkWidget *widget, GaimGtkConversation *gtkconv)
{
GaimConversation *conv = gtkconv->active_conv;
GaimGtkWindow *gtkwin;
@@ -2412,7 +2412,54 @@
fclose(fp);
}
+static const char *
+custom_icon_pref_name(GaimGtkConversation *gtkconv)
+{
+ GaimConversation *conv;
+ GaimAccount *account;
+ GaimBuddy *buddy;
+
+ conv = gtkconv->active_conv;
+ account = gaim_conversation_get_account(conv);
+ buddy = gaim_find_buddy(account, gaim_conversation_get_name(conv));
+ if (buddy) {
+ GaimContact *contact = gaim_buddy_get_contact(buddy);
+ return gaim_blist_node_get_string((GaimBlistNode*)contact, "custom_buddy_icon");
+ }
+ return NULL;
+}
+
static void
+custom_icon_sel_cb(const char *filename, gpointer data)
+{
+ if (filename) {
+ GaimGtkConversation *gtkconv = data;
+ GaimConversation *conv = gtkconv->active_conv;
+ GaimAccount *account = gaim_conversation_get_account(conv);
+ gaim_gtk_set_custom_buddy_icon(account, gaim_conversation_get_name(conv), filename);
+ }
+}
+
+static void
+set_custom_icon_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+{
+ GtkWidget *win = gaim_gtk_buddy_icon_chooser_new(GTK_WINDOW(gtkconv->win->window),
+ custom_icon_sel_cb, gtkconv);
+ gtk_widget_show_all(win);
+}
+
+static void
+remove_custom_icon_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+{
+ GaimConversation *conv;
+ GaimAccount *account;
+
+ conv = gtkconv->active_conv;
+ account = gaim_conversation_get_account(conv);
+ gaim_gtk_set_custom_buddy_icon(account, gaim_conversation_get_name(conv), NULL);
+}
+
+static void
icon_menu_save_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
{
GaimConversation *conv = gtkconv->active_conv;
@@ -2459,7 +2506,7 @@
icon_menu(GtkObject *obj, GdkEventButton *e, GaimGtkConversation *gtkconv)
{
static GtkWidget *menu = NULL;
- GtkWidget *item;
+ const char *pref;
if (e->button != 3 || e->type != GDK_BUTTON_PRESS)
return FALSE;
@@ -2481,16 +2528,25 @@
gtkconv->u.im->icon_timer);
}
- item = gtk_menu_item_new_with_label(_("Hide Icon"));
- g_signal_connect_swapped(G_OBJECT(item), "activate",
- G_CALLBACK(remove_icon), gtkconv);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
- gtk_widget_show(item);
+ gaim_new_item_from_stock(menu, _("Hide Icon"), NULL, G_CALLBACK(remove_icon),
+ gtkconv, 0, 0, NULL);
gaim_new_item_from_stock(menu, _("Save Icon As..."), GTK_STOCK_SAVE_AS,
G_CALLBACK(icon_menu_save_cb), gtkconv,
0, 0, NULL);
+ gaim_new_item_from_stock(menu, _("Set Custom Icon..."), NULL,
+ G_CALLBACK(set_custom_icon_cb), gtkconv,
+ 0, 0, NULL);
+
+ /* Is there a custom icon for this person? */
+ pref = custom_icon_pref_name(gtkconv);
+ if (pref && *pref) {
+ gaim_new_item_from_stock(menu, _("Remove Custom Icon"), NULL,
+ G_CALLBACK(remove_custom_icon_cb), gtkconv,
+ 0, 0, NULL);
+ }
+
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, e->button, e->time);
return TRUE;
@@ -2518,7 +2574,7 @@
if (active)
gaim_gtkconv_update_buddy_icon(conv);
else
- remove_icon(gtkconv);
+ remove_icon(NULL, gtkconv);
}
/**************************************************************************
@@ -5836,7 +5892,8 @@
GdkPixbufAnimation *anim;
GError *err = NULL;
- const void *data;
+ const char *custom = NULL;
+ const void *data = NULL;
size_t len;
GdkPixbuf *buf;
@@ -5893,13 +5950,29 @@
if (gaim_conversation_get_gc(conv) == NULL)
return;
- icon = gaim_conv_im_get_icon(GAIM_CONV_IM(conv));
+ custom = custom_icon_pref_name(gtkconv);
+ if (custom) {
+ /* There is a custom icon for this user */
+ char *contents = NULL;
+ if (!g_file_get_contents(custom, &contents, &len, &err)) {
+ gaim_debug_warning("custom icon", "could not load custom icon %s for %s\n",
+ custom, gaim_conversation_get_name(conv));
+ g_error_free(err);
+ err = NULL;
+ } else
+ data = contents;
+ }
- if (icon == NULL)
- return;
+ if (data == NULL) {
+ icon = gaim_conv_im_get_icon(GAIM_CONV_IM(conv));
- data = gaim_buddy_icon_get_data(icon, &len);
+ if (icon == NULL)
+ return;
+ data = gaim_buddy_icon_get_data(icon, &len);
+ custom = NULL;
+ }
+
loader = gdk_pixbuf_loader_new();
gdk_pixbuf_loader_write(loader, data, len, NULL);
gdk_pixbuf_loader_close(loader, &err);
@@ -5908,6 +5981,9 @@
g_object_ref(G_OBJECT(anim));
g_object_unref(loader);
+ if (custom)
+ g_free((void*)data);
+
if (!anim)
return;
gtkconv->u.im->anim = anim;
Modified: trunk/gtk/gtkutils.c
===================================================================
--- trunk/gtk/gtkutils.c 2006-10-29 23:28:37 UTC (rev 17620)
+++ trunk/gtk/gtkutils.c 2006-10-29 23:35:57 UTC (rev 17621)
@@ -1,5 +1,5 @@
/**
- * @file gtkutils.h GTK+ utility functions
+ * @file gtkutils.c GTK+ utility functions
* @ingroup gtkui
*
* gaim
@@ -1296,6 +1296,7 @@
{
char *filedata;
size_t size;
+ struct stat st;
GError *err = NULL;
GaimConversation *conv;
GaimGtkConversation *gtkconv;
@@ -1303,23 +1304,20 @@
int id;
switch (choice) {
case DND_BUDDY_ICON:
- if (!g_file_get_contents(data->filename, &filedata, &size,
- &err)) {
+ if (g_stat(data->filename, &st)) {
char *str;
- str = g_strdup_printf(_("The following error has occurred loading %s: %s"), data->filename, err->message);
+ str = g_strdup_printf(_("The following error has occurred loading %s: %s"),
+ data->filename, strerror(errno));
gaim_notify_error(NULL, NULL,
_("Failed to load image"),
str);
-
- g_error_free(err);
g_free(str);
return;
}
- gaim_buddy_icons_set_for_user(data->account, data->who, filedata, size);
- g_free(filedata);
+ gaim_gtk_set_custom_buddy_icon(data->account, data->who, data->filename);
break;
case DND_FILE_TRANSFER:
serv_send_file(gaim_account_get_connection(data->account), data->who, data->filename);
@@ -2795,3 +2793,48 @@
}
#endif
+void gaim_gtk_set_custom_buddy_icon(GaimAccount *account, const char *who, const char *filename)
+{
+ GaimConversation *conv;
+ GaimBuddy *buddy;
+ GaimBlistNode *node;
+ char *path = NULL;
+
+ buddy = gaim_find_buddy(account, who);
+ if (!buddy) {
+ gaim_debug_info("custom-icon", "You can only set custom icon for someone in your buddylist.\n");
+ return;
+ }
+
+ node = (GaimBlistNode*)gaim_buddy_get_contact(buddy);
+ path = (char*)gaim_blist_node_get_string(node, "custom_buddy_icon");
+ if (path) {
+ struct stat st;
+ if (g_stat(path, &st) == 0)
+ g_unlink(path);
+ path = NULL;
+ }
+
+ if (filename) {
+ char *newfile;
+
+ newfile = gaim_gtk_convert_buddy_icon(gaim_find_prpl(gaim_account_get_protocol_id(account)),
+ filename);
+ path = gaim_buddy_icons_get_full_path(newfile);
+ g_free(newfile);
+ }
+
+ gaim_blist_node_set_string(node, "custom_buddy_icon", path);
+ g_free(path);
+
+ /* Update the conversation */
+ conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, who, account);
+ if (conv)
+ gaim_conversation_update(conv, GAIM_CONV_UPDATE_ICON);
+
+ /* Update the buddylist */
+ if (buddy)
+ gaim_blist_update_buddy_icon(buddy);
+}
+
+
Modified: trunk/gtk/gtkutils.h
===================================================================
--- trunk/gtk/gtkutils.h 2006-10-29 23:28:37 UTC (rev 17620)
+++ trunk/gtk/gtkutils.h 2006-10-29 23:35:57 UTC (rev 17621)
@@ -475,7 +475,7 @@
*
* @param plugin The prpl to conver the icon
* @param path The path of a buddy icon to convert
- * @return The path of a new buddy icon
+ * @return The name of a new buddy icon
*/
char* gaim_gtk_convert_buddy_icon(GaimPlugin *plugin, const char *path);
@@ -491,3 +491,13 @@
#endif
#endif /* _GAIM_GTKUTILS_H_ */
+
+/**
+ * Set or unset a custom buddyicon for a user.
+ *
+ * @param account The account the user belongs to.
+ * @param who The name of the user.
+ * @param filename The path of the custom icon. If this is @c NULL, then any
+ * previously set custom buddy icon for the user is removed.
+ */
+void gaim_gtk_set_custom_buddy_icon(GaimAccount *account, const char *who, const char *filename);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-10-29 23:28:58
|
Revision: 17620
http://svn.sourceforge.net/gaim/?rev=17620&view=rev
Author: datallah
Date: 2006-10-29 15:28:37 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
A couple patches from Lee Roach.
-Delete the Perl loader link library when making clean.
-Force the Tcl loader plugin to use the ActiveTcl installation. This will prevent 99.99% of the cygwin "hang on start" issues, at the cost of having the Tcl loader not work for some people - if you're one of the 5 or so people using the Tcl loader on win32, you can figure out how to fix it - maybe we'll add a faq entry. This should cut down on the frequent bug reports of gaim failing to start.
Modified Paths:
--------------
trunk/COPYRIGHT
trunk/libgaim/plugins/perl/Makefile.mingw
trunk/libgaim/plugins/tcl/tcl.c
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT 2006-10-29 15:59:05 UTC (rev 17619)
+++ trunk/COPYRIGHT 2006-10-29 23:28:37 UTC (rev 17620)
@@ -243,6 +243,7 @@
Pekka Riikonen
Tim Ringenbach
Dennis Ristuccia
+Lee Roach
Rhett Robinson
Luciano Miguel Ferreira Rocha
Andrew Rodland
Modified: trunk/libgaim/plugins/perl/Makefile.mingw
===================================================================
--- trunk/libgaim/plugins/perl/Makefile.mingw 2006-10-29 15:59:05 UTC (rev 17619)
+++ trunk/libgaim/plugins/perl/Makefile.mingw 2006-10-29 23:28:37 UTC (rev 17620)
@@ -76,7 +76,7 @@
##
clean:
rm -rf $(OBJECTS)
- rm -rf $(TARGET).dll
+ rm -rf $(TARGET).dll $(TARGET).dll.a
$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) clean
include $(GAIM_COMMON_TARGETS)
Modified: trunk/libgaim/plugins/tcl/tcl.c
===================================================================
--- trunk/libgaim/plugins/tcl/tcl.c 2006-10-29 15:59:05 UTC (rev 17619)
+++ trunk/libgaim/plugins/tcl/tcl.c 2006-10-29 23:28:37 UTC (rev 17620)
@@ -437,36 +437,50 @@
#define Tk_Init wtk_Init
static gboolean tcl_win32_init() {
- gaim_debug(GAIM_DEBUG_INFO, "tcl",
- "Initializing the Tcl runtime. If Gaim doesn't load, it is "
- "most likely because you have cygwin in your PATH and you "
- "should remove it. See http://gaim.sf.net/win32 for more "
- "information\n");
+ const char regkey[] = "SOFTWARE\\ActiveState\\ActiveTcl\\";
+ char *version = NULL;
+ gboolean retval = FALSE;
- if(!(wtcl_CreateInterp = (LPFNTCLCREATEINTERP) wgaim_find_and_loadproc("tcl84.dll", "Tcl_CreateInterp"))) {
- gaim_debug(GAIM_DEBUG_INFO, "tcl", "tcl_win32_init error loading Tcl_CreateInterp\n");
- return FALSE;
- }
+ if ((version = wgaim_read_reg_string(HKEY_LOCAL_MACHINE, regkey, "CurrentVersion"))
+ || (version = wgaim_read_reg_string(HKEY_CURRENT_USER, regkey, "CurrentVersion"))) {
+ char *path;
+ char *regkey2;
- if(!(wtk_Init = (LPFNTKINIT) wgaim_find_and_loadproc("tk84.dll", "Tk_Init"))) {
- HMODULE mod;
- gaim_debug(GAIM_DEBUG_INFO, "tcl", "tcl_win32_init error loading Tk_Init\n");
- if((mod = GetModuleHandle("tcl84.dll")))
- FreeLibrary(mod);
- return FALSE;
- }
+ regkey2 = g_strdup_printf("%s%s\\", regkey, version);
+ if ((path = wgaim_read_reg_string(HKEY_LOCAL_MACHINE, regkey2, NULL)) || (path = wgaim_read_reg_string(HKEY_CURRENT_USER, regkey2, NULL))) {
+ char *tclpath;
+ char *tkpath;
- if (GetModuleHandle("cygwin1.dll")) {
- HMODULE mod;
- gaim_debug(GAIM_DEBUG_INFO, "tcl", "Cygwin has been loaded by tcl84.dll and/or tk84.dll. Disabling Tcl support to avoid problems.\n");
- if((mod = GetModuleHandle("tcl84.dll")))
- FreeLibrary(mod);
- if((mod = GetModuleHandle("tk84.dll")))
- FreeLibrary(mod);
- return FALSE;
+ gaim_debug(GAIM_DEBUG_INFO, "tcl", "Loading ActiveTCL version %s from \"%s\"\n", version, path);
+
+ tclpath = g_build_filename(path, "bin", "tcl84.dll", NULL);
+ tkpath = g_build_filename(path, "bin", "tk84.dll", NULL);
+
+ if(!(wtcl_CreateInterp = (LPFNTCLCREATEINTERP) wgaim_find_and_loadproc(tclpath, "Tcl_CreateInterp"))) {
+ gaim_debug(GAIM_DEBUG_INFO, "tcl", "tcl_win32_init error loading Tcl_CreateInterp\n");
+ } else {
+ if(!(wtk_Init = (LPFNTKINIT) wgaim_find_and_loadproc(tkpath, "Tk_Init"))) {
+ HMODULE mod;
+ gaim_debug(GAIM_DEBUG_INFO, "tcl", "tcl_win32_init error loading Tk_Init\n");
+ if((mod = GetModuleHandle("tcl84.dll")))
+ FreeLibrary(mod);
+ } else {
+ retval = TRUE;
+ }
+ }
+ g_free(tclpath);
+ g_free(tkpath);
+ }
+ g_free(path);
+ g_free(regkey2);
}
- return TRUE;
+ g_free(version);
+
+ if (!retval)
+ gaim_debug(GAIM_DEBUG_INFO, "tcl", _("Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"));
+
+ return retval;
}
#endif /* _WIN32 */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-29 16:01:58
|
Revision: 17619
http://svn.sourceforge.net/gaim/?rev=17619&view=rev
Author: sadrul
Date: 2006-10-29 07:59:05 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
Add submenus in the context-menu when necessary.
Modified Paths:
--------------
trunk/console/gntblist.c
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c 2006-10-29 14:51:20 UTC (rev 17618)
+++ trunk/console/gntblist.c 2006-10-29 15:59:05 UTC (rev 17619)
@@ -643,11 +643,16 @@
return;
item = gnt_menuitem_new(action->label);
- gnt_menuitem_set_callback(GNT_MENUITEM(item), context_menu_callback, action);
+ if (action->callback)
+ gnt_menuitem_set_callback(GNT_MENUITEM(item), context_menu_callback, action);
gnt_menu_add_item(menu, GNT_MENUITEM(item));
- for (list = action->children; list; list = list->next)
- gnt_append_menu_action(menu, list->data, action);
+ if (action->children) {
+ GntWidget *sub = gnt_menu_new(GNT_MENU_POPUP);
+ gnt_menuitem_set_submenu(item, GNT_MENU(sub));
+ for (list = action->children; list; list = list->next)
+ gnt_append_menu_action(GNT_MENU(sub), list->data, action);
+ }
}
static void
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lsc...@us...> - 2006-10-29 14:56:42
|
Revision: 17618
http://svn.sourceforge.net/gaim/?rev=17618&view=rev
Author: lschiere
Date: 2006-10-29 06:51:20 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
"In 2.0.0b4 (as well as in trunk), my_MM.po claims
itself to be encoded in iso-8859-1, but it is in fact
encoded in utf-8. This is supported by the following:
1. Burmese is not encoded in iso-8859-1
2. If a suitable font is installed, opening the
my_MM.po file as utf-8 actually causes Burmese
characters to appear" --acli
Modified Paths:
--------------
trunk/po/my_MM.po
Modified: trunk/po/my_MM.po
===================================================================
--- trunk/po/my_MM.po 2006-10-29 07:09:49 UTC (rev 17617)
+++ trunk/po/my_MM.po 2006-10-29 14:51:20 UTC (rev 17618)
@@ -12,7 +12,7 @@
"Last-Translator: Minn Myat Soe <mmy...@gm...>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-29 07:09:56
|
Revision: 17617
http://svn.sourceforge.net/gaim/?rev=17617&view=rev
Author: sadrul
Date: 2006-10-29 00:09:49 -0700 (Sun, 29 Oct 2006)
Log Message:
-----------
Patch from Richard 'wabz' Nelson to fix a crash during startup if show-offline is enabled.
I also noticed another crash during shutdown. Fix that one too.
Modified Paths:
--------------
trunk/console/gntblist.c
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c 2006-10-29 03:43:15 UTC (rev 17616)
+++ trunk/console/gntblist.c 2006-10-29 07:09:49 UTC (rev 17617)
@@ -158,6 +158,13 @@
ggblist->tnode = NULL;
}
+static gboolean
+_draw_tooltip(gpointer data)
+{
+ draw_tooltip(data);
+ return FALSE;
+}
+
static void
node_remove(GaimBuddyList *list, GaimBlistNode *node)
{
@@ -180,7 +187,13 @@
group->currentsize < 1)
node_remove(list, node->parent);
}
- draw_tooltip(ggblist);
+
+ /* When an account has signed off, it removes one buddy at a time.
+ * Drawing the tooltip after removing each buddy is expensive. On
+ * top of that, if the selected buddy belongs to the disconnected
+ * account, then retreiving the tooltip for that causes crash. So
+ * let's make sure we wait for all the buddies to be removed first.*/
+ g_timeout_add(0, _draw_tooltip, ggblist);
}
static void
@@ -1450,7 +1463,7 @@
redraw_blist(const char *name, GaimPrefType type, gconstpointer val, gpointer data)
{
GaimBlistNode *node, *sel;
- if (ggblist == NULL)
+ if (ggblist == NULL || ggblist->window == NULL)
return;
sel = gnt_tree_get_selection_data(GNT_TREE(ggblist->tree));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-29 03:43:29
|
Revision: 17616
http://svn.sourceforge.net/gaim/?rev=17616&view=rev
Author: sadrul
Date: 2006-10-28 20:43:15 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
Fix bug #1582629. The terminal should now always go back to normal state after quitting from gaim-text.
Modified Paths:
--------------
trunk/console/gntblist.c
trunk/console/gntgaim.c
trunk/console/gntui.c
trunk/console/gntui.h
trunk/console/libgnt/gntwidget.c
trunk/console/libgnt/wms/s.c
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c 2006-10-29 01:32:04 UTC (rev 17615)
+++ trunk/console/gntblist.c 2006-10-29 03:43:15 UTC (rev 17616)
@@ -101,6 +101,7 @@
static void remove_peripherals(GGBlist *ggblist);
static const char * get_display_name(GaimBlistNode *node);
static void savedstatus_changed(GaimSavedStatus *now, GaimSavedStatus *old);
+static void blist_show(GaimBuddyList *list);
/* Sort functions */
static int blist_node_compare_text(GaimBlistNode *n1, GaimBlistNode *n2);
@@ -228,6 +229,11 @@
static void
new_list(GaimBuddyList *list)
{
+ if (ggblist)
+ return;
+
+ ggblist = g_new0(GGBlist, 1);
+ list->ui_data = ggblist;
}
static void
@@ -398,7 +404,7 @@
{
new_list,
new_node,
- NULL,
+ blist_show,
node_update,
node_remove,
NULL,
@@ -1470,8 +1476,6 @@
gaim_prefs_add_bool(PREF_ROOT "/showoffline", FALSE);
gaim_prefs_add_string(PREF_ROOT "/sort_type", "text");
- gg_blist_show();
-
gaim_prefs_connect_callback(gg_blist_get_handle(),
PREF_ROOT "/showoffline", redraw_blist, NULL);
gaim_prefs_connect_callback(gg_blist_get_handle(),
@@ -1851,13 +1855,17 @@
void gg_blist_show()
{
- if (ggblist)
+ blist_show(gaim_get_blist());
+}
+
+static void
+blist_show(GaimBuddyList *list)
+{
+ if (ggblist == NULL)
+ new_list(list);
+ else if (ggblist->window)
return;
- ggblist = g_new0(GGBlist, 1);
-
- gaim_get_blist()->ui_data = ggblist;
-
ggblist->window = gnt_vwindow_new(FALSE);
gnt_widget_set_name(ggblist->window, "buddylist");
gnt_box_set_toplevel(GNT_BOX(ggblist->window), TRUE);
Modified: trunk/console/gntgaim.c
===================================================================
--- trunk/console/gntgaim.c 2006-10-29 01:32:04 UTC (rev 17615)
+++ trunk/console/gntgaim.c 2006-10-29 03:43:15 UTC (rev 17616)
@@ -57,8 +57,8 @@
{
gg_prefs_init,
debug_init,
- NULL, /*gaim_gtk_ui_init,*/
- NULL, /*gaim_gtk_quit*/
+ gnt_ui_init,
+ gnt_ui_uninit
};
static GaimCoreUiOps *
@@ -332,8 +332,9 @@
if (!init_libgaim(argc, argv))
return 0;
- /* Initialize and run the UI */
- init_gnt_ui();
+ gaim_blist_show();
+ gnt_main();
+
#ifdef STANDALONE
gaim_core_quit();
#endif
Modified: trunk/console/gntui.c
===================================================================
--- trunk/console/gntui.c 2006-10-29 01:32:04 UTC (rev 17615)
+++ trunk/console/gntui.c 2006-10-29 03:43:15 UTC (rev 17616)
@@ -36,7 +36,7 @@
#include <prefs.h>
-void init_gnt_ui()
+void gnt_ui_init()
{
#ifdef STANDALONE
gnt_init();
@@ -77,9 +77,10 @@
#ifdef STANDALONE
gg_plugins_save_loaded();
+}
- gnt_main();
-
+void gnt_ui_uninit()
+{
gaim_accounts_set_ui_ops(NULL);
gg_accounts_uninit();
Modified: trunk/console/gntui.h
===================================================================
--- trunk/console/gntui.h 2006-10-29 01:32:04 UTC (rev 17615)
+++ trunk/console/gntui.h 2006-10-29 03:43:15 UTC (rev 17616)
@@ -24,6 +24,7 @@
#include "gnt.h"
-void init_gnt_ui(void);
+void gnt_ui_init(void);
+void gnt_ui_uninit(void);
#endif
Modified: trunk/console/libgnt/gntwidget.c
===================================================================
--- trunk/console/libgnt/gntwidget.c 2006-10-29 01:32:04 UTC (rev 17615)
+++ trunk/console/libgnt/gntwidget.c 2006-10-29 03:43:15 UTC (rev 17616)
@@ -581,6 +581,10 @@
width--;
height--;
}
+ if (width <= 0)
+ width = widget->priv.width;
+ if (height <= 0)
+ height = widget->priv.height;
if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
{
Modified: trunk/console/libgnt/wms/s.c
===================================================================
--- trunk/console/libgnt/wms/s.c 2006-10-29 01:32:04 UTC (rev 17615)
+++ trunk/console/libgnt/wms/s.c 2006-10-29 03:43:15 UTC (rev 17616)
@@ -76,7 +76,7 @@
gnt_widget_set_position(win, x, y);
mvwin(win->window, y, x);
- gnt_widget_set_size(win, w, h);
+ gnt_widget_set_size(win, -1, h);
gnt_widget_draw(win);
envelope_buddylist(win);
} else if (name && strcmp(name, "conversation-window") == 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-29 01:32:17
|
Revision: 17615
http://svn.sourceforge.net/gaim/?rev=17615&view=rev
Author: sadrul
Date: 2006-10-28 18:32:04 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
Patch from Richard Nelson (wabz) to fix the blist-width, and do ellipsization in the trees.
Modified Paths:
--------------
trunk/console/gntblist.c
trunk/console/libgnt/gntbox.c
trunk/console/libgnt/gnttree.c
trunk/console/plugins/gnthistory.c
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c 2006-10-29 00:15:32 UTC (rev 17614)
+++ trunk/console/gntblist.c 2006-10-29 01:32:04 UTC (rev 17615)
@@ -1315,10 +1315,13 @@
}
static void
-size_changed_cb(GntWidget *w, int width, int height)
+size_changed_cb(GntWidget *w, int wi, int h)
{
+ int width, height;
+ gnt_widget_get_size(w, &width, &height);
gaim_prefs_set_int(PREF_ROOT "/size/width", width);
gaim_prefs_set_int(PREF_ROOT "/size/height", height);
+ gnt_tree_set_col_width(GNT_TREE(ggblist->tree), 0, width - 1);
}
static void
@@ -1864,12 +1867,14 @@
ggblist->tree = gnt_tree_new();
GNT_WIDGET_SET_FLAGS(ggblist->tree, GNT_WIDGET_NO_BORDER);
- gnt_tree_set_col_width(GNT_TREE(ggblist->tree), 0, 25);
gnt_widget_set_size(ggblist->tree, gaim_prefs_get_int(PREF_ROOT "/size/width"),
gaim_prefs_get_int(PREF_ROOT "/size/height"));
gnt_widget_set_position(ggblist->window, gaim_prefs_get_int(PREF_ROOT "/position/x"),
gaim_prefs_get_int(PREF_ROOT "/position/y"));
+ gnt_tree_set_col_width(GNT_TREE(ggblist->tree), 0,
+ gaim_prefs_get_int(PREF_ROOT "/size/width") - 1);
+
gnt_box_add_widget(GNT_BOX(ggblist->window), ggblist->tree);
ggblist->status = gnt_combo_box_new();
Modified: trunk/console/libgnt/gntbox.c
===================================================================
--- trunk/console/libgnt/gntbox.c 2006-10-29 00:15:32 UTC (rev 17614)
+++ trunk/console/libgnt/gntbox.c 2006-10-29 01:32:04 UTC (rev 17615)
@@ -704,6 +704,9 @@
GntWidget *wid;
int width, height;
+ if (GNT_WIDGET(box)->parent != NULL)
+ return;
+
for (iter = box->list; iter; iter = iter->next)
{
GntWidget *w = iter->data;
Modified: trunk/console/libgnt/gnttree.c
===================================================================
--- trunk/console/libgnt/gnttree.c 2006-10-29 00:15:32 UTC (rev 17614)
+++ trunk/console/libgnt/gnttree.c 2006-10-29 01:32:04 UTC (rev 17615)
@@ -200,6 +200,7 @@
const char *text;
int len = gnt_util_onscreen_width(col->text, NULL);
int fl = 0;
+ gboolean cut = FALSE;
if (i == 0)
{
@@ -231,13 +232,20 @@
else
g_string_append_c(string, '|');
- if (len > tree->columns[i].width)
- {
- len = tree->columns[i].width;
+ if (len > tree->columns[i].width) {
+ len = tree->columns[i].width - 1;
+ cut = TRUE;
}
-
text = gnt_util_onscreen_width_to_pointer(col->text, len - fl, NULL);
string = g_string_append_len(string, col->text, text - col->text);
+ if (cut) { /* ellipsis */
+ if (gnt_ascii_only())
+ g_string_append_c(string, '~');
+ else
+ string = g_string_append(string, "\342\200\246");
+ len++;
+ }
+
if (len < tree->columns[i].width && iter->next)
g_string_append_printf(string, "%*s", tree->columns[i].width - len, "");
}
@@ -339,7 +347,6 @@
if ((wr = gnt_util_onscreen_width(str, NULL)) > scrcol)
{
- /* XXX: ellipsize */
char *s = (char*)gnt_util_onscreen_width_to_pointer(str, scrcol, &wr);
*s = '\0';
}
Modified: trunk/console/plugins/gnthistory.c
===================================================================
--- trunk/console/plugins/gnthistory.c 2006-10-29 00:15:32 UTC (rev 17614)
+++ trunk/console/plugins/gnthistory.c 2006-10-29 01:32:04 UTC (rev 17615)
@@ -21,7 +21,6 @@
/* Ripped from gtk/plugins/history.c */
#include "internal.h"
-#include "gntgaim.h"
#include "conversation.h"
#include "debug.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-29 00:15:43
|
Revision: 17614
http://svn.sourceforge.net/gaim/?rev=17614&view=rev
Author: sadrul
Date: 2006-10-28 17:15:32 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
a couple of minor fixes
Modified Paths:
--------------
trunk/console/libgnt/gntbox.c
trunk/console/libgnt/gntmenu.c
Modified: trunk/console/libgnt/gntbox.c
===================================================================
--- trunk/console/libgnt/gntbox.c 2006-10-28 23:55:29 UTC (rev 17613)
+++ trunk/console/libgnt/gntbox.c 2006-10-29 00:15:32 UTC (rev 17614)
@@ -704,8 +704,6 @@
GntWidget *wid;
int width, height;
- g_return_if_fail(GNT_WIDGET(box)->parent == NULL);
-
for (iter = box->list; iter; iter = iter->next)
{
GntWidget *w = iter->data;
Modified: trunk/console/libgnt/gntmenu.c
===================================================================
--- trunk/console/libgnt/gntmenu.c 2006-10-28 23:55:29 UTC (rev 17613)
+++ trunk/console/libgnt/gntmenu.c 2006-10-29 00:15:32 UTC (rev 17614)
@@ -210,7 +210,7 @@
}
if (item) {
- if (GNT_MENUITEM_CHECK(item))
+ if (GNT_IS_MENUITEM_CHECK(item))
gnt_menu_toggled(GNT_TREE(widget), item);
else
menuitem_activate(menu, item);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-28 23:55:38
|
Revision: 17613
http://svn.sourceforge.net/gaim/?rev=17613&view=rev
Author: sadrul
Date: 2006-10-28 16:55:29 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
Fix bug #1586377.
Modified Paths:
--------------
trunk/console/gntdebug.c
Modified: trunk/console/gntdebug.c
===================================================================
--- trunk/console/gntdebug.c 2006-10-28 22:14:52 UTC (rev 17612)
+++ trunk/console/gntdebug.c 2006-10-28 23:55:29 UTC (rev 17613)
@@ -193,7 +193,7 @@
void gg_debug_window_show()
{
- debug.paused = false;
+ debug.paused = FALSE;
debug.timestamps = gaim_prefs_get_bool("/core/debug/timestamps");
if (debug.window == NULL)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-28 22:15:08
|
Revision: 17612
http://svn.sourceforge.net/gaim/?rev=17612&view=rev
Author: sadrul
Date: 2006-10-28 15:14:52 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
Add a 'MenuItemCheck' thing.
Use GntMenu for the context-menu in the buddylist.
This patch has 666 lines ... but I'm sure it's a good patch!
Modified Paths:
--------------
trunk/console/gntblist.c
trunk/console/libgnt/Makefile.am
trunk/console/libgnt/gntmenu.c
trunk/console/libgnt/gntmenuitem.h
trunk/console/libgnt/gnttree.c
trunk/console/libgnt/gnttree.h
trunk/console/plugins/gntgf.c
Added Paths:
-----------
trunk/console/libgnt/gntmenuitemcheck.c
trunk/console/libgnt/gntmenuitemcheck.h
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c 2006-10-28 20:38:25 UTC (rev 17611)
+++ trunk/console/gntblist.c 2006-10-28 22:14:52 UTC (rev 17612)
@@ -39,6 +39,9 @@
#include "gntentry.h"
#include "gntlabel.h"
#include "gntline.h"
+#include "gntmenu.h"
+#include "gntmenuitem.h"
+#include "gntmenuitemcheck.h"
#include "gnttree.h"
#include "gntwindow.h"
@@ -597,29 +600,39 @@
}
static void
-remove_context_menu(GGBlist *ggblist)
+context_menu_callback(GntMenuItem *item, gpointer data)
{
- if (ggblist->context)
- gnt_widget_destroy(ggblist->context->parent);
- ggblist->context = NULL;
- ggblist->cnode = NULL;
+ GaimMenuAction *action = data;
+ GaimBlistNode *node = ggblist->cnode;
+ if (action) {
+ void (*callback)(GaimBlistNode *, gpointer);
+ callback = (void (*)(GaimBlistNode *, gpointer))action->callback;
+ if (callback)
+ callback(action->data, node);
+ else
+ return;
+ }
}
static void
-gnt_append_menu_action(GntTree *tree, GaimMenuAction *action, gpointer parent)
+gnt_append_menu_action(GntMenu *menu, GaimMenuAction *action, gpointer parent)
{
GList *list;
+ GntMenuItem *item;
+
if (action == NULL)
return;
- gnt_tree_add_row_last(tree, action,
- gnt_tree_create_row(tree, action->label), parent);
+ item = gnt_menuitem_new(action->label);
+ gnt_menuitem_set_callback(GNT_MENUITEM(item), context_menu_callback, action);
+ gnt_menu_add_item(menu, GNT_MENUITEM(item));
+
for (list = action->children; list; list = list->next)
- gnt_append_menu_action(tree, list->data, action);
+ gnt_append_menu_action(menu, list->data, action);
}
static void
-append_proto_menu(GntTree *tree, GaimConnection *gc, GaimBlistNode *node)
+append_proto_menu(GntMenu *menu, GaimConnection *gc, GaimBlistNode *node)
{
GList *list;
GaimPluginProtocolInfo *prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
@@ -632,28 +645,21 @@
{
GaimMenuAction *act = (GaimMenuAction *) list->data;
act->data = node;
- gnt_append_menu_action(tree, act, NULL);
+ gnt_append_menu_action(menu, act, NULL);
}
}
static void
-add_custom_action(GntTree *tree, const char *label, GaimCallback callback,
+add_custom_action(GntMenu *menu, const char *label, GaimCallback callback,
gpointer data)
{
GaimMenuAction *action = gaim_menu_action_new(label, callback, data, NULL);
- gnt_append_menu_action(tree, action, NULL);
- g_signal_connect_swapped(G_OBJECT(tree), "destroy",
+ gnt_append_menu_action(menu, action, NULL);
+ g_signal_connect_swapped(G_OBJECT(menu), "destroy",
G_CALLBACK(gaim_menu_action_free), action);
}
static void
-context_menu_toggle(GntTree *tree, GaimMenuAction *action, gpointer null)
-{
- gboolean sel = gnt_tree_get_choice(tree, action);
- gaim_blist_node_set_bool(action->data, "gnt-autojoin", sel);
-}
-
-static void
chat_components_edit_ok(GaimChat *chat, GaimRequestFields *allfields)
{
GList *groups, *fields;
@@ -713,19 +719,26 @@
}
static void
-create_chat_menu(GntTree *tree, GaimChat *chat)
+autojoin_toggled(GntMenuItem *item, gpointer data)
{
- GaimMenuAction *action = gaim_menu_action_new(_("Auto-join"), NULL, chat, NULL);
+ GaimMenuAction *action = data;
+ gaim_blist_node_set_bool(action->data, "gnt-autojoin",
+ gnt_menuitem_check_get_checked(GNT_MENUITEM_CHECK(item)));
+}
- gnt_tree_add_choice(tree, action, gnt_tree_create_row(tree, action->label), NULL, NULL);
- gnt_tree_set_choice(tree, action, gaim_blist_node_get_bool((GaimBlistNode*)chat, "gnt-autojoin"));
-
- g_signal_connect_swapped(G_OBJECT(tree), "destroy",
+static void
+create_chat_menu(GntMenu *menu, GaimChat *chat)
+{
+ GaimMenuAction *action = gaim_menu_action_new(_("Auto-join"), NULL, chat, NULL);
+ GntMenuItem *check = gnt_menuitem_check_new(action->label);
+ gnt_menuitem_check_set_checked(GNT_MENUITEM_CHECK(check),
+ gaim_blist_node_get_bool((GaimBlistNode*)chat, "gnt-autojoin"));
+ gnt_menu_add_item(menu, check);
+ gnt_menuitem_set_callback(check, autojoin_toggled, action);
+ g_signal_connect_swapped(G_OBJECT(menu), "destroy",
G_CALLBACK(gaim_menu_action_free), action);
- add_custom_action(tree, _("Edit Settings"), (GaimCallback)chat_components_edit, chat);
-
- g_signal_connect(G_OBJECT(tree), "toggled", G_CALLBACK(context_menu_toggle), NULL);
+ add_custom_action(menu, _("Edit Settings"), (GaimCallback)chat_components_edit, chat);
}
static void
@@ -747,13 +760,13 @@
}
static void
-create_group_menu(GntTree *tree, GaimGroup *group)
+create_group_menu(GntMenu *menu, GaimGroup *group)
{
- add_custom_action(tree, _("Add Buddy"),
+ add_custom_action(menu, _("Add Buddy"),
GAIM_CALLBACK(gg_add_buddy), group);
- add_custom_action(tree, _("Add Chat"),
+ add_custom_action(menu, _("Add Chat"),
GAIM_CALLBACK(gg_add_chat), group);
- add_custom_action(tree, _("Add Group"),
+ add_custom_action(menu, _("Add Group"),
GAIM_CALLBACK(gg_add_group), group);
}
@@ -764,14 +777,14 @@
}
static void
-create_buddy_menu(GntTree *tree, GaimBuddy *buddy)
+create_buddy_menu(GntMenu *menu, GaimBuddy *buddy)
{
GaimPluginProtocolInfo *prpl_info;
prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(buddy->account->gc->prpl);
if (prpl_info && prpl_info->get_info)
{
- add_custom_action(tree, _("Get Info"),
+ add_custom_action(menu, _("Get Info"),
GAIM_CALLBACK(gg_blist_get_buddy_info_cb), buddy);
}
@@ -792,42 +805,23 @@
#endif
/* Protocol actions */
- append_proto_menu(tree,
+ append_proto_menu(menu,
gaim_account_get_connection(gaim_buddy_get_account(buddy)),
(GaimBlistNode*)buddy);
}
static void
-append_extended_menu(GntTree *tree, GaimBlistNode *node)
+append_extended_menu(GntMenu *menu, GaimBlistNode *node)
{
GList *iter;
for (iter = gaim_blist_node_get_extended_menu(node);
iter; iter = g_list_delete_link(iter, iter))
{
- gnt_append_menu_action(tree, iter->data, NULL);
+ gnt_append_menu_action(menu, iter->data, NULL);
}
}
-static void
-context_menu_callback(GntTree *tree, GGBlist *ggblist)
-{
- GaimMenuAction *action = gnt_tree_get_selection_data(tree);
- GaimBlistNode *node = ggblist->cnode;
-
- if (action)
- {
- void (*callback)(GaimBlistNode *, gpointer);
- callback = (void (*)(GaimBlistNode *, gpointer))action->callback;
- if (callback)
- callback(action->data, node);
- else
- return;
- }
-
- remove_context_menu(ggblist);
-}
-
/* Xerox'd from gtkdialogs.c:gaim_gtkdialogs_remove_contact_cb */
static void
remove_contact(GaimContact *contact)
@@ -1007,79 +1001,71 @@
}
static void
+context_menu_destroyed(GntWidget *widget, GGBlist *ggblist)
+{
+ ggblist->context = NULL;
+}
+
+static void
draw_context_menu(GGBlist *ggblist)
{
GaimBlistNode *node = NULL;
- GntWidget *context = NULL, *window = NULL;
+ GntWidget *context = NULL;
GntTree *tree = NULL;
int x, y, top, width;
char *title = NULL;
tree = GNT_TREE(ggblist->tree);
- if (ggblist->context)
- {
- remove_context_menu(ggblist);
- }
-
node = gnt_tree_get_selection_data(tree);
if (ggblist->tooltip)
remove_tooltip(ggblist);
ggblist->cnode = node;
- ggblist->context = context = gnt_tree_new();
- GNT_WIDGET_SET_FLAGS(context, GNT_WIDGET_NO_BORDER);
- gnt_widget_set_name(context, "context menu");
- g_signal_connect(G_OBJECT(context), "activate", G_CALLBACK(context_menu_callback), ggblist);
+ ggblist->context = context = gnt_menu_new(GNT_MENU_POPUP);
+ g_signal_connect(G_OBJECT(context), "destroy", G_CALLBACK(context_menu_destroyed), ggblist);
+
if (!node) {
- create_group_menu(GNT_TREE(context), NULL);
+ create_group_menu(GNT_MENU(context), NULL);
title = g_strdup(_("Buddy List"));
} else if (GAIM_BLIST_NODE_IS_CONTACT(node)) {
- create_buddy_menu(GNT_TREE(context),
+ create_buddy_menu(GNT_MENU(context),
gaim_contact_get_priority_buddy((GaimContact*)node));
title = g_strdup(gaim_contact_get_alias((GaimContact*)node));
} else if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
GaimBuddy *buddy = (GaimBuddy *)node;
- create_buddy_menu(GNT_TREE(context), buddy);
+ create_buddy_menu(GNT_MENU(context), buddy);
title = g_strdup(gaim_buddy_get_name(buddy));
} else if (GAIM_BLIST_NODE_IS_CHAT(node)) {
GaimChat *chat = (GaimChat*)node;
- create_chat_menu(GNT_TREE(context), chat);
+ create_chat_menu(GNT_MENU(context), chat);
title = g_strdup(gaim_chat_get_name(chat));
} else if (GAIM_BLIST_NODE_IS_GROUP(node)) {
GaimGroup *group = (GaimGroup *)node;
- create_group_menu(GNT_TREE(context), group);
+ create_group_menu(GNT_MENU(context), group);
title = g_strdup(group->name);
}
- append_extended_menu(GNT_TREE(context), node);
+ append_extended_menu(GNT_MENU(context), node);
/* These are common for everything */
if (node) {
- add_custom_action(GNT_TREE(context), _("Rename"),
+ add_custom_action(GNT_MENU(context), _("Rename"),
GAIM_CALLBACK(gg_blist_rename_node_cb), node);
- add_custom_action(GNT_TREE(context), _("Remove"),
+ add_custom_action(GNT_MENU(context), _("Remove"),
GAIM_CALLBACK(gg_blist_remove_node_cb), node);
if (ggblist->tagged && (GAIM_BLIST_NODE_IS_CONTACT(node)
|| GAIM_BLIST_NODE_IS_GROUP(node))) {
- add_custom_action(GNT_TREE(context), _("Place tagged"),
+ add_custom_action(GNT_MENU(context), _("Place tagged"),
GAIM_CALLBACK(gg_blist_place_tagged), node);
} else if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
- add_custom_action(GNT_TREE(context), _("Tag"),
+ add_custom_action(GNT_MENU(context), _("Tag"),
GAIM_CALLBACK(gg_blist_tag_buddy), node);
}
}
- window = gnt_vbox_new(FALSE);
- GNT_WIDGET_SET_FLAGS(window, GNT_WIDGET_TRANSIENT);
- gnt_box_set_toplevel(GNT_BOX(window), TRUE);
- gnt_box_set_title(GNT_BOX(window), title);
-
- gnt_widget_set_size(context, 0, g_list_length(GNT_TREE(context)->list));
- gnt_box_add_widget(GNT_BOX(window), context);
-
/* Set the position for the popup */
gnt_widget_get_position(GNT_WIDGET(tree), &x, &y);
gnt_widget_get_size(GNT_WIDGET(tree), &width, NULL);
@@ -1088,8 +1074,8 @@
x += width;
y += top - 1;
- gnt_widget_set_position(window, x, y);
- gnt_widget_draw(window);
+ gnt_widget_set_position(context, x, y);
+ gnt_screen_menu_show(GNT_MENU(context));
g_free(title);
}
@@ -1151,9 +1137,6 @@
if (!gnt_widget_has_focus(ggblist->tree))
return;
- if (ggblist->context)
- return;
-
if (ggblist->tooltip)
{
/* XXX: Once we can properly redraw on expose events, this can be removed at the end
@@ -1252,8 +1235,6 @@
static void
selection_changed(GntWidget *widget, gpointer old, gpointer current, GGBlist *ggblist)
{
- if (ggblist->context)
- remove_context_menu(ggblist);
draw_tooltip(ggblist);
}
@@ -1276,12 +1257,6 @@
ret = TRUE;
}
- if (ggblist->context)
- {
- ret = gnt_widget_key_pressed(ggblist->context, text);
- stop = TRUE;
- }
-
if (strcmp(text, GNT_KEY_CTRL_O) == 0)
{
gaim_prefs_set_bool(PREF_ROOT "/showoffline",
@@ -1336,7 +1311,7 @@
if (ggblist->tooltip)
remove_tooltip(ggblist);
else if (ggblist->context)
- remove_context_menu(ggblist);
+ gnt_widget_destroy(ggblist->context);
}
static void
Modified: trunk/console/libgnt/Makefile.am
===================================================================
--- trunk/console/libgnt/Makefile.am 2006-10-28 20:38:25 UTC (rev 17611)
+++ trunk/console/libgnt/Makefile.am 2006-10-28 22:14:52 UTC (rev 17612)
@@ -18,6 +18,7 @@
gntmarshal.c \
gntmenu.c \
gntmenuitem.c \
+ gntmenuitemcheck.c \
gntstyle.c \
gnttextview.c \
gnttree.c \
@@ -39,6 +40,7 @@
gntmarshal.h \
gntmenu.h \
gntmenuitem.h \
+ gntmenuitemcheck.h \
gntstyle.h \
gnttextview.h \
gnttree.h \
Modified: trunk/console/libgnt/gntmenu.c
===================================================================
--- trunk/console/libgnt/gntmenu.c 2006-10-28 20:38:25 UTC (rev 17611)
+++ trunk/console/libgnt/gntmenu.c 2006-10-28 22:14:52 UTC (rev 17612)
@@ -1,4 +1,5 @@
#include "gntmenu.h"
+#include "gntmenuitemcheck.h"
#include <string.h>
@@ -60,8 +61,14 @@
static void
menu_tree_add(GntMenu *menu, GntMenuItem *item, GntMenuItem *parent)
{
- gnt_tree_add_row_last(GNT_TREE(menu), item,
- gnt_tree_create_row(GNT_TREE(menu), item->text, item->submenu ? ">" : " "), parent);
+ if (GNT_IS_MENUITEM_CHECK(item)) {
+ gnt_tree_add_choice(GNT_TREE(menu), item,
+ gnt_tree_create_row(GNT_TREE(menu), item->text, " "), parent, NULL);
+ gnt_tree_set_choice(GNT_TREE(menu), item, gnt_menuitem_check_get_checked(GNT_MENUITEM_CHECK(item)));
+ } else
+ gnt_tree_add_row_last(GNT_TREE(menu), item,
+ gnt_tree_create_row(GNT_TREE(menu), item->text, item->submenu ? ">" : " "), parent);
+
if (0 && item->submenu) {
GntMenu *sub = GNT_MENU(item->submenu);
GList *iter;
@@ -126,8 +133,6 @@
int current = menu->selected;
if (menu->submenu) {
- /*if (gnt_widget_key_pressed(GNT_WIDGET(menu->submenu), text))*/
- /*return TRUE;*/
return (gnt_widget_key_pressed(GNT_WIDGET(menu->submenu), text));
}
@@ -178,6 +183,21 @@
}
static void
+gnt_menu_toggled(GntTree *tree, gpointer key)
+{
+ GntMenuItem *item = GNT_MENUITEM(key);
+ GntMenu *menu = GNT_MENU(tree);
+ gboolean check = gnt_menuitem_check_get_checked(GNT_MENUITEM_CHECK(item));
+ gnt_menuitem_check_set_checked(GNT_MENUITEM_CHECK(item), !check);
+ if (item->callback)
+ item->callback(item, item->callbackdata);
+ while (menu) {
+ gnt_widget_hide(GNT_WIDGET(menu));
+ menu = menu->parentmenu;
+ }
+}
+
+static void
gnt_menu_activate(GntWidget *widget)
{
GntMenu *menu = GNT_MENU(widget);
@@ -189,8 +209,12 @@
item = gnt_tree_get_selection_data(GNT_TREE(menu));
}
- if (item)
- menuitem_activate(menu, item);
+ if (item) {
+ if (GNT_MENUITEM_CHECK(item))
+ gnt_menu_toggled(GNT_TREE(widget), item);
+ else
+ menuitem_activate(menu, item);
+ }
}
static void
@@ -220,6 +244,8 @@
wid_class->activate = gnt_menu_activate;
wid_class->hide = gnt_menu_hide;
+ parent_class->toggled = gnt_menu_toggled;
+
GNTDEBUG;
}
Modified: trunk/console/libgnt/gntmenuitem.h
===================================================================
--- trunk/console/libgnt/gntmenuitem.h 2006-10-28 20:38:25 UTC (rev 17611)
+++ trunk/console/libgnt/gntmenuitem.h 2006-10-28 22:14:52 UTC (rev 17612)
@@ -19,6 +19,8 @@
typedef struct _GnMenuItemPriv GntMenuItemPriv;
typedef struct _GnMenuItemClass GntMenuItemClass;
+#include "gntmenu.h"
+
struct _GnMenuItemPriv
{
/* These will be used to determine the position of the submenu */
Added: trunk/console/libgnt/gntmenuitemcheck.c
===================================================================
--- trunk/console/libgnt/gntmenuitemcheck.c (rev 0)
+++ trunk/console/libgnt/gntmenuitemcheck.c 2006-10-28 22:14:52 UTC (rev 17612)
@@ -0,0 +1,67 @@
+#include "gntmenuitemcheck.h"
+
+static GntMenuItemClass *parent_class = NULL;
+
+static void
+gnt_menuitem_check_class_init(GntMenuItemCheckClass *klass)
+{
+ parent_class = GNT_MENUITEM_CLASS(klass);
+
+ GNTDEBUG;
+}
+
+static void
+gnt_menuitem_check_init(GTypeInstance *instance, gpointer class)
+{
+ GNTDEBUG;
+}
+
+/******************************************************************************
+ * GntMenuItemCheck API
+ *****************************************************************************/
+GType
+gnt_menuitem_check_get_gtype(void)
+{
+ static GType type = 0;
+
+ if(type == 0)
+ {
+ static const GTypeInfo info = {
+ sizeof(GntMenuItemCheckClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc)gnt_menuitem_check_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof(GntMenuItemCheck),
+ 0, /* n_preallocs */
+ gnt_menuitem_check_init, /* instance_init */
+ };
+
+ type = g_type_register_static(GNT_TYPE_MENUITEM,
+ "GntMenuItemCheck",
+ &info, 0);
+ }
+
+ return type;
+}
+
+GntMenuItem *gnt_menuitem_check_new(const char *text)
+{
+ GntMenuItem *item = g_object_new(GNT_TYPE_MENUITEM_CHECK, NULL);
+ GntMenuItem *menuitem = GNT_MENUITEM(item);
+
+ menuitem->text = g_strdup(text);
+ return item;
+}
+
+gboolean gnt_menuitem_check_get_checked(GntMenuItemCheck *item)
+{
+ return item->checked;
+}
+
+void gnt_menuitem_check_set_checked(GntMenuItemCheck *item, gboolean set)
+{
+ item->checked = set;
+}
+
Property changes on: trunk/console/libgnt/gntmenuitemcheck.c
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/console/libgnt/gntmenuitemcheck.h
===================================================================
--- trunk/console/libgnt/gntmenuitemcheck.h (rev 0)
+++ trunk/console/libgnt/gntmenuitemcheck.h 2006-10-28 22:14:52 UTC (rev 17612)
@@ -0,0 +1,52 @@
+#ifndef GNT_MENUITEM_CHECK_H
+#define GNT_MENUITEM_CHECK_H
+
+#include "gnt.h"
+#include "gntcolors.h"
+#include "gntkeys.h"
+#include "gntmenuitem.h"
+
+#define GNT_TYPE_MENUITEM_CHECK (gnt_menuitem_check_get_gtype())
+#define GNT_MENUITEM_CHECK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_MENUITEM_CHECK, GntMenuItemCheck))
+#define GNT_MENUITEM_CHECK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_MENUITEM_CHECK, GntMenuItemCheckClass))
+#define GNT_IS_MENUITEM_CHECK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_MENUITEM_CHECK))
+#define GNT_IS_MENUITEM_CHECK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_MENUITEM_CHECK))
+#define GNT_MENUITEM_CHECK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_MENUITEM_CHECK, GntMenuItemCheckClass))
+
+#define GNT_MENUITEM_CHECK_FLAGS(obj) (GNT_MENUITEM_CHECK(obj)->priv.flags)
+#define GNT_MENUITEM_CHECK_SET_FLAGS(obj, flags) (GNT_MENUITEM_CHECK_FLAGS(obj) |= flags)
+#define GNT_MENUITEM_CHECK_UNSET_FLAGS(obj, flags) (GNT_MENUITEM_CHECK_FLAGS(obj) &= ~(flags))
+
+typedef struct _GnMenuItemCheck GntMenuItemCheck;
+typedef struct _GnMenuItemCheckPriv GntMenuItemCheckPriv;
+typedef struct _GnMenuItemCheckClass GntMenuItemCheckClass;
+
+struct _GnMenuItemCheck
+{
+ GntMenuItem parent;
+ gboolean checked;
+};
+
+struct _GnMenuItemCheckClass
+{
+ GntMenuItemClass parent;
+
+ void (*gnt_reserved1)(void);
+ void (*gnt_reserved2)(void);
+ void (*gnt_reserved3)(void);
+ void (*gnt_reserved4)(void);
+};
+
+G_BEGIN_DECLS
+
+GType gnt_menuitem_check_get_gtype(void);
+
+GntMenuItem *gnt_menuitem_check_new(const char *text);
+
+gboolean gnt_menuitem_check_get_checked(GntMenuItemCheck *item);
+
+void gnt_menuitem_check_set_checked(GntMenuItemCheck *item, gboolean set);
+
+G_END_DECLS
+
+#endif /* GNT_MENUITEM_CHECK_H */
Property changes on: trunk/console/libgnt/gntmenuitemcheck.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/console/libgnt/gnttree.c
===================================================================
--- trunk/console/libgnt/gnttree.c 2006-10-28 20:38:25 UTC (rev 17611)
+++ trunk/console/libgnt/gnttree.c 2006-10-28 22:14:52 UTC (rev 17612)
@@ -691,7 +691,7 @@
g_signal_new("toggled",
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST,
- 0,
+ G_STRUCT_OFFSET(GntTreeClass, toggled),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
Modified: trunk/console/libgnt/gnttree.h
===================================================================
--- trunk/console/libgnt/gnttree.h 2006-10-28 20:38:25 UTC (rev 17611)
+++ trunk/console/libgnt/gnttree.h 2006-10-28 22:14:52 UTC (rev 17612)
@@ -56,6 +56,7 @@
GntWidgetClass parent;
void (*selection_changed)(GntTreeRow *old, GntTreeRow * current);
+ void (*toggled)(GntTree *tree, gpointer key);
void (*gnt_reserved1)(void);
void (*gnt_reserved2)(void);
Modified: trunk/console/plugins/gntgf.c
===================================================================
--- trunk/console/plugins/gntgf.c 2006-10-28 20:38:25 UTC (rev 17611)
+++ trunk/console/plugins/gntgf.c 2006-10-28 22:14:52 UTC (rev 17612)
@@ -354,8 +354,8 @@
"gntgf",
N_("GntGf"),
VERSION,
- N_("Toaster plugin for GntGaim."),
- N_("Toaster plugin for GntGaim."),
+ N_("Toaster plugin for Gaim-Text."),
+ N_("Toaster plugin for Gaim-Text."),
"Sadrul H Chowdhury <sa...@us...>",
"http://gaim.sourceforge.net",
plugin_load,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-10-28 20:38:39
|
Revision: 17611
http://svn.sourceforge.net/gaim/?rev=17611&view=rev
Author: thekingant
Date: 2006-10-28 13:38:25 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
sf patch #1582046, from Henning Noren
"This patch removes a unused array and makes some other
static const. These small changes moves 14 memory pages
from private to shared on my system."
Modified Paths:
--------------
trunk/libgaim/protocols/yahoo/util.c
trunk/libgaim/protocols/yahoo/yahoo.c
trunk/libgaim/protocols/yahoo/yahoo_auth.c
trunk/libgaim/protocols/yahoo/yahoo_doodle.c
Modified: trunk/libgaim/protocols/yahoo/util.c
===================================================================
--- trunk/libgaim/protocols/yahoo/util.c 2006-10-28 20:11:46 UTC (rev 17610)
+++ trunk/libgaim/protocols/yahoo/util.c 2006-10-28 20:38:25 UTC (rev 17611)
@@ -342,7 +342,7 @@
/* borrowed from gtkimhtml */
#define MAX_FONT_SIZE 7
#define POINT_SIZE(x) (_point_sizes [MIN ((x > 0 ? x : 1), MAX_FONT_SIZE) - 1])
-static gint _point_sizes [] = { 8, 10, 12, 14, 20, 30, 40 };
+static const gint _point_sizes [] = { 8, 10, 12, 14, 20, 30, 40 };
enum fatype { size, color, face, junk };
typedef struct {
Modified: trunk/libgaim/protocols/yahoo/yahoo.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo.c 2006-10-28 20:11:46 UTC (rev 17610)
+++ trunk/libgaim/protocols/yahoo/yahoo.c 2006-10-28 20:38:25 UTC (rev 17611)
@@ -1170,7 +1170,7 @@
}
}
/* This is the y64 alphabet... it's like base64, but has a . and a _ */
-char base64digits[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._";
+static const char base64digits[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._";
/* This is taken from Sylpheed by Hiroyuki Yamamoto. We have our own tobase64 function
* in util.c, but it has a bug I don't feel like finding right now ;) */
Modified: trunk/libgaim/protocols/yahoo/yahoo_auth.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo_auth.c 2006-10-28 20:11:46 UTC (rev 17610)
+++ trunk/libgaim/protocols/yahoo/yahoo_auth.c 2006-10-28 20:38:25 UTC (rev 17611)
@@ -13,7 +13,7 @@
/*************
* Ugliness *
*************/
-auth_function_t main_function_list[5][96] = {
+static const auth_function_t main_function_list[5][96] = {
{
{ 0, 0x0, 0x0 },
{ 0, 0x0, 0x0 },
@@ -506,7 +506,7 @@
}
};
-struct buffer_t type_three_list[NUM_TYPE_THREES]={
+static const struct buffer_t type_three_list[NUM_TYPE_THREES]={
{ 0x538920, "\x7a\x61\x31\x57\x9\xbc\x11\x8d\x6a\x12\x3a\x4d\x76\xbf\x19\x86\x2c\xc8\x69\x60\x84\x1\xc9\x21\xb1\xa6\xf\x99\xcd\xa0\x71\x8b\x5f\xb2\xd2\x53\xed\xf9\x55\xa\x50\x14\x15\xad\x88\x52\x5d\xbb\xe\xe5\xd\x56\x3e\x9b\xc7\x17\x9a\x97\x92\x23\x0\x37\xaa\x27\xf6\xb6\x33\xb5\xc5\xd1\x38\x1b\x85\x42\x13\xe1\x64\x1d\x4c\x87\x9f\x3c\x40\xdf\x7b\xd5\xae\xc6\x7c\xec\xd7\x49\x35\x2f\x2b\x9d\x32\xbd\x93\x45\x73\x91\x34\xd4\x39\x1e\x96\x65\xeb\x82\x5a\xf3\xd8\xf1\x41\xce\x9c\xe6\x90\x7d\x6b\x29\x6\xc1\x3d\x4e\xe3\xdb\x48\x6c\x62\x72\x7f\xfe\xdd\xcf\xa1\x24\x4f\xc0\xd0\x3f\x2d\x5c\x78\x6f\x3b\x10\xef\xba\xb\x25\xd6\x1f\x58\x8c\xf8\xcc\xc2\x5\xb3\xfa\xa4\xac\x6e\xf5\x18\x2a\x26\x5e\xf4\x79\xb8\xc3\x16\xe2\xf2\x83\x30\x59\xda\xe9\x36\x7\x46\xa9\xde\x77\xd3\xa3\x98\x8\x1c\xe7\xee\x51\xe8\xfb\x2\xc4\xfd\xff\x22\xaf\x7e\xcb\x68\xc\x28\xe4\x63\xca\x70\x75\xb0\x74\xa7\xea\x20\x4\x4b\xa5\xb7\xf7\xfc\x4a\x47\xf0\xa8\x81\xbe\xe0\x66\x8e\x44\x54\x6d\x80\xb9\x95\x2e\xab\x8a\x1a\x94\xdc\x89\xb4\x5b\x9e\xd9\x8f\xa2\x43\x67\x3" },
{ 0x538a20, "\x28\xeb\x74\xef\xb7\x73\x79\xd1\x46\xcc\xfb\x3b\x91\xc2\x16\xcb\x93\xaf\x51\x88\xb0\x5d\xfa\xfc\xc\xf\xc8\x4a\x53\x17\x8e\xec\x81\x36\xc6\xdc\xbc\x89\xa\x1f\x78\xdd\x76\x6c\x85\xd2\x13\xb9\x3a\x97\xde\x86\x3e\x12\xbe\x68\x23\x6a\x58\xce\xea\xe3\xa8\x5a\x8c\x3\x8a\x9d\xfe\xf3\x47\x63\xdf\x44\xaa\xd9\x24\xf0\x5b\xe2\x9c\xd3\xa9\x2e\xfd\x8b\xbd\xa4\x7a\x42\x5f\x4d\xa2\x48\x83\xcd\xe\x27\x61\xcf\xd\x50\x6f\x49\xae\xc7\x2f\x31\x39\x8f\x11\xdb\xad\x6b\x7f\xb6\x55\x62\x4c\x66\xc4\x75\xf6\x1b\xc1\xf1\x90\x95\x65\x9\xe0\xb4\xbf\xf4\x35\x37\x1c\x67\xe8\xf9\xe6\x56\x99\x22\xc0\xe9\x92\x21\xe1\x7d\x6e\x34\xd4\x8d\x96\x20\x52\xd0\x69\x2d\xf8\x7e\x4f\xb\xac\x71\xa3\xe5\x2a\xa5\xc5\x18\x5e\x6\xca\x2\x4b\x26\xf5\xab\x9f\xe7\x15\x3d\xd6\x4\x8\xee\xbb\x57\x0\x40\xd5\xa7\x1d\x45\xa6\x2c\xff\x9a\x32\x84\x1a\x14\xf7\x80\xd8\x43\x72\x7\x98\x38\x87\x33\xb1\x29\xb3\x7c\x30\xba\x94\xc9\x64\xe4\x1\x77\x3c\x2b\x82\x54\x6d\x9e\xf2\x3f\xed\xc3\x4e\x5c\x60\x70\x19\xa0\xb8\xda\x5\xb2\x10\x7b\x25\xb5\x9b\x59\x41\x1e\xa1\xd7" },
{ 0x539320, "\x9c\x3b\xec\x3e\x7b\x79\x6f\x88\x42\xe6\xe1\x9b\xa3\xd\x83\x86\x7a\xfc\xc5\xb3\xdb\x7c\xf6\xa\xb7\xe7\x3c\x53\x28\x65\xf2\xa9\x6a\xf4\xef\x2c\x3d\xf8\xed\x6\xaf\x31\x75\xab\xf3\x73\xee\x20\x95\x1b\xe\x19\xa8\x5b\xa5\x66\x74\x85\x11\x60\x1e\x2a\x6c\x48\x50\x2f\x9a\x2e\x55\xaa\xcb\x64\x40\x4c\x25\xe9\xd0\xfd\x2d\x46\x8b\x81\x8d\xd2\x32\x4a\xc6\x7\xd6\xbf\xfb\x98\xd4\x76\x7e\xc\xfa\xde\x14\xa6\xd5\xe2\x90\xd1\xeb\xd3\x58\xbb\x5f\x94\xf7\x78\x54\x27\x52\xb6\x22\xea\x8c\xc8\x7d\x87\x12\x9d\xa1\x63\x38\xd8\x35\x2b\xc9\x56\x10\x9f\x1a\x2\xbe\xf1\x59\x17\x9e\xac\x5a\xb8\x1\xb5\x30\xad\xff\xe0\x49\xe8\x23\x4e\x6b\x16\xdc\x4f\x89\x68\x43\xc1\x99\x4\xa7\x33\x92\x84\xa4\x26\x34\x41\x1d\xb2\x91\x61\xc2\x51\x8f\x36\xfe\x5\xa2\xf9\xb\x13\x71\x82\x6e\x5d\xb4\xdf\xdd\x7f\xa0\xcd\x44\xc7\x70\x4d\xf0\x1c\x4b\x45\x57\x37\x3a\xcc\xf5\x8a\xd9\xe4\xbc\x15\xc3\x62\xc4\x39\x72\x47\x97\xbd\x8\xe5\x67\x18\xb1\x77\x8e\x1f\x9\xba\xf\xd7\xb0\x24\xce\xda\x0\x96\xca\x69\x3\x6d\x93\xae\xe3\x3f\x5c\xcf\xc0\xb9\x29\x80\x21\x5e" },
@@ -614,7 +614,7 @@
{ 0x546398, "\x2f\x62\x9b\xe4\xee\xdb\x3f\x8d\xd3\xd7\x9c\x32\xd6\x4a\xca\x50\xe1\x8e\x6e\xf9\x99\xc5\x4e\xdf\x46\x5d\xd5\xb7\x6d\xb1\xb9\x7e\xf\xad\x44\x96\x13\x6c\x97\x26\xa8\x9f\x85\xde\xed\x56\xce\xda\xb0\xb\x1c\xb8\x3d\x5a\x1f\xdd\x84\xf3\xcd\x9e\x73\x28\x61\x8c\xbb\x69\x64\x4f\x0\x49\x3c\x75\xc3\x29\x8a\xe2\x4d\xc7\xcb\x10\xd\xe9\x7f\xc4\x60\x1b\x5f\xd1\x45\x42\x93\x59\xe8\x74\xff\x7a\x72\xea\xd4\xa\x3e\x7d\xc1\x31\xa4\x66\x92\xfd\xf6\x6b\x3b\xba\xbc\x19\x6a\x54\x4b\x38\x47\x43\x33\x91\x8b\xe\xae\x4\x76\x4c\xab\xc6\xbe\x36\xd0\xa0\x67\x90\x87\xf5\x9a\x77\xe6\xcf\xb2\x12\x22\x8\x37\x30\xaf\x16\x3\x58\xf1\xaa\x1e\x25\xeb\xf4\x21\xa9\xfe\x27\x83\xdc\x6\x2a\x48\x78\x68\xb4\xa7\x79\x9\x80\x81\xc8\x52\x17\xcc\x2d\x15\x94\x8f\xa1\x14\x98\xe7\xd9\x7b\xb6\x82\x5\xbf\x39\x88\xac\x86\xa2\xf8\xef\x23\x2e\x95\xd2\xa6\xf2\x2c\x3a\x2b\x65\x55\x18\xc9\x35\x57\x24\xd8\xec\xf7\xf0\xb3\x5b\x6f\xfb\x20\xbd\x5c\xfa\x71\x63\xc0\x1d\xe0\x53\x2\xa5\x7c\x51\x11\xb5\xfc\x1a\x5e\x9d\x40\x34\x1\x7\x89\xa3\xc\x70\xe5\xe3\x41\xc2" },
};
-struct buffer_t type_four_list[NUM_TYPE_FOURS]={
+static const struct buffer_t type_four_list[NUM_TYPE_FOURS]={
{ 0x55f320, "\x39\x25\x29\x3c\x2b\x3a\x32\x23\x26\x24\x2d\x3d\x35\x2e\x3b\x38\x20\x27\x28\x22\x33\x3f\x2c\x3e\x36\x2a\x30\x2f\x21\x34\x31\x37\x00" },
{ 0x55f340, "\x5f\x4b\x40\x5e\x43\x4e\x55\x41\x5a\x57\x5d\x5b\x51\x4f\x4a\x52\x53\x58\x42\x44\x49\x46\x4d\x47\x48\x45\x50\x59\x4c\x54\x56\x5c\x00" },
{ 0x55f360, "\x7a\x7c\x6f\x6c\x60\x62\x73\x69\x71\x65\x6d\x72\x78\x6b\x64\x70\x74\x7b\x7e\x76\x67\x68\x63\x77\x79\x7f\x61\x6e\x75\x66\x6a\x7d\x00" },
@@ -663,7 +663,7 @@
{ 0x55f380, "\x98\x88\x94\x97\x83\x90\x99\x84\x8d\x9c\x86\x9d\x9e\x92\x91\x8b\x8f\x82\x8e\x9b\x93\x85\x87\x96\x95\x8a\x8c\x9a\x80\x81\x9f\x89\x00" }
};
-struct buffer_t type_five_list[NUM_TYPE_FIVES]={
+static const struct buffer_t type_five_list[NUM_TYPE_FIVES]={
{ 0x55f3f8, "\xef\xe7\xf6\xfd\xeb\xf4\xec\xe2\xf7\xf9\xea\xe4\xf8\xff\xf5\xfa\xe8\xee\xfc\xe9\xe5\xfb\xe6\xe0\xfe\xed\xf2\xe1\xf1\xf0\xe3\xf3\x00" },
{ 0x562948, "\x47\x41\x56\x59\x45\x40\x58\x48\x49\x57\x55\x54\x5a\x4c\x4f\x4d\x51\x5c\x53\x4a\x52\x5d\x5f\x5e\x50\x43\x42\x5b\x44\x46\x4b\x4e\x00" },
{ 0x561258, "\x5b\x49\x5f\x43\x57\x4c\x54\x59\x5c\x5a\x51\x52\x5d\x4a\x5e\x47\x44\x56\x55\x4d\x40\x50\x58\x48\x46\x45\x4f\x41\x4b\x4e\x53\x42\x00" },
@@ -727,7 +727,7 @@
hash *= 0x9e3779b1;
if (outer_loop > 1) {
- auth_function_t *ft;
+ const auth_function_t *ft;
int remainder;
@@ -874,7 +874,7 @@
unsigned int yahoo_auth_finalCountdown(unsigned int challenge, int divisor, int inner_loop, int outer_loop)
{
- auth_function_t *ft;
+ const auth_function_t *ft;
int remainder = challenge % divisor;
Modified: trunk/libgaim/protocols/yahoo/yahoo_doodle.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo_doodle.c 2006-10-28 20:11:46 UTC (rev 17610)
+++ trunk/libgaim/protocols/yahoo/yahoo_doodle.c 2006-10-28 20:38:25 UTC (rev 17611)
@@ -56,6 +56,7 @@
/******************************************************************************
* Globals
*****************************************************************************/
+#if 0
const int DefaultColorRGB24[] =
{
DOODLE_COLOR_RED,
@@ -72,6 +73,7 @@
DOODLE_COLOR_GREY,
DOODLE_COLOR_WHITE
};
+#endif
/******************************************************************************
* Functions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-10-28 20:13:41
|
Revision: 17610
http://svn.sourceforge.net/gaim/?rev=17610&view=rev
Author: thekingant
Date: 2006-10-28 13:11:46 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
I agree with Kevin, I think "Status / Idle" is better than "State / Idle."
But for the record I prefer "Away / Idle." I think people will be looking
for away-related preferences more than anything else, and "status" is one
of those words that I would glance at and assume it wasn't what I wanted.
Modified Paths:
--------------
trunk/gtk/gtkprefs.c
Modified: trunk/gtk/gtkprefs.c
===================================================================
--- trunk/gtk/gtkprefs.c 2006-10-28 20:10:08 UTC (rev 17609)
+++ trunk/gtk/gtkprefs.c 2006-10-28 20:11:46 UTC (rev 17610)
@@ -1897,7 +1897,7 @@
}
#endif
prefs_notebook_add_page(_("Logging"), NULL, logging_page(), &p, NULL, notebook_page++);
- prefs_notebook_add_page(_("State / Idle"), NULL, away_page(), &p, NULL, notebook_page++);
+ prefs_notebook_add_page(_("Status / Idle"), NULL, away_page(), &p, NULL, notebook_page++);
}
void gaim_gtk_prefs_show(void)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-10-28 20:10:44
|
Revision: 17609
http://svn.sourceforge.net/gaim/?rev=17609&view=rev
Author: thekingant
Date: 2006-10-28 13:10:08 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
I guess it's just the Max Headroom in me.
Modified Paths:
--------------
trunk/ChangeLog.API
Modified: trunk/ChangeLog.API
===================================================================
--- trunk/ChangeLog.API 2006-10-28 20:06:33 UTC (rev 17608)
+++ trunk/ChangeLog.API 2006-10-28 20:10:08 UTC (rev 17609)
@@ -119,8 +119,8 @@
* gaim_proxy_connect(): changed to return NULL on error and a pointer
to a GaimProxyConnectInfo object which can be used to cancel
connection attempts using gaim_proxy_connect_cancel(). Also added
- a 'handle' parameter that can be used to cancel to cancel the
- connection attempt using gaim_proxy_connect_cancel_with_handle().
+ a 'handle' parameter that can be used to cancel the connection
+ attempt using gaim_proxy_connect_cancel_with_handle().
* gaim_gethostbyname_async(): Renamed to gaim_dnsquery_a() and
changed to return a pointer to a data structure that can be
used to cancel the pending DNS query using gaim_dnsquery_destroy()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-28 20:08:08
|
Revision: 17608
http://svn.sourceforge.net/gaim/?rev=17608&view=rev
Author: sadrul
Date: 2006-10-28 13:06:33 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
More compile warning fixes
Modified Paths:
--------------
trunk/console/libgnt/gntstyle.c
trunk/console/libgnt/wms/s.c
Modified: trunk/console/libgnt/gntstyle.c
===================================================================
--- trunk/console/libgnt/gntstyle.c 2006-10-28 20:05:27 UTC (rev 17607)
+++ trunk/console/libgnt/gntstyle.c 2006-10-28 20:06:33 UTC (rev 17608)
@@ -171,7 +171,7 @@
if (g_key_file_has_group(gkfile, name))
{
- unsigned int len = 0;
+ gsize len = 0;
char **keys;
keys = g_key_file_get_keys(gkfile, name, &len, &error);
@@ -225,7 +225,7 @@
if (g_key_file_has_group(gkfile, name))
{
- unsigned int len = 0;
+ gsize len = 0;
char **keys;
keys = g_key_file_get_keys(gkfile, name, &len, &error);
@@ -304,8 +304,8 @@
void gnt_style_read_configure_file(const char *filename)
{
#if GLIB_CHECK_VERSION(2,6,0)
+ GError *error = NULL;
gkfile = g_key_file_new();
- GError *error = NULL;
if (!g_key_file_load_from_file(gkfile, filename, G_KEY_FILE_NONE, &error))
{
Modified: trunk/console/libgnt/wms/s.c
===================================================================
--- trunk/console/libgnt/wms/s.c 2006-10-28 20:05:27 UTC (rev 17607)
+++ trunk/console/libgnt/wms/s.c 2006-10-28 20:06:33 UTC (rev 17608)
@@ -169,6 +169,7 @@
envelope_normal_window(window);
}
+void gntwm_init(GntWM *wm);
void gntwm_init(GntWM *wm)
{
gwm = wm;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-10-28 20:06:52
|
Revision: 17607
http://svn.sourceforge.net/gaim/?rev=17607&view=rev
Author: thekingant
Date: 2006-10-28 13:05:27 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
I don't believe this check is needed
Modified Paths:
--------------
trunk/libgaim/connection.c
Modified: trunk/libgaim/connection.c
===================================================================
--- trunk/libgaim/connection.c 2006-10-28 20:04:03 UTC (rev 17606)
+++ trunk/libgaim/connection.c 2006-10-28 20:05:27 UTC (rev 17607)
@@ -31,6 +31,7 @@
#include "log.h"
#include "notify.h"
#include "prefs.h"
+#include "proxy.h"
#include "request.h"
#include "server.h"
#include "signals.h"
@@ -188,13 +189,11 @@
update_keepalive(gc, FALSE);
- if (gc->prpl != NULL)
- {
- prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
+ gaim_proxy_connect_cancel_with_handle(gc);
- if (prpl_info->close)
- (prpl_info->close)(gc);
- }
+ prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
+ if (prpl_info->close)
+ (prpl_info->close)(gc);
/* Clear out the proto data that was freed in the prpl close method*/
buddies = gaim_find_buddies(account, NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-10-28 20:05:04
|
Revision: 17606
http://svn.sourceforge.net/gaim/?rev=17606&view=rev
Author: thekingant
Date: 2006-10-28 13:04:03 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
Add a "handle" parameter to gaim_proxy_connect(). It seemed like
people thought this was a good idea. You can still cancel
each gaim_proxy_connect() individually, if needed. I passed in
NULL for the handle in most places. It might be better to pass
in the gc in more places, but these changes do no harm, and they
should help some Yahoo! things, and I wanted to get the API change in.
Modified Paths:
--------------
trunk/ChangeLog.API
trunk/libgaim/ft.c
trunk/libgaim/protocols/irc/irc.c
trunk/libgaim/protocols/irc/irc.h
trunk/libgaim/protocols/jabber/jabber.c
trunk/libgaim/protocols/jabber/jabber.h
trunk/libgaim/protocols/jabber/si.c
trunk/libgaim/protocols/msn/directconn.c
trunk/libgaim/protocols/msn/httpconn.c
trunk/libgaim/protocols/msn/servconn.c
trunk/libgaim/protocols/oscar/oscar.c
trunk/libgaim/protocols/oscar/peer.c
trunk/libgaim/protocols/qq/qq_proxy.c
trunk/libgaim/protocols/sametime/sametime.c
trunk/libgaim/protocols/silc/silc.c
trunk/libgaim/protocols/silc/silcgaim.h
trunk/libgaim/protocols/simple/simple.c
trunk/libgaim/protocols/toc/toc.c
trunk/libgaim/protocols/yahoo/yahoo.c
trunk/libgaim/protocols/yahoo/yahoo_filexfer.c
trunk/libgaim/protocols/yahoo/yahoo_picture.c
trunk/libgaim/protocols/yahoo/yahoochat.c
trunk/libgaim/protocols/yahoo/ycht.c
trunk/libgaim/proxy.c
trunk/libgaim/proxy.h
trunk/libgaim/sslconn.c
trunk/libgaim/upnp.c
trunk/libgaim/util.c
Modified: trunk/ChangeLog.API
===================================================================
--- trunk/ChangeLog.API 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/ChangeLog.API 2006-10-28 20:04:03 UTC (rev 17606)
@@ -118,7 +118,9 @@
gaim_proxy_connect() and gaim_network_listen*().
* gaim_proxy_connect(): changed to return NULL on error and a pointer
to a GaimProxyConnectInfo object which can be used to cancel
- connection attempts using gaim_proxy_connect_cancel().
+ connection attempts using gaim_proxy_connect_cancel(). Also added
+ a 'handle' parameter that can be used to cancel to cancel the
+ connection attempt using gaim_proxy_connect_cancel_with_handle().
* gaim_gethostbyname_async(): Renamed to gaim_dnsquery_a() and
changed to return a pointer to a data structure that can be
used to cancel the pending DNS query using gaim_dnsquery_destroy()
@@ -321,6 +323,8 @@
call to gaim_network_listen() or gaim_network_listen_range()
* gaim_proxy_connect_cancel(): Can be used to cancel a pending
gaim_proxy_connect() request
+ * gaim_proxy_connect_cancel_with_handle(): Can be used to cancel
+ a previous gaim_proxy_connect() request using a specified handle
* gaim_dnsquery_destroy(): Can be used to cancel a pending DNS
query.
* gaim_util_fetch_url_cancel(): Can be used to cancel a pending
Modified: trunk/libgaim/ft.c
===================================================================
--- trunk/libgaim/ft.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/ft.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -945,7 +945,7 @@
xfer->remote_port = port;
/* Establish a file descriptor. */
- gaim_proxy_connect(xfer->account, xfer->remote_ip,
+ gaim_proxy_connect(NULL, xfer->account, xfer->remote_ip,
xfer->remote_port, connect_cb, xfer);
return;
Modified: trunk/libgaim/protocols/irc/irc.c
===================================================================
--- trunk/libgaim/protocols/irc/irc.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/irc/irc.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -341,11 +341,10 @@
if (!irc->gsc) {
- irc->connect_data = gaim_proxy_connect(account, irc->server,
+ if (gaim_proxy_connect(gc, account, irc->server,
gaim_account_get_int(account, "port", IRC_DEFAULT_PORT),
- irc_login_cb, gc);
-
- if (!irc->connect_data || !gaim_account_get_connection(account)) {
+ irc_login_cb, gc) == NULL)
+ {
gaim_connection_error(gc, _("Couldn't create socket"));
return;
}
@@ -409,8 +408,6 @@
GaimConnection *gc = data;
struct irc_conn *irc = gc->proto_data;
- irc->connect_data = NULL;
-
if (source < 0) {
gaim_connection_error(gc, _("Couldn't connect to host"));
return;
@@ -452,9 +449,6 @@
if (irc->gsc || (irc->fd >= 0))
irc_cmd_quit(irc, "quit", NULL, NULL);
- if (irc->connect_data)
- gaim_proxy_connect_cancel(irc->connect_data);
-
if (gc->inpa)
gaim_input_remove(gc->inpa);
Modified: trunk/libgaim/protocols/irc/irc.h
===================================================================
--- trunk/libgaim/protocols/irc/irc.h 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/irc/irc.h 2006-10-28 20:04:03 UTC (rev 17606)
@@ -54,8 +54,6 @@
guint timer;
GHashTable *buddies;
- GaimProxyConnectData *connect_data;
-
char *inbuf;
int inbuflen;
int inbufused;
Modified: trunk/libgaim/protocols/jabber/jabber.c
===================================================================
--- trunk/libgaim/protocols/jabber/jabber.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/jabber/jabber.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -445,8 +445,6 @@
GaimConnection *gc = data;
JabberStream *js = gc->proto_data;
- js->connect_data = NULL;
-
if (source < 0) {
gaim_connection_error(gc, _("Couldn't connect to host"));
return;
@@ -490,10 +488,8 @@
static void jabber_login_connect(JabberStream *js, const char *server, int port)
{
- js->connect_data = gaim_proxy_connect(js->gc->account, server,
- port, jabber_login_callback, js->gc);
-
- if (js->connect_data == NULL)
+ if (gaim_proxy_connect(js->gc, js->gc->account, server,
+ port, jabber_login_callback, js->gc) == NULL)
gaim_connection_error(js->gc, _("Unable to create socket"));
}
@@ -922,11 +918,9 @@
}
if(!js->gsc) {
- js->connect_data = gaim_proxy_connect(account, server,
+ if (gaim_proxy_connect(gc, account, server,
gaim_account_get_int(account, "port", 5222),
- jabber_login_callback, gc);
-
- if (js->connect_data == NULL)
+ jabber_login_callback, gc) == NULL)
gaim_connection_error(gc, _("Unable to create socket"));
}
}
@@ -945,9 +939,6 @@
if (js->srv_query_data)
gaim_srv_cancel(js->srv_query_data);
- if (js->connect_data)
- gaim_proxy_connect_cancel(js->connect_data);
-
if(js->gsc) {
#ifdef HAVE_OPENSSL
if (!gc->disconnect_timeout)
Modified: trunk/libgaim/protocols/jabber/jabber.h
===================================================================
--- trunk/libgaim/protocols/jabber/jabber.h 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/jabber/jabber.h 2006-10-28 20:04:03 UTC (rev 17606)
@@ -67,7 +67,6 @@
int fd;
GaimSrvQueryData *srv_query_data;
- GaimProxyConnectData *connect_data;
xmlParserCtxt *context;
xmlnode *current;
Modified: trunk/libgaim/protocols/jabber/si.c
===================================================================
--- trunk/libgaim/protocols/jabber/si.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/jabber/si.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -177,7 +177,8 @@
for(i=0; i<20; i++, p+=2)
snprintf(p, 3, "%02x", hashval[i]);
- jsx->connect_data = gaim_proxy_connect_socks5(jsx->gpi, dstaddr, 0,
+ jsx->connect_data = gaim_proxy_connect_socks5(NULL, jsx->gpi,
+ dstaddr, 0,
jabber_si_bytestreams_connect_cb, xfer);
g_free(dstaddr);
Modified: trunk/libgaim/protocols/msn/directconn.c
===================================================================
--- trunk/libgaim/protocols/msn/directconn.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/msn/directconn.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -423,8 +423,8 @@
}
#endif
- directconn->connect_data = gaim_proxy_connect(session->account, host, port,
- connect_cb, directconn);
+ directconn->connect_data = gaim_proxy_connect(NULL, session->account,
+ host, port, connect_cb, directconn);
if (directconn->connect_data != NULL)
{
Modified: trunk/libgaim/protocols/msn/httpconn.c
===================================================================
--- trunk/libgaim/protocols/msn/httpconn.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/msn/httpconn.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -727,7 +727,7 @@
if (httpconn->connected)
msn_httpconn_disconnect(httpconn);
- httpconn->connect_data = gaim_proxy_connect(httpconn->session->account,
+ httpconn->connect_data = gaim_proxy_connect(NULL, httpconn->session->account,
"gateway.messenger.hotmail.com", 80, connect_cb, httpconn);
if (httpconn->connect_data != NULL)
Modified: trunk/libgaim/protocols/msn/servconn.c
===================================================================
--- trunk/libgaim/protocols/msn/servconn.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/msn/servconn.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -213,9 +213,7 @@
if (servconn->connected)
msn_servconn_disconnect(servconn);
- if (servconn->host != NULL)
- g_free(servconn->host);
-
+ g_free(servconn->host);
servconn->host = g_strdup(host);
if (session->http_method)
@@ -235,8 +233,8 @@
return TRUE;
}
- servconn->connect_data = gaim_proxy_connect(session->account, host, port,
- connect_cb, servconn);
+ servconn->connect_data = gaim_proxy_connect(NULL, session->account,
+ host, port, connect_cb, servconn);
if (servconn->connect_data != NULL)
{
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -1211,7 +1211,7 @@
gaim_prefs_connect_callback(gc, "/plugins/prpl/oscar/recent_buddies", recent_buddies_cb, gc);
newconn = flap_connection_new(od, SNAC_FAMILY_AUTH);
- newconn->connect_data = gaim_proxy_connect(account,
+ newconn->connect_data = gaim_proxy_connect(NULL, account,
gaim_account_get_string(account, "server", OSCAR_DEFAULT_LOGIN_SERVER),
gaim_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT),
connection_established_cb, newconn);
@@ -1333,7 +1333,7 @@
newconn = flap_connection_new(od, SNAC_FAMILY_LOCATE);
newconn->cookielen = info->cookielen;
newconn->cookie = g_memdup(info->cookie, info->cookielen);
- newconn->connect_data = gaim_proxy_connect(account, host, port,
+ newconn->connect_data = gaim_proxy_connect(NULL, account, host, port,
connection_established_cb, newconn);
g_free(host);
if (newconn->connect_data == NULL)
@@ -1546,7 +1546,7 @@
pos->modname = g_strdup(modname);
/* TODO: Keep track of this return value. */
- if (gaim_proxy_connect(pos->gc->account, "gaim.sourceforge.net", 80,
+ if (gaim_proxy_connect(NULL, pos->gc->account, "gaim.sourceforge.net", 80,
straight_to_hell, pos) == NULL)
{
char buf[256];
@@ -1632,13 +1632,13 @@
gaim_debug_info("oscar", "Connecting to chat room %s exchange %hu\n", cc->name, cc->exchange);
}
- newconn->connect_data = gaim_proxy_connect(account, host, port,
+ newconn->connect_data = gaim_proxy_connect(NULL, account, host, port,
connection_established_cb, newconn);
if (newconn->connect_data == NULL)
{
flap_connection_schedule_destroy(newconn,
OSCAR_DISCONNECT_COULD_NOT_CONNECT,
- _("gaim_proxy_connect() failed"));
+ _("Unable to initialize connection"));
gaim_debug_error("oscar", "Unable to connect to FLAP server "
"of type 0x%04hx\n", redir->group);
}
Modified: trunk/libgaim/protocols/oscar/peer.c
===================================================================
--- trunk/libgaim/protocols/oscar/peer.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/oscar/peer.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -708,7 +708,7 @@
g_free(tmp);
}
- conn->connect_data = gaim_proxy_connect(account,
+ conn->connect_data = gaim_proxy_connect(NULL, account,
conn->verifiedip, conn->port,
peer_connection_established_cb, conn);
if (conn->connect_data != NULL)
@@ -743,7 +743,7 @@
g_free(tmp);
}
- conn->connect_data = gaim_proxy_connect(account,
+ conn->connect_data = gaim_proxy_connect(NULL, account,
conn->clientip, conn->port,
peer_connection_established_cb, conn);
if (conn->connect_data != NULL)
@@ -807,7 +807,7 @@
g_free(tmp);
}
- conn->connect_data = gaim_proxy_connect(account,
+ conn->connect_data = gaim_proxy_connect(NULL, account,
(conn->proxyip != NULL) ? conn->proxyip : PEER_PROXY_SERVER,
PEER_PROXY_PORT,
peer_proxy_connection_established_cb, conn);
Modified: trunk/libgaim/protocols/qq/qq_proxy.c
===================================================================
--- trunk/libgaim/protocols/qq/qq_proxy.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/qq/qq_proxy.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -420,7 +420,7 @@
qd->server_port = port;
if(use_tcp)
- return (gaim_proxy_connect(account, host, port, func, data) == NULL);
+ return (gaim_proxy_connect(NULL, account, host, port, func, data) == NULL);
else
return _qq_udp_proxy_connect(account, host, port, func, data);
}
Modified: trunk/libgaim/protocols/sametime/sametime.c
===================================================================
--- trunk/libgaim/protocols/sametime/sametime.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/sametime/sametime.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -225,7 +225,6 @@
/** socket fd */
int socket;
gint outpa; /* like inpa, but the other way */
- GaimProxyConnectData *connect_data;
/** circular buffer for outgoing data */
GaimCircBuffer *sock_buf;
@@ -1409,7 +1408,7 @@
port = gaim_account_get_int(account, MW_KEY_PORT, MW_PLUGIN_DEFAULT_PORT);
if(gaim_account_get_bool(account, MW_KEY_FORCE, FALSE) ||
- (gaim_proxy_connect(account, host, port, connect_cb, pd) == NULL)) {
+ (gaim_proxy_connect(NULL, account, host, port, connect_cb, pd) == NULL)) {
mwSession_forceLogin(session);
}
@@ -1674,8 +1673,6 @@
struct mwGaimPluginData *pd = data;
GaimConnection *gc = pd->gc;
- pd->connect_data = NULL;
-
if(source < 0) {
/* connection failed */
@@ -3680,8 +3677,7 @@
gaim_connection_update_progress(gc, _("Connecting"), 1, MW_CONNECT_STEPS);
- pd->connect_data = gaim_proxy_connect(account, host, port, connect_cb, pd);
- if(pd->connect_data == NULL) {
+ if (gaim_proxy_connect(gc, account, host, port, connect_cb, pd) == NULL) {
gaim_connection_error(gc, _("Unable to connect to host"));
}
}
@@ -3714,11 +3710,6 @@
gc->inpa = 0;
}
- if(pd->connect_data != NULL) {
- gaim_proxy_connect_cancel(pd->connect_data);
- pd->connect_data = NULL;
- }
-
/* clean up the rest */
mwGaimPluginData_free(pd);
}
Modified: trunk/libgaim/protocols/silc/silc.c
===================================================================
--- trunk/libgaim/protocols/silc/silc.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/silc/silc.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -154,7 +154,6 @@
g_return_if_fail(gc != NULL);
sg = gc->proto_data;
- sg->connect_data = NULL;
if (source < 0) {
gaim_connection_error(gc, _("Connection failed"));
@@ -357,12 +356,11 @@
gc->proto_data = sg;
/* Connect to the SILC server */
- sg->connect_data = gaim_proxy_connect(account,
+ if (gaim_proxy_connect(gc, account,
gaim_account_get_string(account, "server",
"silc.silcnet.org"),
gaim_account_get_int(account, "port", 706),
- silcgaim_login_connected, gc);
- if (sg->connect_data == NULL)
+ silcgaim_login_connected, gc) == NULL)
{
gaim_connection_error(gc, _("Unable to create connection"));
return;
@@ -382,8 +380,6 @@
SilcGaim sg = (SilcGaim)context;
silc_client_stop(sg->client);
silc_client_free(sg->client);
- if (sg->connect_data != NULL)
- gaim_proxy_connect_cancel(sg->connect_data);
#ifdef HAVE_SILCMIME_H
if (sg->mimeass)
silc_mime_assembler_free(sg->mimeass);
Modified: trunk/libgaim/protocols/silc/silcgaim.h
===================================================================
--- trunk/libgaim/protocols/silc/silcgaim.h 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/silc/silcgaim.h 2006-10-28 20:04:03 UTC (rev 17606)
@@ -67,7 +67,6 @@
SilcClient client;
SilcClientConnection conn;
- GaimProxyConnectData *connect_data;
guint scheduler;
GaimConnection *gc;
GaimAccount *account;
Modified: trunk/libgaim/protocols/simple/simple.c
===================================================================
--- trunk/libgaim/protocols/simple/simple.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/simple/simple.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -457,12 +457,10 @@
static void sendlater(GaimConnection *gc, const char *buf) {
struct simple_account_data *sip = gc->proto_data;
- GaimProxyConnectData *connect_data;
if(!sip->connecting) {
gaim_debug_info("simple", "connecting to %s port %d\n", sip->realhostname ? sip->realhostname : "{NULL}", sip->realport);
- connect_data = gaim_proxy_connect(sip->account, sip->realhostname, sip->realport, send_later_cb, gc);
- if(connect_data == NULL) {
+ if (gaim_proxy_connect(gc, sip->account, sip->realhostname, sip->realport, send_later_cb, gc) == NULL) {
gaim_connection_error(gc, _("Couldn't create socket"));
}
sip->connecting = TRUE;
@@ -1565,7 +1563,6 @@
static void
simple_tcp_connect_listen_cb(int listenfd, gpointer data) {
struct simple_account_data *sip = (struct simple_account_data*) data;
- GaimProxyConnectData *connect_data;
sip->listen_data = NULL;
@@ -1582,9 +1579,8 @@
gaim_debug_info("simple", "connecting to %s port %d\n",
sip->realhostname, sip->realport);
/* open tcp connection to the server */
- connect_data = gaim_proxy_connect(sip->account, sip->realhostname,
- sip->realport, login_cb, sip->gc);
- if(connect_data == NULL) {
+ if (gaim_proxy_connect(sip->gc, sip->account, sip->realhostname,
+ sip->realport, login_cb, sip->gc) == NULL) {
gaim_connection_error(sip->gc, _("Couldn't create socket"));
}
}
Modified: trunk/libgaim/protocols/toc/toc.c
===================================================================
--- trunk/libgaim/protocols/toc/toc.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/toc/toc.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -141,7 +141,7 @@
gaim_connection_update_progress(gc, buf, 0, TOC_CONNECT_STEPS);
gaim_debug(GAIM_DEBUG_INFO, "toc", "Client connects to TOC\n");
- if (gaim_proxy_connect(account,
+ if (gaim_proxy_connect(gc, account,
gaim_account_get_string(account, "server", TOC_HOST),
gaim_account_get_int(account, "port", TOC_PORT),
toc_login_callback, gc) != 0 || !account->gc) {
@@ -1933,7 +1933,7 @@
g_snprintf(buf, sizeof(buf), "toc_rvous_accept %s %s %s", ft->user, ft->cookie, FILE_SEND_UID);
sflap_send(ft->gc, buf, -1, TYPE_DATA);
- if (gaim_proxy_connect(account, ft->ip, ft->port, toc_send_file_connect, ft) != 0) {
+ if (gaim_proxy_connect(ft->gc, account, ft->ip, ft->port, toc_send_file_connect, ft) != 0) {
gaim_notify_error(ft->gc, NULL,
_("Could not connect for transfer."), NULL);
g_free(ft->filename);
@@ -2145,7 +2145,7 @@
g_snprintf(buf2, sizeof(buf2), "toc_rvous_accept %s %s %s", ft->user, ft->cookie, FILE_GET_UID);
sflap_send(ft->gc, buf2, -1, TYPE_DATA);
- if (gaim_proxy_connect(account, ft->ip, ft->port, toc_get_file_connect, ft) < 0) {
+ if (gaim_proxy_connect(ft->gc, account, ft->ip, ft->port, toc_get_file_connect, ft) < 0) {
gaim_notify_error(ft->gc, NULL,
_("Could not connect for transfer."), NULL);
fclose(ft->file);
Modified: trunk/libgaim/protocols/yahoo/yahoo.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/yahoo/yahoo.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -2459,7 +2459,7 @@
yd->rxqueue = NULL;
yd->rxlen = 0;
/* Now we have our cookies to login with. I'll go get the milk. */
- if (gaim_proxy_connect(account, "wcs2.msg.dcn.yahoo.com",
+ if (gaim_proxy_connect(gc, account, "wcs2.msg.dcn.yahoo.com",
gaim_account_get_int(account, "port", YAHOO_PAGER_PORT),
yahoo_got_web_connected, gc) == NULL) {
gaim_connection_error(gc, _("Connection problem"));
@@ -2633,7 +2633,7 @@
"Host: login.yahoo.com\r\n\r\n");
g_hash_table_destroy(hash);
yd->auth = g_string_free(url, FALSE);
- if (gaim_proxy_connect(account, "login.yahoo.com", 80, yahoo_got_cookies, gc) == NULL) {
+ if (gaim_proxy_connect(gc, account, "login.yahoo.com", 80, yahoo_got_cookies, gc) == NULL) {
gaim_connection_error(gc, _("Connection problem"));
return;
}
@@ -2732,7 +2732,7 @@
if (gaim_account_get_bool(account, "yahoojp", FALSE)) {
yd->jp = TRUE;
- if (gaim_proxy_connect(account,
+ if (gaim_proxy_connect(gc, account,
gaim_account_get_string(account, "serverjp", YAHOOJP_PAGER_HOST),
gaim_account_get_int(account, "port", YAHOO_PAGER_PORT),
yahoo_got_connected, gc) == NULL)
@@ -2742,7 +2742,7 @@
}
} else {
yd->jp = FALSE;
- if (gaim_proxy_connect(account,
+ if (gaim_proxy_connect(gc, account,
gaim_account_get_string(account, "server", YAHOO_PAGER_HOST),
gaim_account_get_int(account, "port", YAHOO_PAGER_PORT),
yahoo_got_connected, gc) == NULL)
Modified: trunk/libgaim/protocols/yahoo/yahoo_filexfer.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo_filexfer.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/yahoo/yahoo_filexfer.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -261,7 +261,7 @@
if (gaim_xfer_get_type(xfer) == GAIM_XFER_SEND) {
if (yd->jp) {
- if (gaim_proxy_connect(account, gaim_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST),
+ if (gaim_proxy_connect(NULL, account, gaim_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST),
gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
yahoo_sendfile_connected, xfer) == NULL)
{
@@ -270,7 +270,7 @@
gaim_xfer_cancel_remote(xfer);
}
} else {
- if (gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST),
+ if (gaim_proxy_connect(NULL, account, gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST),
gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
yahoo_sendfile_connected, xfer) == NULL)
{
@@ -281,7 +281,7 @@
}
} else {
/* TODO: Using xfer->fd like this is probably a bad thing... */
- if (gaim_proxy_connect(account, xfer_data->host, xfer_data->port,
+ if (gaim_proxy_connect(NULL, account, xfer_data->host, xfer_data->port,
yahoo_receivefile_connected, xfer) == NULL)
xfer->fd = -1;
else
Modified: trunk/libgaim/protocols/yahoo/yahoo_picture.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo_picture.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/yahoo/yahoo_picture.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -511,7 +511,7 @@
}
if (yd->jp) {
- if ((connect_data = gaim_proxy_connect(account, gaim_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST),
+ if ((connect_data = gaim_proxy_connect(NULL, account, gaim_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST),
gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
yahoo_buddy_icon_upload_connected, d)) == NULL)
{
@@ -519,7 +519,7 @@
yahoo_buddy_icon_upload_data_free(d);
}
} else {
- if ((connect_data = gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST),
+ if ((connect_data = gaim_proxy_connect(NULL, account, gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST),
gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
yahoo_buddy_icon_upload_connected, d)) == NULL)
{
Modified: trunk/libgaim/protocols/yahoo/yahoochat.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoochat.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/yahoo/yahoochat.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -1449,7 +1449,7 @@
gaim_roomlist_set_fields(rl, fields);
- if (gaim_proxy_connect(gaim_connection_get_account(gc), yrl->host, 80,
+ if (gaim_proxy_connect(NULL, gaim_connection_get_account(gc), yrl->host, 80,
yahoo_roomlist_got_connected, yrl) == NULL)
{
gaim_notify_error(gc, NULL, _("Connection problem"), _("Unable to fetch room list."));
@@ -1518,7 +1518,7 @@
yrl->ucat = gaim_roomlist_room_new(GAIM_ROOMLIST_ROOMTYPE_CATEGORY, _("User Rooms"), yrl->cat);
gaim_roomlist_room_add(list, yrl->ucat);
- if (gaim_proxy_connect(list->account, yrl->host, 80,
+ if (gaim_proxy_connect(NULL, list->account, yrl->host, 80,
yahoo_roomlist_got_connected, yrl) == NULL)
{
gaim_notify_error(gaim_account_get_connection(list->account),
Modified: trunk/libgaim/protocols/yahoo/ycht.c
===================================================================
--- trunk/libgaim/protocols/yahoo/ycht.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/protocols/yahoo/ycht.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -577,7 +577,7 @@
yd->ycht = ycht;
- if (gaim_proxy_connect(account,
+ if (gaim_proxy_connect(NULL, account,
gaim_account_get_string(account, "ycht-server", YAHOO_YCHT_HOST),
gaim_account_get_int(account, "ycht-port", YAHOO_YCHT_PORT),
ycht_got_connected, ycht) == NULL)
Modified: trunk/libgaim/proxy.c
===================================================================
--- trunk/libgaim/proxy.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/proxy.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -40,6 +40,7 @@
#include "util.h"
struct _GaimProxyConnectData {
+ void *handle;
GaimProxyConnectFunction connect_cb;
gpointer data;
gchar *host;
@@ -82,12 +83,7 @@
static GaimProxyInfo *global_proxy_info = NULL;
-/*
- * TODO: Once all callers of gaim_proxy_connect() are keeping track
- * of the return value from that function this linked list
- * will no longer be needed.
- */
-static GSList *connect_datas = NULL;
+static GSList *handles = NULL;
static void try_connect(GaimProxyConnectData *connect_data);
@@ -281,7 +277,7 @@
static void
gaim_proxy_connect_data_destroy(GaimProxyConnectData *connect_data)
{
- connect_datas = g_slist_remove(connect_datas, connect_data);
+ handles = g_slist_remove(handles, connect_data);
if (connect_data->query_data != NULL)
gaim_dnsquery_destroy(connect_data->query_data);
@@ -1750,7 +1746,8 @@
}
GaimProxyConnectData *
-gaim_proxy_connect(GaimAccount *account, const char *host, int port,
+gaim_proxy_connect(void *handle, GaimAccount *account,
+ const char *host, int port,
GaimProxyConnectFunction connect_cb, gpointer data)
{
const char *connecthost = host;
@@ -1763,6 +1760,7 @@
connect_data = g_new0(GaimProxyConnectData, 1);
connect_data->fd = -1;
+ connect_data->handle = handle;
connect_data->connect_cb = connect_cb;
connect_data->data = data;
connect_data->host = g_strdup(host);
@@ -1804,7 +1802,7 @@
return NULL;
}
- connect_datas = g_slist_prepend(connect_datas, connect_data);
+ handles = g_slist_prepend(handles, connect_data);
return connect_data;
}
@@ -1813,8 +1811,10 @@
* Combine some of this code with gaim_proxy_connect()
*/
GaimProxyConnectData *
-gaim_proxy_connect_socks5(GaimProxyInfo *gpi, const char *host, int port,
- GaimProxyConnectFunction connect_cb, gpointer data)
+gaim_proxy_connect_socks5(void *handle, GaimProxyInfo *gpi,
+ const char *host, int port,
+ GaimProxyConnectFunction connect_cb,
+ gpointer data)
{
GaimProxyConnectData *connect_data;
@@ -1824,6 +1824,7 @@
connect_data = g_new0(GaimProxyConnectData, 1);
connect_data->fd = -1;
+ connect_data->handle = handle;
connect_data->connect_cb = connect_cb;
connect_data->data = data;
connect_data->host = g_strdup(host);
@@ -1840,7 +1841,7 @@
return NULL;
}
- connect_datas = g_slist_prepend(connect_datas, connect_data);
+ handles = g_slist_prepend(handles, connect_data);
return connect_data;
}
@@ -1852,6 +1853,21 @@
gaim_proxy_connect_data_destroy(connect_data);
}
+void
+gaim_proxy_connect_cancel_with_handle(void *handle)
+{
+ GSList *l, *l_next;
+
+ for (l = handles; l != NULL; l = l_next) {
+ GaimProxyConnectData *connect_data = l->data;
+
+ l_next = l->next;
+
+ if (connect_data->handle == handle)
+ gaim_proxy_connect_cancel(connect_data);
+ }
+}
+
static void
proxy_pref_cb(const char *name, GaimPrefType type,
gconstpointer value, gpointer data)
@@ -1927,9 +1943,9 @@
void
gaim_proxy_uninit(void)
{
- while (connect_datas != NULL)
+ while (handles != NULL)
{
- gaim_proxy_connect_data_disconnect(connect_datas->data, NULL);
- gaim_proxy_connect_data_destroy(connect_datas->data);
+ gaim_proxy_connect_data_disconnect(handles->data, NULL);
+ gaim_proxy_connect_data_destroy(handles->data);
}
}
Modified: trunk/libgaim/proxy.h
===================================================================
--- trunk/libgaim/proxy.h 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/proxy.h 2006-10-28 20:04:03 UTC (rev 17606)
@@ -237,7 +237,8 @@
* structure that can be used to cancel the pending
* connection, if needed.
*/
-GaimProxyConnectData *gaim_proxy_connect(GaimAccount *account,
+GaimProxyConnectData *gaim_proxy_connect(void *handle,
+ GaimAccount *account,
const char *host, int port,
GaimProxyConnectFunction connect_cb, gpointer data);
@@ -257,7 +258,8 @@
* structure that can be used to cancel the pending
* connection, if needed.
*/
-GaimProxyConnectData *gaim_proxy_connect_socks5(GaimProxyInfo *gpi,
+GaimProxyConnectData *gaim_proxy_connect_socks5(void *handle,
+ GaimProxyInfo *gpi,
const char *host, int port,
GaimProxyConnectFunction connect_cb, gpointer data);
@@ -272,6 +274,13 @@
*/
void gaim_proxy_connect_cancel(GaimProxyConnectData *connect_data);
+/*
+ * Closes all proxy connections registered with the specified handle.
+ *
+ * @param handle The handle.
+ */
+void gaim_proxy_connect_cancel_with_handle(void *handle);
+
/*@}*/
#ifdef __cplusplus
Modified: trunk/libgaim/sslconn.c
===================================================================
--- trunk/libgaim/sslconn.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/sslconn.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -117,7 +117,7 @@
gsc->connect_cb = func;
gsc->error_cb = error_func;
- gsc->connect_data = gaim_proxy_connect(account, host, port, gaim_ssl_connect_cb, gsc);
+ gsc->connect_data = gaim_proxy_connect(NULL, account, host, port, gaim_ssl_connect_cb, gsc);
if (gsc->connect_data == NULL)
{
Modified: trunk/libgaim/upnp.c
===================================================================
--- trunk/libgaim/upnp.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/upnp.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -215,14 +215,14 @@
/* make sure we have a valid http response */
if(g_strstr_len(httpResponse, len, HTTP_OK) == NULL) {
gaim_debug_error("upnp",
- "parse_description_response(): Failed In HTTP_OK\n\n");
+ "parse_description_response(): Failed In HTTP_OK\n");
return NULL;
}
/* find the root of the xml document */
if((xmlRoot = g_strstr_len(httpResponse, len, "<root")) == NULL) {
gaim_debug_error("upnp",
- "parse_description_response(): Failed finding root\n\n");
+ "parse_description_response(): Failed finding root\n");
return NULL;
}
@@ -230,7 +230,7 @@
if((xmlRootNode = xmlnode_from_str(xmlRoot,
len - (xmlRoot - httpResponse))) == NULL) {
gaim_debug_error("upnp",
- "parse_description_response(): Could not parse xml root node\n\n");
+ "parse_description_response(): Could not parse xml root node\n");
return NULL;
}
@@ -252,7 +252,7 @@
}
if(serviceTypeNode == NULL) {
gaim_debug_error("upnp",
- "parse_description_response(): could not get serviceTypeNode 1\n\n");
+ "parse_description_response(): could not get serviceTypeNode 1\n");
g_free(baseURL);
xmlnode_free(xmlRootNode);
return NULL;
@@ -260,7 +260,7 @@
serviceTypeNode = xmlnode_get_child(serviceTypeNode, "deviceList");
if(serviceTypeNode == NULL) {
gaim_debug_error("upnp",
- "parse_description_response(): could not get serviceTypeNode 2\n\n");
+ "parse_description_response(): could not get serviceTypeNode 2\n");
g_free(baseURL);
xmlnode_free(xmlRootNode);
return NULL;
@@ -275,7 +275,7 @@
}
if(serviceTypeNode == NULL) {
gaim_debug_error("upnp",
- "parse_description_response(): could not get serviceTypeNode 3\n\n");
+ "parse_description_response(): could not get serviceTypeNode 3\n");
g_free(baseURL);
xmlnode_free(xmlRootNode);
return NULL;
@@ -283,7 +283,7 @@
serviceTypeNode = xmlnode_get_child(serviceTypeNode, "deviceList");
if(serviceTypeNode == NULL) {
gaim_debug_error("upnp",
- "parse_description_response(): could not get serviceTypeNode 4\n\n");
+ "parse_description_response(): could not get serviceTypeNode 4\n");
g_free(baseURL);
xmlnode_free(xmlRootNode);
return NULL;
@@ -297,7 +297,7 @@
}
if(serviceTypeNode == NULL) {
gaim_debug_error("upnp",
- "parse_description_response(): could not get serviceTypeNode 5\n\n");
+ "parse_description_response(): could not get serviceTypeNode 5\n");
g_free(baseURL);
xmlnode_free(xmlRootNode);
return NULL;
@@ -305,7 +305,7 @@
serviceTypeNode = xmlnode_get_child(serviceTypeNode, "serviceList");
if(serviceTypeNode == NULL) {
gaim_debug_error("upnp",
- "parse_description_response(): could not get serviceTypeNode 6\n\n");
+ "parse_description_response(): could not get serviceTypeNode 6\n");
g_free(baseURL);
xmlnode_free(xmlRootNode);
return NULL;
@@ -322,7 +322,7 @@
g_free(service);
if(serviceTypeNode == NULL) {
gaim_debug_error("upnp",
- "parse_description_response(): could not get serviceTypeNode 7\n\n");
+ "parse_description_response(): could not get serviceTypeNode 7\n");
g_free(baseURL);
xmlnode_free(xmlRootNode);
return NULL;
@@ -332,7 +332,7 @@
if((controlURLNode = xmlnode_get_child(serviceTypeNode,
"controlURL")) == NULL) {
gaim_debug_error("upnp",
- "parse_description_response(): Could not find controlURL\n\n");
+ "parse_description_response(): Could not find controlURL\n");
g_free(baseURL);
xmlnode_free(xmlRootNode);
return NULL;
@@ -367,7 +367,7 @@
if(control_url == NULL) {
gaim_debug_error("upnp",
- "gaim_upnp_parse_description(): control URL is NULL\n\n");
+ "gaim_upnp_parse_description(): control URL is NULL\n");
}
control_info.status = control_url ? GAIM_UPNP_STATUS_DISCOVERED
@@ -444,13 +444,13 @@
if(g_strstr_len(buf, buf_len, HTTP_OK) == NULL) {
gaim_debug_error("upnp",
- "parse_discover_response(): Failed In HTTP_OK\n\n");
+ "parse_discover_response(): Failed In HTTP_OK\n");
return;
}
if((startDescURL = g_strstr_len(buf, buf_len, "http://")) == NULL) {
gaim_debug_error("upnp",
- "parse_discover_response(): Failed In finding http://\n\n");
+ "parse_discover_response(): Failed In finding http://\n");
return;
}
@@ -461,7 +461,7 @@
buf_len - (startDescURL - buf), "\n");
if(endDescURL == NULL) {
gaim_debug_error("upnp",
- "parse_discover_response(): Failed In endDescURL\n\n");
+ "parse_discover_response(): Failed In endDescURL\n");
return;
}
}
@@ -469,7 +469,7 @@
/* XXX: I'm not sure how this could ever happen */
if(endDescURL == startDescURL) {
gaim_debug_error("upnp",
- "parse_discover_response(): endDescURL == startDescURL\n\n");
+ "parse_discover_response(): endDescURL == startDescURL\n");
return;
}
@@ -492,6 +492,7 @@
dd->tima = 0;
if (dd->retry_count < NUM_UDP_ATTEMPTS) {
+ /* TODO: We probably shouldn't be incrementing retry_count in two places */
dd->retry_count++;
gaim_upnp_discover_send_broadcast(dd);
} else {
@@ -625,7 +626,7 @@
sock = socket(AF_INET, SOCK_DGRAM, 0);
if(sock == -1) {
gaim_debug_error("upnp",
- "gaim_upnp_discover(): Failed In sock creation\n\n");
+ "gaim_upnp_discover(): Failed In sock creation\n");
/* Short circuit the retry attempts */
dd->retry_count = NUM_UDP_ATTEMPTS;
gaim_timeout_add(10, gaim_upnp_discover_timeout, dd);
@@ -634,10 +635,10 @@
dd->fd = sock;
- /* This shouldn't block */
+ /* TODO: Non-blocking! */
if((hp = gethostbyname(HTTPMU_HOST_ADDRESS)) == NULL) {
gaim_debug_error("upnp",
- "gaim_upnp_discover(): Failed In gethostbyname\n\n");
+ "gaim_upnp_discover(): Failed In gethostbyname\n");
/* Short circuit the retry attempts */
dd->retry_count = NUM_UDP_ATTEMPTS;
gaim_timeout_add(10, gaim_upnp_discover_timeout, dd);
@@ -670,7 +671,7 @@
if(!gaim_url_parse(control_info.control_url, &addressOfControl,
&port, &pathOfControl, NULL, NULL)) {
gaim_debug_error("upnp",
- "generate_action_message_and_send(): Failed In Parse URL\n\n");
+ "generate_action_message_and_send(): Failed In Parse URL\n");
/* XXX: This should probably be async */
if(cb)
cb(NULL, cb_data, NULL, 0, NULL);
@@ -728,17 +729,17 @@
if((temp = g_strstr_len(httpResponse, len,
"<NewExternalIPAddress")) == NULL) {
gaim_debug_error("upnp",
- "looked_up_public_ip_cb(): Failed Finding <NewExternalIPAddress\n\n");
+ "looked_up_public_ip_cb(): Failed Finding <NewExternalIPAddress\n");
return;
}
if(!(temp = g_strstr_len(temp, len - (temp - httpResponse), ">"))) {
gaim_debug_error("upnp",
- "looked_up_public_ip_cb(): Failed In Finding >\n\n");
+ "looked_up_public_ip_cb(): Failed In Finding >\n");
return;
}
if(!(temp2 = g_strstr_len(temp, len - (temp - httpResponse), "<"))) {
gaim_debug_error("upnp",
- "looked_up_public_ip_cb(): Failed In Finding <\n\n");
+ "looked_up_public_ip_cb(): Failed In Finding <\n");
return;
}
*temp2 = '\0';
@@ -798,14 +799,14 @@
if(!gaim_url_parse(control_info.control_url, &addressOfControl, &port,
NULL, NULL, NULL)) {
gaim_debug_error("upnp",
- "lookup_internal_ip(): Failed In Parse URL\n\n");
+ "lookup_internal_ip(): Failed In Parse URL\n");
return;
}
if(port == 0 || port == -1) {
port = DEFAULT_HTTP_PORT;
}
- if(gaim_proxy_connect(NULL, addressOfControl, port,
+ if(gaim_proxy_connect(NULL, NULL, addressOfControl, port,
looked_up_internal_ip_cb, NULL) == NULL)
{
gaim_debug_error("upnp", "Get Local IP Connect Failed: Address: %s @@@ Port %d\n",
@@ -828,7 +829,7 @@
(g_strstr_len(httpResponse, len, HTTP_OK) == NULL))
{
gaim_debug_error("upnp",
- "gaim_upnp_set_port_mapping(): Failed HTTP_OK\n\n%s\n\n",
+ "gaim_upnp_set_port_mapping(): Failed HTTP_OK\n%s\n",
httpResponse ? httpResponse : "(null)");
success = FALSE;
} else
@@ -852,7 +853,7 @@
/* get the internal IP */
if(!(internal_ip = gaim_upnp_get_internal_ip())) {
gaim_debug_error("upnp",
- "gaim_upnp_set_port_mapping(): couldn't get local ip\n\n");
+ "gaim_upnp_set_port_mapping(): couldn't get local ip\n");
/* UGLY */
if (ar->cb)
ar->cb(FALSE, ar->cb_data);
Modified: trunk/libgaim/util.c
===================================================================
--- trunk/libgaim/util.c 2006-10-28 19:52:30 UTC (rev 17605)
+++ trunk/libgaim/util.c 2006-10-28 20:04:03 UTC (rev 17606)
@@ -3152,7 +3152,7 @@
gaim_url_parse(new_url, &gfud->website.address, &gfud->website.port,
&gfud->website.page, &gfud->website.user, &gfud->website.passwd);
- gfud->connect_data = gaim_proxy_connect(NULL,
+ gfud->connect_data = gaim_proxy_connect(NULL, NULL,
gfud->website.address, gfud->website.port,
url_fetch_connect_cb, gfud);
@@ -3451,7 +3451,7 @@
gaim_url_parse(url, &gfud->website.address, &gfud->website.port,
&gfud->website.page, &gfud->website.user, &gfud->website.passwd);
- gfud->connect_data = gaim_proxy_connect(NULL,
+ gfud->connect_data = gaim_proxy_connect(NULL, NULL,
gfud->website.address, gfud->website.port,
url_fetch_connect_cb, gfud);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-28 19:54:02
|
Revision: 17605
http://svn.sourceforge.net/gaim/?rev=17605&view=rev
Author: sadrul
Date: 2006-10-28 12:52:30 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
Do things right and fix the compile warnings.
Modified Paths:
--------------
trunk/console/libgnt/gntbox.c
trunk/console/libgnt/gntbutton.c
trunk/console/libgnt/gntcheckbox.c
trunk/console/libgnt/gntentry.c
trunk/console/libgnt/gntlabel.c
trunk/console/libgnt/gntline.c
trunk/console/libgnt/gntstyle.c
trunk/console/libgnt/gnttree.c
trunk/console/libgnt/gntwidget.c
trunk/console/libgnt/gntwidget.h
Modified: trunk/console/libgnt/gntbox.c
===================================================================
--- trunk/console/libgnt/gntbox.c 2006-10-28 19:37:48 UTC (rev 17604)
+++ trunk/console/libgnt/gntbox.c 2006-10-28 19:52:30 UTC (rev 17605)
@@ -9,7 +9,6 @@
};
static GntWidgetClass *parent_class = NULL;
-static guint signals[SIGS] = { 0 };
static GntWidget * find_focusable_widget(GntBox *box);
Modified: trunk/console/libgnt/gntbutton.c
===================================================================
--- trunk/console/libgnt/gntbutton.c 2006-10-28 19:37:48 UTC (rev 17604)
+++ trunk/console/libgnt/gntbutton.c 2006-10-28 19:52:30 UTC (rev 17605)
@@ -9,7 +9,6 @@
};
static GntWidgetClass *parent_class = NULL;
-static guint signals[SIGS] = { 0 };
static void
gnt_button_draw(GntWidget *widget)
Modified: trunk/console/libgnt/gntcheckbox.c
===================================================================
--- trunk/console/libgnt/gntcheckbox.c 2006-10-28 19:37:48 UTC (rev 17604)
+++ trunk/console/libgnt/gntcheckbox.c 2006-10-28 19:52:30 UTC (rev 17605)
@@ -34,19 +34,6 @@
}
static void
-gnt_check_box_size_request(GntWidget *widget)
-{
-}
-
-static void
-gnt_check_box_map(GntWidget *widget)
-{
- if (widget->priv.width == 0 || widget->priv.height == 0)
- gnt_widget_size_request(widget);
- GNTDEBUG;
-}
-
-static void
toggle_selection(GntWidget *widget)
{
GNT_CHECK_BOX(widget)->checked = !GNT_CHECK_BOX(widget)->checked;
@@ -77,11 +64,6 @@
}
static void
-gnt_check_box_destroy(GntWidget *widget)
-{
-}
-
-static void
gnt_check_box_class_init(GntCheckBoxClass *klass)
{
GntWidgetClass *wclass = GNT_WIDGET_CLASS(klass);
Modified: trunk/console/libgnt/gntentry.c
===================================================================
--- trunk/console/libgnt/gntentry.c 2006-10-28 19:37:48 UTC (rev 17604)
+++ trunk/console/libgnt/gntentry.c 2006-10-28 19:52:30 UTC (rev 17605)
@@ -3,6 +3,7 @@
#include "gntbox.h"
#include "gntentry.h"
+#include "gntstyle.h"
#include "gnttree.h"
#include "gntutils.h"
@@ -339,7 +340,7 @@
{
char ch;
ch = *text;
-#define SAME(a,b) ((isalpha(a) && isalpha(b)) || (isdigit(a) && isdigit(b)) || (isblank(a) && isblank(b)))
+#define SAME(a,b) ((isalpha(a) && isalpha(b)) || (isdigit(a) && isdigit(b)) || (isspace(a) && isspace(b)))
while (--text >= begin) {
if (!SAME(ch, *text))
break;
@@ -354,7 +355,6 @@
{
GntEntry *entry = GNT_ENTRY(widget);
const char *iter = entry->cursor - 1;
- int count;
if (iter < entry->start)
return TRUE;
@@ -586,7 +586,7 @@
gnt_widget_class_register_action(parent_class, "history-next", history_next,
"\033" GNT_KEY_CTRL_UP, NULL);
- gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), klass);
+ gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), parent_class);
GNTDEBUG;
}
Modified: trunk/console/libgnt/gntlabel.c
===================================================================
--- trunk/console/libgnt/gntlabel.c 2006-10-28 19:37:48 UTC (rev 17604)
+++ trunk/console/libgnt/gntlabel.c 2006-10-28 19:52:30 UTC (rev 17605)
@@ -9,7 +9,6 @@
};
static GntWidgetClass *parent_class = NULL;
-static guint signals[SIGS] = { 0 };
static void
gnt_label_destroy(GntWidget *widget)
Modified: trunk/console/libgnt/gntline.c
===================================================================
--- trunk/console/libgnt/gntline.c 2006-10-28 19:37:48 UTC (rev 17604)
+++ trunk/console/libgnt/gntline.c 2006-10-28 19:52:30 UTC (rev 17605)
@@ -6,7 +6,6 @@
};
static GntWidgetClass *parent_class = NULL;
-static guint signals[SIGS] = { 0 };
static void
gnt_line_draw(GntWidget *widget)
Modified: trunk/console/libgnt/gntstyle.c
===================================================================
--- trunk/console/libgnt/gntstyle.c 2006-10-28 19:37:48 UTC (rev 17604)
+++ trunk/console/libgnt/gntstyle.c 2006-10-28 19:52:30 UTC (rev 17605)
@@ -1,6 +1,7 @@
#include "gntstyle.h"
#include "gntcolors.h"
+#include <ctype.h>
#include <string.h>
#if GLIB_CHECK_VERSION(2,6,0)
Modified: trunk/console/libgnt/gnttree.c
===================================================================
--- trunk/console/libgnt/gnttree.c 2006-10-28 19:37:48 UTC (rev 17604)
+++ trunk/console/libgnt/gnttree.c 2006-10-28 19:52:30 UTC (rev 17605)
@@ -1,5 +1,6 @@
-#include "gnttree.h"
#include "gntmarshal.h"
+#include "gntstyle.h"
+#include "gnttree.h"
#include "gntutils.h"
#include <string.h>
@@ -474,13 +475,6 @@
g_signal_emit(tree, signals[SIG_SELECTION_CHANGED], 0, old->key, current->key);
}
-static GntTreeRow *
-get_nth_row(GntTree *tree, int n)
-{
- gpointer key = g_list_nth_data(tree->list, n);
- return g_hash_table_lookup(tree->hash, key);
-}
-
static gboolean
action_down(GntWidget *widget, GList *null)
{
@@ -577,8 +571,6 @@
{
GntTree *tree = GNT_TREE(widget);
GntTreeRow *old = tree->current;
- GntTreeRow *row;
- int dist;
if (text[0] == '\r')
{
@@ -720,7 +712,7 @@
gnt_widget_class_register_action(parent_class, "page-down", action_page_down,
"\033" GNT_KEY_PGDOWN, NULL);
- gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), klass);
+ gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), parent_class);
GNTDEBUG;
}
Modified: trunk/console/libgnt/gntwidget.c
===================================================================
--- trunk/console/libgnt/gntwidget.c 2006-10-28 19:37:48 UTC (rev 17604)
+++ trunk/console/libgnt/gntwidget.c 2006-10-28 19:52:30 UTC (rev 17605)
@@ -415,7 +415,6 @@
gboolean
gnt_widget_perform_action_named(GntWidget *widget, const char *name, ...)
{
- GType type = G_OBJECT_TYPE(widget);
GntWidgetClass *klass = GNT_WIDGET_CLASS(G_OBJECT_GET_CLASS(widget));
GList *list = NULL;
va_list args;
@@ -440,7 +439,6 @@
static gboolean
gnt_widget_perform_action(GntWidget *widget, const char *keys)
{
- GType type = G_OBJECT_TYPE(widget);
GntWidgetClass *klass = GNT_WIDGET_CLASS(G_OBJECT_GET_CLASS(widget));
GntWidgetActionParam *param = g_hash_table_lookup(klass->bindings, keys);
Modified: trunk/console/libgnt/gntwidget.h
===================================================================
--- trunk/console/libgnt/gntwidget.h 2006-10-28 19:37:48 UTC (rev 17604)
+++ trunk/console/libgnt/gntwidget.h 2006-10-28 19:52:30 UTC (rev 17605)
@@ -181,10 +181,14 @@
void gnt_widget_action_free(GntWidgetAction *action);
void gnt_widget_action_param_free(GntWidgetActionParam *param);
+void gnt_widget_register_binding(GntWidgetClass *klass, const char *name,
+ const char *trigger, ...);
void gnt_widget_class_register_action(GntWidgetClass *klass, const char *name,
GntWidgetActionCallback callback, const char *trigger, ...);
+gboolean gnt_widget_perform_action_named(GntWidget *widget, const char *name, ...);
+
G_END_DECLS
#endif /* GNT_WIDGET_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-28 19:39:35
|
Revision: 17604
http://svn.sourceforge.net/gaim/?rev=17604&view=rev
Author: sadrul
Date: 2006-10-28 12:37:48 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
compile
Modified Paths:
--------------
trunk/console/libgnt/gntstyle.h
Modified: trunk/console/libgnt/gntstyle.h
===================================================================
--- trunk/console/libgnt/gntstyle.h 2006-10-28 17:59:45 UTC (rev 17603)
+++ trunk/console/libgnt/gntstyle.h 2006-10-28 19:37:48 UTC (rev 17604)
@@ -18,6 +18,8 @@
/* This should be called only once for the each type */
void gnt_styles_get_keyremaps(GType type, GHashTable *hash);
+void gnt_style_read_actions(GType type, GntWidgetClass *klass);
+
void gnt_init_styles();
void gnt_uninit_styles();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-10-28 18:04:08
|
Revision: 17603
http://svn.sourceforge.net/gaim/?rev=17603&view=rev
Author: datallah
Date: 2006-10-28 10:59:45 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
I think this will fix all the images that are corrupted.
They had svn:keywords and svn:eol-type set which, I think messed them up during the original conversion from cvs.
stu noticed this.
Modified Paths:
--------------
web/htdocs/images/a.png
web/htdocs/images/blackpixel.png
web/htdocs/images/cool.png
web/htdocs/images/date_bottom.png
web/htdocs/images/gaimlindows.png
web/htdocs/images/halloween/favicon.png
web/htdocs/images/halloween/links_bg.jpg
web/htdocs/images/halloween/links_bg.png
web/htdocs/images/halloween/links_tl.png
web/htdocs/images/halloween/navbar/bugs_b.png
web/htdocs/images/halloween/navbar/bugs_bh.png
web/htdocs/images/halloween/navbar/bugs_t.png
web/htdocs/images/halloween/navbar/contactinfo_b.png
web/htdocs/images/halloween/navbar/contactinfo_bh.png
web/htdocs/images/halloween/navbar/contactinfo_t.png
web/htdocs/images/halloween/navbar/documentation_b.png
web/htdocs/images/halloween/navbar/documentation_bh.png
web/htdocs/images/halloween/navbar/documentation_t.png
web/htdocs/images/halloween/navbar/downloads_b.png
web/htdocs/images/halloween/navbar/downloads_bh.png
web/htdocs/images/halloween/navbar/downloads_t.png
web/htdocs/images/halloween/navbar/faq_b.png
web/htdocs/images/halloween/navbar/faq_bh.png
web/htdocs/images/halloween/navbar/faq_t.png
web/htdocs/images/halloween/navbar/news_b.png
web/htdocs/images/halloween/navbar/news_bh.png
web/htdocs/images/halloween/navbar/news_t.png
web/htdocs/images/halloween/navbar/plugins_b.png
web/htdocs/images/halloween/navbar/plugins_bh.png
web/htdocs/images/halloween/navbar/plugins_t.png
web/htdocs/images/halloween/navbar/project_b.png
web/htdocs/images/halloween/navbar/project_bh.png
web/htdocs/images/halloween/navbar/project_t.png
web/htdocs/images/halloween/navbar/screenshots_b.png
web/htdocs/images/halloween/navbar/screenshots_bh.png
web/htdocs/images/halloween/navbar/screenshots_t.png
web/htdocs/images/halloween/navbar/themes_b.png
web/htdocs/images/halloween/navbar/themes_bh.png
web/htdocs/images/halloween/navbar/themes_t.png
web/htdocs/images/halloween/navbar/whatisgaim_b.png
web/htdocs/images/halloween/navbar/whatisgaim_bh.png
web/htdocs/images/halloween/navbar/whatisgaim_t.png
web/htdocs/images/halloween/navbar/wingaim_b.png
web/htdocs/images/halloween/navbar/wingaim_bh.png
web/htdocs/images/halloween/navbar/wingaim_t.png
web/htdocs/images/halloween/one-pumpkin.jpg
web/htdocs/images/halloween/penguin2.png
web/htdocs/images/halloween/penguin2.xcf
web/htdocs/images/links_bg.png
web/htdocs/images/links_tl.png
web/htdocs/images/logo.xcf
web/htdocs/images/navbar/bugs_b.png
web/htdocs/images/navbar/bugs_bh.png
web/htdocs/images/navbar/bugs_t.png
web/htdocs/images/navbar/contactinfo_b.png
web/htdocs/images/navbar/contactinfo_bh.png
web/htdocs/images/navbar/contactinfo_t.png
web/htdocs/images/navbar/documentation_b.png
web/htdocs/images/navbar/documentation_bh.png
web/htdocs/images/navbar/documentation_t.png
web/htdocs/images/navbar/downloads_b.png
web/htdocs/images/navbar/downloads_bh.png
web/htdocs/images/navbar/downloads_t.png
web/htdocs/images/navbar/faq_b.png
web/htdocs/images/navbar/faq_bh.png
web/htdocs/images/navbar/faq_t.png
web/htdocs/images/navbar/news_b.png
web/htdocs/images/navbar/news_bh.png
web/htdocs/images/navbar/news_t.png
web/htdocs/images/navbar/plugins_b.png
web/htdocs/images/navbar/plugins_bh.png
web/htdocs/images/navbar/plugins_t.png
web/htdocs/images/navbar/project_b.png
web/htdocs/images/navbar/project_bh.png
web/htdocs/images/navbar/project_t.png
web/htdocs/images/navbar/screenshots_b.png
web/htdocs/images/navbar/screenshots_bh.png
web/htdocs/images/navbar/screenshots_t.png
web/htdocs/images/navbar/themes_b.png
web/htdocs/images/navbar/themes_bh.png
web/htdocs/images/navbar/themes_t.png
web/htdocs/images/navbar/whatisgaim_b.png
web/htdocs/images/navbar/whatisgaim_bh.png
web/htdocs/images/navbar/whatisgaim_t.png
web/htdocs/images/navbar/wingaim_b.png
web/htdocs/images/navbar/wingaim_bh.png
web/htdocs/images/navbar/wingaim_t.png
web/htdocs/images/news_bottom.png
web/htdocs/images/news_left.png
web/htdocs/images/news_mb.png
web/htdocs/images/news_tl.png
web/htdocs/images/news_top.png
web/htdocs/images/penguin2.png
web/htdocs/images/powered_by_libgaim.xcf
web/htdocs/images/q.png
web/htdocs/images/screenshots/account.png
web/htdocs/images/screenshots/account_t.png
web/htdocs/images/screenshots/aimicq-t.png
web/htdocs/images/screenshots/aimicq.png
web/htdocs/images/screenshots/buddylist.png
web/htdocs/images/screenshots/buddylist_t.png
web/htdocs/images/screenshots/convos.png
web/htdocs/images/screenshots/convos_t.png
web/htdocs/images/screenshots/docklet.png
web/htdocs/images/screenshots/docklet_t.png
web/htdocs/images/screenshots/ft.png
web/htdocs/images/screenshots/ft_t.png
web/htdocs/images/screenshots/gaim-cvs-i18n.png
web/htdocs/images/screenshots/getinfo.png
web/htdocs/images/screenshots/getinfo_t.png
web/htdocs/images/screenshots/i18n.png
web/htdocs/images/screenshots/i18n_t.png
web/htdocs/images/screenshots/jabber.png
web/htdocs/images/screenshots/jabber_t.png
web/htdocs/images/screenshots/modify.png
web/htdocs/images/screenshots/modify_t.png
web/htdocs/images/screenshots/msn_buddylist.png
web/htdocs/images/screenshots/msn_buddylist_t.png
web/htdocs/images/screenshots/msn_convo.png
web/htdocs/images/screenshots/msn_convo_t.png
web/htdocs/images/screenshots/newlist-t.png
web/htdocs/images/screenshots/newlist.png
web/htdocs/images/screenshots/plugins.png
web/htdocs/images/screenshots/plugins_t.png
web/htdocs/images/screenshots/tabbed.png
web/htdocs/images/screenshots/tabbed_t.png
web/htdocs/images/screenshots/themes.png
web/htdocs/images/screenshots/themes_t.png
web/htdocs/images/statusicons/aim/activebuddy.png
web/htdocs/images/statusicons/aim/admin.png
web/htdocs/images/statusicons/aim/aol.png
web/htdocs/images/statusicons/aim/away.png
web/htdocs/images/statusicons/aim/confirmed.png
web/htdocs/images/statusicons/aim/offline.png
web/htdocs/images/statusicons/aim/unconfirmed.png
web/htdocs/images/statusicons/aim/wireless.png
web/htdocs/images/statusicons/gg/away.png
web/htdocs/images/statusicons/gg/busy.png
web/htdocs/images/statusicons/gg/invisible.png
web/htdocs/images/statusicons/gg/online.png
web/htdocs/images/statusicons/icq/away.png
web/htdocs/images/statusicons/icq/dnd.png
web/htdocs/images/statusicons/icq/ffc.png
web/htdocs/images/statusicons/icq/na.png
web/htdocs/images/statusicons/icq/occ.png
web/htdocs/images/statusicons/icq/offline.png
web/htdocs/images/statusicons/icq/online.png
web/htdocs/images/statusicons/irc/offline.png
web/htdocs/images/statusicons/irc/online.png
web/htdocs/images/statusicons/jabber/available.png
web/htdocs/images/statusicons/jabber/away.png
web/htdocs/images/statusicons/jabber/chat.png
web/htdocs/images/statusicons/jabber/dnd.png
web/htdocs/images/statusicons/jabber/error.png
web/htdocs/images/statusicons/jabber/offline.png
web/htdocs/images/statusicons/jabber/xa.png
web/htdocs/images/statusicons/msn/away.png
web/htdocs/images/statusicons/msn/occupied.png
web/htdocs/images/statusicons/msn/offline.png
web/htdocs/images/statusicons/msn/online.png
web/htdocs/images/statusicons/napster/online.png
web/htdocs/images/statusicons/yahoo/away.png
web/htdocs/images/statusicons/yahoo/game.png
web/htdocs/images/statusicons/yahoo/idle.png
web/htdocs/images/statusicons/yahoo/offline.png
web/htdocs/images/statusicons/yahoo/online.png
web/htdocs/images/thanksgiving/links_bg.png
web/htdocs/images/thanksgiving/links_tl.png
web/htdocs/images/thanksgiving/navbar/bugs_b.png
web/htdocs/images/thanksgiving/navbar/bugs_bh.png
web/htdocs/images/thanksgiving/navbar/bugs_t.png
web/htdocs/images/thanksgiving/navbar/contactinfo_b.png
web/htdocs/images/thanksgiving/navbar/contactinfo_bh.png
web/htdocs/images/thanksgiving/navbar/contactinfo_t.png
web/htdocs/images/thanksgiving/navbar/documentation_b.png
web/htdocs/images/thanksgiving/navbar/documentation_bh.png
web/htdocs/images/thanksgiving/navbar/documentation_t.png
web/htdocs/images/thanksgiving/navbar/downloads_b.png
web/htdocs/images/thanksgiving/navbar/downloads_bh.png
web/htdocs/images/thanksgiving/navbar/downloads_t.png
web/htdocs/images/thanksgiving/navbar/faq_b.png
web/htdocs/images/thanksgiving/navbar/faq_bh.png
web/htdocs/images/thanksgiving/navbar/faq_t.png
web/htdocs/images/thanksgiving/navbar/news_b.png
web/htdocs/images/thanksgiving/navbar/news_bh.png
web/htdocs/images/thanksgiving/navbar/news_t.png
web/htdocs/images/thanksgiving/navbar/plugins_b.png
web/htdocs/images/thanksgiving/navbar/plugins_bh.png
web/htdocs/images/thanksgiving/navbar/plugins_t.png
web/htdocs/images/thanksgiving/navbar/project_b.png
web/htdocs/images/thanksgiving/navbar/project_bh.png
web/htdocs/images/thanksgiving/navbar/project_t.png
web/htdocs/images/thanksgiving/navbar/screenshots_b.png
web/htdocs/images/thanksgiving/navbar/screenshots_bh.png
web/htdocs/images/thanksgiving/navbar/screenshots_t.png
web/htdocs/images/thanksgiving/navbar/themes_b.png
web/htdocs/images/thanksgiving/navbar/themes_bh.png
web/htdocs/images/thanksgiving/navbar/themes_t.png
web/htdocs/images/thanksgiving/navbar/whatisgaim_b.png
web/htdocs/images/thanksgiving/navbar/whatisgaim_bh.png
web/htdocs/images/thanksgiving/navbar/whatisgaim_t.png
web/htdocs/images/thanksgiving/navbar/wingaim_b.png
web/htdocs/images/thanksgiving/navbar/wingaim_bh.png
web/htdocs/images/thanksgiving/navbar/wingaim_t.png
web/htdocs/images/thanksgiving/penguin2.png
Property Changed:
----------------
web/htdocs/images/a.png
web/htdocs/images/blackpixel.png
web/htdocs/images/cool.png
web/htdocs/images/date_bottom.png
web/htdocs/images/gaimlindows.png
web/htdocs/images/halloween/favicon.png
web/htdocs/images/halloween/links_bg.jpg
web/htdocs/images/halloween/links_bg.png
web/htdocs/images/halloween/links_tl.png
web/htdocs/images/halloween/navbar/bugs_b.png
web/htdocs/images/halloween/navbar/bugs_bh.png
web/htdocs/images/halloween/navbar/bugs_t.png
web/htdocs/images/halloween/navbar/contactinfo_b.png
web/htdocs/images/halloween/navbar/contactinfo_bh.png
web/htdocs/images/halloween/navbar/contactinfo_t.png
web/htdocs/images/halloween/navbar/documentation_b.png
web/htdocs/images/halloween/navbar/documentation_bh.png
web/htdocs/images/halloween/navbar/documentation_t.png
web/htdocs/images/halloween/navbar/downloads_b.png
web/htdocs/images/halloween/navbar/downloads_bh.png
web/htdocs/images/halloween/navbar/downloads_t.png
web/htdocs/images/halloween/navbar/faq_b.png
web/htdocs/images/halloween/navbar/faq_bh.png
web/htdocs/images/halloween/navbar/faq_t.png
web/htdocs/images/halloween/navbar/news_b.png
web/htdocs/images/halloween/navbar/news_bh.png
web/htdocs/images/halloween/navbar/news_t.png
web/htdocs/images/halloween/navbar/plugins_b.png
web/htdocs/images/halloween/navbar/plugins_bh.png
web/htdocs/images/halloween/navbar/plugins_t.png
web/htdocs/images/halloween/navbar/project_b.png
web/htdocs/images/halloween/navbar/project_bh.png
web/htdocs/images/halloween/navbar/project_t.png
web/htdocs/images/halloween/navbar/screenshots_b.png
web/htdocs/images/halloween/navbar/screenshots_bh.png
web/htdocs/images/halloween/navbar/screenshots_t.png
web/htdocs/images/halloween/navbar/themes_b.png
web/htdocs/images/halloween/navbar/themes_bh.png
web/htdocs/images/halloween/navbar/themes_t.png
web/htdocs/images/halloween/navbar/whatisgaim_b.png
web/htdocs/images/halloween/navbar/whatisgaim_bh.png
web/htdocs/images/halloween/navbar/whatisgaim_t.png
web/htdocs/images/halloween/navbar/wingaim_b.png
web/htdocs/images/halloween/navbar/wingaim_bh.png
web/htdocs/images/halloween/navbar/wingaim_t.png
web/htdocs/images/halloween/one-pumpkin.jpg
web/htdocs/images/halloween/penguin2.png
web/htdocs/images/halloween/penguin2.xcf
web/htdocs/images/links_bg.png
web/htdocs/images/links_tl.png
web/htdocs/images/logo.xcf
web/htdocs/images/navbar/bugs_b.png
web/htdocs/images/navbar/bugs_bh.png
web/htdocs/images/navbar/bugs_t.png
web/htdocs/images/navbar/contactinfo_b.png
web/htdocs/images/navbar/contactinfo_bh.png
web/htdocs/images/navbar/contactinfo_t.png
web/htdocs/images/navbar/documentation_b.png
web/htdocs/images/navbar/documentation_bh.png
web/htdocs/images/navbar/documentation_t.png
web/htdocs/images/navbar/downloads_b.png
web/htdocs/images/navbar/downloads_bh.png
web/htdocs/images/navbar/downloads_t.png
web/htdocs/images/navbar/faq_b.png
web/htdocs/images/navbar/faq_bh.png
web/htdocs/images/navbar/faq_t.png
web/htdocs/images/navbar/news_b.png
web/htdocs/images/navbar/news_bh.png
web/htdocs/images/navbar/news_t.png
web/htdocs/images/navbar/plugins_b.png
web/htdocs/images/navbar/plugins_bh.png
web/htdocs/images/navbar/plugins_t.png
web/htdocs/images/navbar/project_b.png
web/htdocs/images/navbar/project_bh.png
web/htdocs/images/navbar/project_t.png
web/htdocs/images/navbar/screenshots_b.png
web/htdocs/images/navbar/screenshots_bh.png
web/htdocs/images/navbar/screenshots_t.png
web/htdocs/images/navbar/themes_b.png
web/htdocs/images/navbar/themes_bh.png
web/htdocs/images/navbar/themes_t.png
web/htdocs/images/navbar/whatisgaim_b.png
web/htdocs/images/navbar/whatisgaim_bh.png
web/htdocs/images/navbar/whatisgaim_t.png
web/htdocs/images/navbar/wingaim_b.png
web/htdocs/images/navbar/wingaim_bh.png
web/htdocs/images/navbar/wingaim_t.png
web/htdocs/images/news_bottom.png
web/htdocs/images/news_left.png
web/htdocs/images/news_mb.png
web/htdocs/images/news_tl.png
web/htdocs/images/news_top.png
web/htdocs/images/penguin2.png
web/htdocs/images/powered_by_libgaim.xcf
web/htdocs/images/q.png
web/htdocs/images/screenshots/account.png
web/htdocs/images/screenshots/account_t.png
web/htdocs/images/screenshots/aimicq-t.png
web/htdocs/images/screenshots/aimicq.png
web/htdocs/images/screenshots/buddylist.png
web/htdocs/images/screenshots/buddylist_t.png
web/htdocs/images/screenshots/convos.png
web/htdocs/images/screenshots/convos_t.png
web/htdocs/images/screenshots/docklet.png
web/htdocs/images/screenshots/docklet_t.png
web/htdocs/images/screenshots/ft.png
web/htdocs/images/screenshots/ft_t.png
web/htdocs/images/screenshots/gaim-cvs-i18n.png
web/htdocs/images/screenshots/getinfo.png
web/htdocs/images/screenshots/getinfo_t.png
web/htdocs/images/screenshots/i18n.png
web/htdocs/images/screenshots/i18n_t.png
web/htdocs/images/screenshots/jabber.png
web/htdocs/images/screenshots/jabber_t.png
web/htdocs/images/screenshots/modify.png
web/htdocs/images/screenshots/modify_t.png
web/htdocs/images/screenshots/msn_buddylist.png
web/htdocs/images/screenshots/msn_buddylist_t.png
web/htdocs/images/screenshots/msn_convo.png
web/htdocs/images/screenshots/msn_convo_t.png
web/htdocs/images/screenshots/newlist-t.png
web/htdocs/images/screenshots/newlist.png
web/htdocs/images/screenshots/plugins.png
web/htdocs/images/screenshots/plugins_t.png
web/htdocs/images/screenshots/tabbed.png
web/htdocs/images/screenshots/tabbed_t.png
web/htdocs/images/screenshots/themes.png
web/htdocs/images/screenshots/themes_t.png
web/htdocs/images/statusicons/aim/activebuddy.png
web/htdocs/images/statusicons/aim/admin.png
web/htdocs/images/statusicons/aim/aol.png
web/htdocs/images/statusicons/aim/away.png
web/htdocs/images/statusicons/aim/confirmed.png
web/htdocs/images/statusicons/aim/offline.png
web/htdocs/images/statusicons/aim/unconfirmed.png
web/htdocs/images/statusicons/aim/wireless.png
web/htdocs/images/statusicons/gg/away.png
web/htdocs/images/statusicons/gg/busy.png
web/htdocs/images/statusicons/gg/invisible.png
web/htdocs/images/statusicons/gg/online.png
web/htdocs/images/statusicons/icq/away.png
web/htdocs/images/statusicons/icq/dnd.png
web/htdocs/images/statusicons/icq/ffc.png
web/htdocs/images/statusicons/icq/na.png
web/htdocs/images/statusicons/icq/occ.png
web/htdocs/images/statusicons/icq/offline.png
web/htdocs/images/statusicons/icq/online.png
web/htdocs/images/statusicons/irc/offline.png
web/htdocs/images/statusicons/irc/online.png
web/htdocs/images/statusicons/jabber/available.png
web/htdocs/images/statusicons/jabber/away.png
web/htdocs/images/statusicons/jabber/chat.png
web/htdocs/images/statusicons/jabber/dnd.png
web/htdocs/images/statusicons/jabber/error.png
web/htdocs/images/statusicons/jabber/offline.png
web/htdocs/images/statusicons/jabber/xa.png
web/htdocs/images/statusicons/msn/away.png
web/htdocs/images/statusicons/msn/occupied.png
web/htdocs/images/statusicons/msn/offline.png
web/htdocs/images/statusicons/msn/online.png
web/htdocs/images/statusicons/napster/online.png
web/htdocs/images/statusicons/yahoo/away.png
web/htdocs/images/statusicons/yahoo/game.png
web/htdocs/images/statusicons/yahoo/idle.png
web/htdocs/images/statusicons/yahoo/offline.png
web/htdocs/images/statusicons/yahoo/online.png
web/htdocs/images/thanksgiving/links_bg.png
web/htdocs/images/thanksgiving/links_tl.png
web/htdocs/images/thanksgiving/navbar/bugs_b.png
web/htdocs/images/thanksgiving/navbar/bugs_bh.png
web/htdocs/images/thanksgiving/navbar/bugs_t.png
web/htdocs/images/thanksgiving/navbar/contactinfo_b.png
web/htdocs/images/thanksgiving/navbar/contactinfo_bh.png
web/htdocs/images/thanksgiving/navbar/contactinfo_t.png
web/htdocs/images/thanksgiving/navbar/documentation_b.png
web/htdocs/images/thanksgiving/navbar/documentation_bh.png
web/htdocs/images/thanksgiving/navbar/documentation_t.png
web/htdocs/images/thanksgiving/navbar/downloads_b.png
web/htdocs/images/thanksgiving/navbar/downloads_bh.png
web/htdocs/images/thanksgiving/navbar/downloads_t.png
web/htdocs/images/thanksgiving/navbar/faq_b.png
web/htdocs/images/thanksgiving/navbar/faq_bh.png
web/htdocs/images/thanksgiving/navbar/faq_t.png
web/htdocs/images/thanksgiving/navbar/news_b.png
web/htdocs/images/thanksgiving/navbar/news_bh.png
web/htdocs/images/thanksgiving/navbar/news_t.png
web/htdocs/images/thanksgiving/navbar/plugins_b.png
web/htdocs/images/thanksgiving/navbar/plugins_bh.png
web/htdocs/images/thanksgiving/navbar/plugins_t.png
web/htdocs/images/thanksgiving/navbar/project_b.png
web/htdocs/images/thanksgiving/navbar/project_bh.png
web/htdocs/images/thanksgiving/navbar/project_t.png
web/htdocs/images/thanksgiving/navbar/screenshots_b.png
web/htdocs/images/thanksgiving/navbar/screenshots_bh.png
web/htdocs/images/thanksgiving/navbar/screenshots_t.png
web/htdocs/images/thanksgiving/navbar/themes_b.png
web/htdocs/images/thanksgiving/navbar/themes_bh.png
web/htdocs/images/thanksgiving/navbar/themes_t.png
web/htdocs/images/thanksgiving/navbar/whatisgaim_b.png
web/htdocs/images/thanksgiving/navbar/whatisgaim_bh.png
web/htdocs/images/thanksgiving/navbar/whatisgaim_t.png
web/htdocs/images/thanksgiving/navbar/wingaim_b.png
web/htdocs/images/thanksgiving/navbar/wingaim_bh.png
web/htdocs/images/thanksgiving/navbar/wingaim_t.png
web/htdocs/images/thanksgiving/penguin2.png
web/htdocs/images/transpixel.gif
Modified: web/htdocs/images/a.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/a.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/blackpixel.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/blackpixel.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/cool.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/cool.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/date_bottom.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/date_bottom.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/gaimlindows.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/gaimlindows.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/favicon.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/favicon.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/links_bg.jpg
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/links_bg.jpg
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/links_bg.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/links_bg.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/links_tl.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/links_tl.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/bugs_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/bugs_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/bugs_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/bugs_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/bugs_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/bugs_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/contactinfo_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/contactinfo_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/contactinfo_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/contactinfo_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/contactinfo_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/contactinfo_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/documentation_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/documentation_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/documentation_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/documentation_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/documentation_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/documentation_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/downloads_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/downloads_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/downloads_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/downloads_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/downloads_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/downloads_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/faq_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/faq_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/faq_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/faq_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/faq_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/faq_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/news_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/news_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/news_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/news_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/news_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/news_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/plugins_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/plugins_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/plugins_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/plugins_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/plugins_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/plugins_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/project_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/project_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/project_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/project_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/project_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/project_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/screenshots_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/screenshots_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/screenshots_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/screenshots_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/screenshots_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/screenshots_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/themes_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/themes_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/themes_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/themes_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/themes_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/themes_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/whatisgaim_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/whatisgaim_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/whatisgaim_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/whatisgaim_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/whatisgaim_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/whatisgaim_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/wingaim_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/wingaim_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/wingaim_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/wingaim_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/navbar/wingaim_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/navbar/wingaim_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/one-pumpkin.jpg
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/one-pumpkin.jpg
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/penguin2.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/penguin2.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/halloween/penguin2.xcf
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/halloween/penguin2.xcf
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/links_bg.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/links_bg.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/links_tl.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/links_tl.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/logo.xcf
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/logo.xcf
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/bugs_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/bugs_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/bugs_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/bugs_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/bugs_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/bugs_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/contactinfo_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/contactinfo_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/contactinfo_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/contactinfo_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/contactinfo_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/contactinfo_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/documentation_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/documentation_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/documentation_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/documentation_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/documentation_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/documentation_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/downloads_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/downloads_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/downloads_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/downloads_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/downloads_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/downloads_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/faq_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/faq_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/faq_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/faq_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/faq_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/faq_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/news_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/news_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/news_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/news_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/news_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/news_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/plugins_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/plugins_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/plugins_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/plugins_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/plugins_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/plugins_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/project_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/project_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/project_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/project_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/project_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/project_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/screenshots_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/screenshots_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/screenshots_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/screenshots_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/screenshots_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/screenshots_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/themes_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/themes_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/themes_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/themes_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/themes_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/themes_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/whatisgaim_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/whatisgaim_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/whatisgaim_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/whatisgaim_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/whatisgaim_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/whatisgaim_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/wingaim_b.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/wingaim_b.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/wingaim_bh.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/wingaim_bh.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/navbar/wingaim_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/navbar/wingaim_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/news_bottom.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/news_bottom.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/news_left.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/news_left.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/news_mb.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/news_mb.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/news_tl.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/news_tl.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/news_top.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/news_top.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/penguin2.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/penguin2.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/powered_by_libgaim.xcf
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/powered_by_libgaim.xcf
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/q.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/q.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/account.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/account.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/account_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/account_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/aimicq-t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/aimicq-t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/aimicq.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/aimicq.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/buddylist.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/buddylist.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/buddylist_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/buddylist_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/convos.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/convos.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/convos_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/convos_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/docklet.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/docklet.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/docklet_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/docklet_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/ft.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/ft.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/ft_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/ft_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/gaim-cvs-i18n.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/gaim-cvs-i18n.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/getinfo.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/getinfo.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/getinfo_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/getinfo_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/i18n.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/i18n.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/i18n_t.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/i18n_t.png
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
Name: svn:eol-style
- native
Modified: web/htdocs/images/screenshots/jabber.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/images/screenshots/jabber.png
____________________________________________...
[truncated message content] |
|
From: <nos...@us...> - 2006-10-28 15:43:30
|
Revision: 17602
http://svn.sourceforge.net/gaim/?rev=17602&view=rev
Author: nosnilmot
Date: 2006-10-28 08:43:14 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
Linky-linky
Modified Paths:
--------------
web/htdocs/gdb.php
Modified: web/htdocs/gdb.php
===================================================================
--- web/htdocs/gdb.php 2006-10-28 15:22:30 UTC (rev 17601)
+++ web/htdocs/gdb.php 2006-10-28 15:43:14 UTC (rev 17602)
@@ -188,7 +188,7 @@
<h2>Distribution Notes</h2>
<ul>
-<li>Debian: see http://wiki.debian.net/?HowToGetABacktrace</li>
+<li>Debian: see <a href="http://wiki.debian.net/?HowToGetABacktrace">http://wiki.debian.net/?HowToGetABacktrace</a></li>
<li>Fedora: Install the -debug rpm first</li>
<li>Redhat: Install the -debug rpm first</li>
<li>Gentoo: emerge gaim with USE=debug</li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-10-28 15:23:05
|
Revision: 17601
http://svn.sourceforge.net/gaim/?rev=17601&view=rev
Author: sadrul
Date: 2006-10-28 08:22:30 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
Add another action "context-menu" for all widgets. This will allow to popup the context-menu for adding buddies. etc. in
the buddylist with some custom binding for keyboards that don't have the menu-key (like the one at my work).
Modified Paths:
--------------
trunk/console/gntblist.c
trunk/console/libgnt/gntmarshal.c
trunk/console/libgnt/gntmarshal.h
trunk/console/libgnt/gntwidget.c
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c 2006-10-28 14:24:10 UTC (rev 17600)
+++ trunk/console/gntblist.c 2006-10-28 15:22:30 UTC (rev 17601)
@@ -1258,6 +1258,13 @@
}
static gboolean
+context_menu(GntWidget *widget, GGBlist *ggblist)
+{
+ draw_context_menu(ggblist);
+ return TRUE;
+}
+
+static gboolean
key_pressed(GntWidget *widget, const char *text, GGBlist *ggblist)
{
gboolean stop = FALSE, ret = FALSE;
@@ -1275,17 +1282,8 @@
stop = TRUE;
}
- if (text[0] == 27)
+ if (strcmp(text, GNT_KEY_CTRL_O) == 0)
{
- if (strcmp(text + 1, GNT_KEY_POPUP) == 0)
- {
- draw_context_menu(ggblist);
- stop = TRUE;
- ret = TRUE;
- }
- }
- else if (strcmp(text, GNT_KEY_CTRL_O) == 0)
- {
gaim_prefs_set_bool(PREF_ROOT "/showoffline",
!gaim_prefs_get_bool(PREF_ROOT "/showoffline"));
ret = TRUE;
@@ -1933,6 +1931,7 @@
g_signal_connect(G_OBJECT(ggblist->tree), "selection_changed", G_CALLBACK(selection_changed), ggblist);
g_signal_connect(G_OBJECT(ggblist->tree), "key_pressed", G_CALLBACK(key_pressed), ggblist);
+ g_signal_connect(G_OBJECT(ggblist->tree), "context-menu", G_CALLBACK(context_menu), ggblist);
g_signal_connect_after(G_OBJECT(ggblist->tree), "clicked", G_CALLBACK(blist_clicked), ggblist);
g_signal_connect(G_OBJECT(ggblist->tree), "activate", G_CALLBACK(selection_activate), ggblist);
g_signal_connect_data(G_OBJECT(ggblist->tree), "gained-focus", G_CALLBACK(draw_tooltip),
Modified: trunk/console/libgnt/gntmarshal.c
===================================================================
--- trunk/console/libgnt/gntmarshal.c 2006-10-28 14:24:10 UTC (rev 17600)
+++ trunk/console/libgnt/gntmarshal.c 2006-10-28 15:22:30 UTC (rev 17601)
@@ -1,5 +1,37 @@
#include "gntmarshal.h"
+void gnt_closure_marshal_BOOLEAN__VOID(GClosure *closure,
+ GValue *ret_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
+ typedef gboolean (*func) (gpointer data1, gpointer data2);
+ register func callback;
+ register GCClosure *cc = (GCClosure*)closure;
+ register gpointer data1, data2;
+ gboolean ret;
+
+ g_return_if_fail(ret_value != NULL);
+ g_return_if_fail(n_param_values == 1);
+
+ if (G_CCLOSURE_SWAP_DATA(closure))
+ {
+ data1 = closure->data;
+ data2 = g_value_peek_pointer(param_values + 0);
+ }
+ else
+ {
+ data1 = g_value_peek_pointer(param_values + 0);
+ data2 = closure->data;
+ }
+
+ callback = (func) (marshal_data ? marshal_data : cc->callback);
+ ret = callback(data1, data2);
+ g_value_set_boolean(ret_value, ret);
+}
+
void gnt_closure_marshal_BOOLEAN__STRING(GClosure *closure,
GValue *ret_value,
guint n_param_values,
Modified: trunk/console/libgnt/gntmarshal.h
===================================================================
--- trunk/console/libgnt/gntmarshal.h 2006-10-28 14:24:10 UTC (rev 17600)
+++ trunk/console/libgnt/gntmarshal.h 2006-10-28 15:22:30 UTC (rev 17601)
@@ -1,5 +1,12 @@
#include "gntwidget.h"
+void gnt_closure_marshal_BOOLEAN__VOID(GClosure *closure,
+ GValue *ret_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+
void gnt_closure_marshal_BOOLEAN__STRING(GClosure *closure,
GValue *ret_value,
guint n_param_values,
Modified: trunk/console/libgnt/gntwidget.c
===================================================================
--- trunk/console/libgnt/gntwidget.c 2006-10-28 14:24:10 UTC (rev 17600)
+++ trunk/console/libgnt/gntwidget.c 2006-10-28 15:22:30 UTC (rev 17601)
@@ -21,6 +21,7 @@
SIG_SIZE_CHANGED,
SIG_POSITION,
SIG_CLICKED,
+ SIG_CONTEXT_MENU,
SIGS
};
@@ -83,6 +84,14 @@
}
static gboolean
+context_menu(GntWidget *widget, GList *null)
+{
+ gboolean ret = FALSE;
+ g_signal_emit(widget, signals[SIG_CONTEXT_MENU], 0, &ret);
+ return ret;
+}
+
+static gboolean
gnt_boolean_handled_accumulator(GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
@@ -234,11 +243,24 @@
gnt_closure_marshal_BOOLEAN__INT_INT_INT,
G_TYPE_BOOLEAN, 3, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
+ signals[SIG_CONTEXT_MENU] =
+ g_signal_new("context-menu",
+ G_TYPE_FROM_CLASS(klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ gnt_boolean_handled_accumulator, NULL,
+ gnt_closure_marshal_BOOLEAN__VOID,
+ G_TYPE_BOOLEAN, 0);
+
klass->actions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
(GDestroyNotify)gnt_widget_action_free);
klass->bindings = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
(GDestroyNotify)gnt_widget_action_param_free);
+ /* This is relevant for all widgets */
+ gnt_widget_class_register_action(klass, "context-menu", context_menu,
+ "\033" GNT_KEY_POPUP, NULL);
+
gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), klass);
GNTDEBUG;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nos...@us...> - 2006-10-28 14:24:18
|
Revision: 17600
http://svn.sourceforge.net/gaim/?rev=17600&view=rev
Author: nosnilmot
Date: 2006-10-28 07:24:10 -0700 (Sat, 28 Oct 2006)
Log Message:
-----------
I think "not loadable" is a vastly superior way to report plugins
that cannot be loaded. "unloadable" could easily be misinterpreted to mean
it was loaded and can be now removed (we actually use this meaning too!).
Modified Paths:
--------------
trunk/libgaim/plugin.c
Modified: trunk/libgaim/plugin.c
===================================================================
--- trunk/libgaim/plugin.c 2006-10-28 13:57:03 UTC (rev 17599)
+++ trunk/libgaim/plugin.c 2006-10-28 14:24:10 UTC (rev 17600)
@@ -280,13 +280,13 @@
if (error == NULL || !*error)
{
plugin->error = g_strdup(_("Unknown error"));
- gaim_debug_error("plugins", "%s is unloadable: Unknown error\n",
+ gaim_debug_error("plugins", "%s is not loadable: Unknown error\n",
plugin->path);
}
else
{
plugin->error = g_strdup(error);
- gaim_debug_error("plugins", "%s is unloadable: %s\n",
+ gaim_debug_error("plugins", "%s is not loadable: %s\n",
plugin->path, plugin->error);
}
#if GLIB_CHECK_VERSION(2,3,3)
@@ -382,7 +382,7 @@
unsigned long flags;
GList *dependencies;
GaimPluginPriority priority;
-
+
char *id;
char *name;
char *version;
@@ -433,13 +433,13 @@
plugin->error = g_strdup_printf(_("Plugin magic mismatch %d (need %d)"),
plugin->info->magic, GAIM_PLUGIN_MAGIC);
- gaim_debug_error("plugins", "%s is unloadable: Plugin magic mismatch %d (need %d)\n",
+ gaim_debug_error("plugins", "%s is not loadable: Plugin magic mismatch %d (need %d)\n",
plugin->path, plugin->info->magic, GAIM_PLUGIN_MAGIC);
plugin->unloadable = TRUE;
return plugin;
}
- gaim_debug_error("plugins", "%s is unloadable: Plugin magic mismatch %d (need %d)\n",
+ gaim_debug_error("plugins", "%s is not loadable: Plugin magic mismatch %d (need %d)\n",
plugin->path, plugin->info->magic, GAIM_PLUGIN_MAGIC);
gaim_plugin_destroy(plugin);
return NULL;
@@ -451,7 +451,7 @@
plugin->error = g_strdup_printf(_("ABI version mismatch %d.%d.x (need %d.%d.x)"),
plugin->info->major_version, plugin->info->minor_version,
GAIM_MAJOR_VERSION, GAIM_MINOR_VERSION);
- gaim_debug_error("plugins", "%s is unloadable: ABI version mismatch %d.%d.x (need %d.%d.x)\n",
+ gaim_debug_error("plugins", "%s is not loadable: ABI version mismatch %d.%d.x (need %d.%d.x)\n",
plugin->path, plugin->info->major_version, plugin->info->minor_version,
GAIM_MAJOR_VERSION, GAIM_MINOR_VERSION);
plugin->unloadable = TRUE;
@@ -466,7 +466,7 @@
(GAIM_PLUGIN_PROTOCOL_INFO(plugin)->close == NULL))
{
plugin->error = g_strdup(_("Plugin does not implement all required functions"));
- gaim_debug_error("plugins", "%s is unloadable: Plugin does not implement all required functions\n",
+ gaim_debug_error("plugins", "%s is not loadable: Plugin does not implement all required functions\n",
plugin->path);
plugin->unloadable = TRUE;
return plugin;
@@ -1377,7 +1377,7 @@
if (loader_info == NULL)
{
- gaim_debug_error("plugins", "%s is unloadable\n",
+ gaim_debug_error("plugins", "%s is not loadable, loader plugin missing loader_info\n",
plugin->path);
return FALSE;
}
@@ -1390,7 +1390,7 @@
if (prpl_info == NULL)
{
- gaim_debug_error("plugins", "%s is unloadable\n",
+ gaim_debug_error("plugins", "%s is not loadable, protocol plugin missing prpl_info\n",
plugin->path);
return FALSE;
}
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.
