[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Ayttm-commits] CVS: ayttm/src .cvsignore,1.1.1.1,1.2 about.c,1.1.1.1,1.
From: |
Colin Leroy <address@hidden> |
Subject: |
[Ayttm-commits] CVS: ayttm/src .cvsignore,1.1.1.1,1.2 about.c,1.1.1.1,1.2 add_contact_window.c,1.1.1.1,1.2 away_window.c,1.1.1.1,1.2 chat_room.c,1.1.1.1,1.2 chat_window.c,1.2,1.3 dialog.c,1.1.1.1,1.2 edit_account_window.c,1.1.1.1,1.2 edit_group_window.c,1.1.1.1,1.2 editcontacts.c,1.1.1.1,1.2 extgtktext.c,1.1.1.1,1.2 info_window.c,1.1.1.1,1.2 log_window.c,1.1.1.1,1.2 prefs.c,1.1.1.1,1.2 progress_window.c,1.1.1.1,1.2 sound.c,1.1.1.1,1.2 status.c,1.2,1.3 trigger.c,1.1.1.1,1.2 util.c,1.1.1.1,1.2 |
Date: |
Fri, 27 Dec 2002 11:46:55 -0500 |
Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv26423/src
Modified Files:
.cvsignore about.c add_contact_window.c away_window.c
chat_room.c chat_window.c dialog.c edit_account_window.c
edit_group_window.c editcontacts.c extgtktext.c info_window.c
log_window.c prefs.c progress_window.c sound.c status.c
trigger.c util.c
Log Message:
big commit, see ChangeLog
Index: .cvsignore
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/.cvsignore,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- .cvsignore 23 Dec 2002 22:05:29 -0000 1.1.1.1
+++ .cvsignore 27 Dec 2002 16:46:52 -0000 1.2
@@ -1,4 +1,4 @@
-everybuddy
+yattm
Makefile
.deps
.libs
Index: about.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/about.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- about.c 23 Dec 2002 22:05:29 -0000 1.1.1.1
+++ about.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -98,6 +98,7 @@
}
aboutbox = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_position(GTK_WINDOW(aboutbox), GTK_WIN_POS_MOUSE);
gtk_widget_realize(aboutbox);
vbox = gtk_vbox_new(FALSE, 0);
Index: add_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/add_contact_window.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- add_contact_window.c 23 Dec 2002 22:05:29 -0000 1.1.1.1
+++ add_contact_window.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -227,6 +227,7 @@
GdkBitmap *mask;
add_contact_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ gtk_window_set_position(GTK_WINDOW(add_contact_window),
GTK_WIN_POS_MOUSE);
gtk_widget_realize(add_contact_window);
gtk_container_set_border_width(GTK_CONTAINER(add_contact_window), 5);
Index: away_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/away_window.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- away_window.c 23 Dec 2002 22:05:29 -0000 1.1.1.1
+++ away_window.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -249,6 +249,7 @@
GdkBitmap * mask;
away_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ gtk_window_set_position(GTK_WINDOW(away_window),
GTK_WIN_POS_MOUSE);
gtk_widget_realize(away_window);
vbox = gtk_vbox_new(FALSE, 5);
Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- chat_room.c 23 Dec 2002 22:05:30 -0000 1.1.1.1
+++ chat_room.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -85,7 +85,7 @@
}
room->invite_window = gtk_window_new(GTK_WINDOW_DIALOG);
-
+ gtk_window_set_position(GTK_WINDOW(room->invite_window),
GTK_WIN_POS_MOUSE);
box = gtk_vbox_new(FALSE, 3);
box2 = gtk_hbox_new(FALSE, 3);
Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chat_window.c 26 Dec 2002 18:22:54 -0000 1.2
+++ chat_window.c 27 Dec 2002 16:46:52 -0000 1.3
@@ -692,7 +692,6 @@
gtk_table_resize(GTK_TABLE(smileys_table), 5,real_len/5
+((real_len%5==0)?0:1));
data->smiley_window = gtk_window_new(GTK_WINDOW_DIALOG);
- // gtk_window_set_position(GTK_WINDOW(data->smiley_window),
GTK_WIN_POS_MOUSE);
gtk_window_set_modal(GTK_WINDOW(data->smiley_window), FALSE);
gtk_window_set_wmclass(GTK_WINDOW(data->smiley_window), "yattm-chat",
"Yattm");
gtk_window_set_title(GTK_WINDOW(data->smiley_window), "Smileys");
Index: dialog.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/dialog.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- dialog.c 23 Dec 2002 22:05:32 -0000 1.1.1.1
+++ dialog.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -263,7 +263,7 @@
GtkWidget * button_box;
dialog_window = gtk_dialog_new();
-
+ gtk_window_set_position(GTK_WINDOW(dialog_window), GTK_WIN_POS_MOUSE);
gtk_widget_realize(dialog_window);
gtk_window_set_title(GTK_WINDOW(dialog_window), title );
@@ -405,6 +405,7 @@
input_window->data = data;
input_window->window = gtk_window_new(GTK_WINDOW_DIALOG);
+ gtk_window_set_position(GTK_WINDOW(input_window->window),
GTK_WIN_POS_MOUSE);
gtk_widget_realize(input_window->window);
gtk_container_set_border_width(GTK_CONTAINER(input_window->window), 5);
Index: edit_account_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_account_window.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- edit_account_window.c 23 Dec 2002 22:05:32 -0000 1.1.1.1
+++ edit_account_window.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -151,6 +151,7 @@
GdkBitmap *mask;
edit_account_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ gtk_window_set_position(GTK_WINDOW(edit_account_window),
GTK_WIN_POS_MOUSE);
gtk_widget_realize(edit_account_window);
gtk_container_set_border_width(GTK_CONTAINER(edit_account_window), 5);
Index: edit_group_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_group_window.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- edit_group_window.c 23 Dec 2002 22:05:36 -0000 1.1.1.1
+++ edit_group_window.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -77,6 +77,7 @@
GtkWidget * label;
edit_group_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ gtk_window_set_position(GTK_WINDOW(edit_group_window),
GTK_WIN_POS_MOUSE);
gtk_widget_realize(edit_group_window);
label = gtk_label_new(_("Group Name"));
Index: editcontacts.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/editcontacts.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- editcontacts.c 23 Dec 2002 22:05:32 -0000 1.1.1.1
+++ editcontacts.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -329,6 +329,7 @@
is_open = 1;
account_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_position(GTK_WINDOW(account_window), GTK_WIN_POS_MOUSE);
gtk_widget_realize(account_window);
account_list = gtk_clist_new_with_titles(3,text);
gtk_clist_set_column_visibility(GTK_CLIST(account_list), PASSWORD,
FALSE);
Index: extgtktext.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/extgtktext.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- extgtktext.c 23 Dec 2002 22:05:35 -0000 1.1.1.1
+++ extgtktext.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -57,6 +57,7 @@
#include <gtk/gtksignal.h>
#include <gdk/gdkprivate.h>
#include "extgtktext.h"
+#include "globals.h"
#ifdef HAVE_LIBXFT
#include <X11/Xft/Xft.h>
#endif
@@ -2550,7 +2551,7 @@
if (adjustment == text->hadj)
{
- g_warning ("horizontal scrolling not implemented");
+ eb_debug (DBG_CORE, "extgtktext: horizontal scrolling not implemented");
}
else
{
@@ -3907,6 +3908,8 @@
i += prop->length;
mark->index += prop->length;
mark->property = MARK_NEXT_LIST_PTR (mark);
+ if (mark->property == NULL)
+ break;
prop = MARK_CURRENT_PROPERTY (mark);
}
}
Index: info_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/info_window.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- info_window.c 23 Dec 2002 22:05:37 -0000 1.1.1.1
+++ info_window.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -86,7 +86,7 @@
iw->local_user = local;
iw->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
+ gtk_window_set_position(GTK_WINDOW(iw->window), GTK_WIN_POS_MOUSE);
gtk_window_set_policy(GTK_WINDOW(iw->window), TRUE, TRUE, TRUE);
gtk_widget_realize(iw->window);
Index: log_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/log_window.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- log_window.c 23 Dec 2002 22:05:36 -0000 1.1.1.1
+++ log_window.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -202,6 +202,7 @@
/* if user wants to search */
if (event->keyval == GDK_Return) {
gchar * text = gtk_entry_get_text(GTK_ENTRY(widget));
+ strip_html(text);
if(strlen(text) == 0)
return TRUE;
@@ -218,7 +219,7 @@
looped=TRUE;
}
if(!s_list) {
- printf("breaking\n");
+ eb_debug(DBG_CORE, "search: breaking\n");
/* empty !*/
break;
}
@@ -235,8 +236,13 @@
}
while(s_list) {
gchar *list_text = (gchar *)s_list->data;
+ gchar *no_html_text = NULL;
+ if (list_text)
+ no_html_text = strdup(list_text);
+ if (no_html_text)
+ strip_html(no_html_text);
/* found string ? */
- if(list_text && strstr(list_text,text) != NULL) {
+ if(no_html_text && strstr(no_html_text,text) != NULL) {
GtkEditable *editable;
/* go to the the found conversation */
gtk_clist_select_row(GTK_CLIST(lw->date_list),cur_log,0);
@@ -248,17 +254,20 @@
last_pos=cur_pos+1;
current_row=cur_log;
- /* select the matching substring
- * FIXME: we have to substract length of previously found
<smiley> or other tags */
- printf("total2=%d\n",total_length);
+ /* select the matching substring */
+ eb_debug(DBG_CORE, "search: total2=%d\n",total_length);
gtk_editable_set_position ( editable,
-
total_length+(int)(strstr(list_text,text)-list_text));
+
total_length+(int)(strstr(no_html_text,text)-no_html_text));
gtk_editable_select_region( editable,
-
total_length+(int)(strstr(list_text,text)-list_text),
-
total_length+(int)(strstr(list_text,text)-list_text)+strlen(text));
- total_length+=strlen(list_text);
+
total_length+(int)(strstr(no_html_text,text)-no_html_text),
+
total_length+(int)(strstr(no_html_text,text)-no_html_text)+strlen(text));
+ total_length+=strlen(no_html_text);
return TRUE;
- } else if (list_text) total_length+=strlen(list_text);
+ } else if (no_html_text)
+ total_length+=strlen(no_html_text);
+
+ if (no_html_text)
+ free(no_html_text);
/* next line */
s_list=s_list->next;
cur_pos++;
@@ -304,7 +313,7 @@
lw->remote = rc;
rc->logwindow = lw;
lw->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
+ gtk_window_set_position(GTK_WINDOW(lw->window), GTK_WIN_POS_MOUSE);
/* show who the conversation is with */
sprintf(buffer, _("Past conversations with %s"), rc->nick);
gtk_window_set_title(GTK_WINDOW(lw->window), buffer);
Index: prefs.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- prefs.c 23 Dec 2002 22:05:38 -0000 1.1.1.1
+++ prefs.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -110,6 +110,7 @@
prefs_vbox = gtk_vbox_new(FALSE, 5);
prefs_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ gtk_window_set_position(GTK_WINDOW(prefs_window), GTK_WIN_POS_MOUSE);
/* set current parent to prefs so error dialogs know who real
* parent is */
current_parent_widget = prefs_window;
@@ -2355,7 +2356,7 @@
val++;
val[strlen(val)-1] =
'\0';
}
- fprintf(stderr, "Adding %s:%s
to session_prefs\n", param, val);
+ eb_debug(DBG_CORE,"Adding %s:%s
to session_prefs\n", param, val);
session_prefs =
value_pair_add(session_prefs,
param, val);
}
Index: progress_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/progress_window.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- progress_window.c 23 Dec 2002 22:05:40 -0000 1.1.1.1
+++ progress_window.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -79,6 +79,7 @@
gtk_widget_show(pwd->progress_meter);
pwd->progress_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ gtk_window_set_position(GTK_WINDOW(pwd->progress_window),
GTK_WIN_POS_MOUSE);
gtk_container_add(GTK_CONTAINER(pwd->progress_window), vbox);
gtk_signal_connect( GTK_OBJECT(pwd->progress_window), "destroy",
GTK_SIGNAL_FUNC(destroy), pwd );
Index: sound.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/sound.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sound.c 23 Dec 2002 22:05:39 -0000 1.1.1.1
+++ sound.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -705,26 +705,26 @@
if(can_play_arts())
{
- printf("Using arts sound\n");
+ eb_debug(DBG_CORE,"Using arts sound\n");
play_soundfile = play_arts_file;
shutdown_sounddrv = arts_shutdown;
}
else if(can_play_esd())
{
- printf("Using esd sound\n");
+ eb_debug(DBG_CORE,"Using esd sound\n");
play_soundfile = play_esd_file;
shutdown_sounddrv = NULL;
}
/* handle sound direct to /dev/audio */
else if (can_play_audio())
{
- printf("Using raw audio\n");
+ eb_debug(DBG_CORE,"Using raw audio\n");
play_soundfile = play_audio;
shutdown_sounddrv = NULL;
}
else
{
- printf("Sound not available\n");
+ eb_debug(DBG_CORE,"Sound not available\n");
play_soundfile = NULL;
shutdown_sounddrv = NULL;
}
Index: status.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/status.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- status.c 26 Dec 2002 19:45:35 -0000 1.2
+++ status.c 27 Dec 2002 16:46:52 -0000 1.3
@@ -576,24 +576,26 @@
}
void eb_sign_on_all(GtkWidget *widget, gpointer foo) {
-
- GList *node = accounts ;
- while(node) {
- if(!(((eb_local_account*)(node->data))->connected))
- RUN_SERVICE(((eb_local_account*)(node->data)))->login(node->data) ;
- node = node->next ;
- }
-
+ GList *node = accounts ;
+ while(node) {
+ eb_local_account *ac = (eb_local_account*)(node->data);
+ if (!ac->connected) {
+ RUN_SERVICE(ac)->login(ac) ;
+ }
+ node = node->next ;
+ }
}
void eb_sign_off_all(GtkWidget *widget, gpointer foo) {
- GList *node = accounts ;
- while(node) {
- if(((eb_local_account*)(node->data))->connected)
- RUN_SERVICE(((eb_local_account*)(node->data)))->logout(node->data) ;
- node = node->next ;
- }
+ GList *node = accounts ;
+ while(node) {
+ eb_local_account *ac = (eb_local_account*)(node->data);
+ if (ac->connected) {
+ RUN_SERVICE(ac)->logout(ac) ;
+ }
+ node = node->next ;
+ }
}
@@ -1432,7 +1434,7 @@
h = 256;
if (w == 0)
w = 150;
- printf("%d %d\n",h,w);
+ eb_debug(DBG_CORE, "statuswindow size: %dx%d\n",h,w);
gtk_widget_set_usize(contact_window, w, h);
}
Index: trigger.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/trigger.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- trigger.c 23 Dec 2002 22:05:41 -0000 1.1.1.1
+++ trigger.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -308,6 +308,7 @@
window_open = 1;
edit_trigger_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ gtk_window_set_position(GTK_WINDOW(edit_trigger_window), GTK_WIN_POS_MOUSE);
gtk_widget_realize(edit_trigger_window);
gtk_container_set_border_width(GTK_CONTAINER(edit_trigger_window), 5);
Index: util.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/util.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- util.c 23 Dec 2002 22:05:40 -0000 1.1.1.1
+++ util.c 27 Dec 2002 16:46:52 -0000 1.2
@@ -1026,6 +1026,8 @@
case 'I':
case 'u':
case 'U':
+ case 'p':
+ case 'P':
if(text[i+2] == '>')
{
visible = 0;
@@ -1084,6 +1086,11 @@
}
}
break;
+ case 's':
+ if (!strncmp(text+i+2,"miley", 5)) {
+ visible = 0;
+ text[j++]=' '; /*hack*/
+ }
case '/':
visible = 0;
break;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Ayttm-commits] CVS: ayttm/src .cvsignore,1.1.1.1,1.2 about.c,1.1.1.1,1.2 add_contact_window.c,1.1.1.1,1.2 away_window.c,1.1.1.1,1.2 chat_room.c,1.1.1.1,1.2 chat_window.c,1.2,1.3 dialog.c,1.1.1.1,1.2 edit_account_window.c,1.1.1.1,1.2 edit_group_window.c,1.1.1.1,1.2 editcontacts.c,1.1.1.1,1.2 extgtktext.c,1.1.1.1,1.2 info_window.c,1.1.1.1,1.2 log_window.c,1.1.1.1,1.2 prefs.c,1.1.1.1,1.2 progress_window.c,1.1.1.1,1.2 sound.c,1.1.1.1,1.2 status.c,1.2,1.3 trigger.c,1.1.1.1,1.2 util.c,1.1.1.1,1.2,
Colin Leroy <address@hidden> <=
- Prev by Date:
[Ayttm-commits] CVS: ayttm .cvsignore,1.1.1.1,1.2 ChangeLog,1.5,1.6 configure.in,1.5,1.6
- Next by Date:
[Ayttm-commits] CVS: ayttm ChangeLog,1.6,1.7 configure.in,1.6,1.7
- Previous by thread:
[Ayttm-commits] CVS: ayttm .cvsignore,1.1.1.1,1.2 ChangeLog,1.5,1.6 configure.in,1.5,1.6
- Next by thread:
[Ayttm-commits] CVS: ayttm ChangeLog,1.6,1.7 configure.in,1.6,1.7
- Index(es):