Menu
▾
▴
[Gaim-commits] CVS: gaim/src buddy.c,1.392,1.393 dialogs.c,1.416,1.417
|
From: Luke S. <lsc...@us...> - 2003-01-30 15:15:26
|
Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11430/src
Modified Files:
buddy.c dialogs.c
Log Message:
E'ric Boumaour (zongo_fr) writes:
"gtkconv.c and gtkutils.c in POTFILES.in
gettextized some strings in dialogs.c
French translation file update and entry in gaim.desktop"
Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -d -r1.392 -r1.393
--- buddy.c 28 Jan 2003 21:47:44 -0000 1.392
+++ buddy.c 30 Jan 2003 15:15:13 -0000 1.393
@@ -2324,17 +2324,21 @@
* more likely to work correctly. - Robot101 */
gint x, y;
- gtk_window_get_position(GTK_WINDOW(blist), &x, &y);
+ /* check for visibility because when we aren't visible, this will *
+ * give us bogus (0,0) coordinates. - xOr */
+ if (GTK_WIDGET_VISIBLE(blist)) {
+ gtk_window_get_position(GTK_WINDOW(blist), &x, &y);
- if (x != blist_pos.x ||
- y != blist_pos.y ||
- event->width != blist_pos.width ||
- event->height != blist_pos.height) {
- blist_pos.x = x;
- blist_pos.y = y;
- blist_pos.width = event->width;
- blist_pos.height = event->height;
- save_prefs();
+ if (x != blist_pos.x ||
+ y != blist_pos.y ||
+ event->width != blist_pos.width ||
+ event->height != blist_pos.height) {
+ blist_pos.x = x;
+ blist_pos.y = y;
+ blist_pos.width = event->width;
+ blist_pos.height = event->height;
+ save_prefs();
+ }
}
return FALSE;
}
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -d -r1.416 -r1.417
--- dialogs.c 26 Jan 2003 04:27:14 -0000 1.416
+++ dialogs.c 30 Jan 2003 15:15:15 -0000 1.417
@@ -405,7 +405,7 @@
g_free(filename);
gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
- w->window = gtk_dialog_new_with_buttons("", GTK_WINDOW(c->window), GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, "_Warn", GTK_RESPONSE_OK, NULL);
+ w->window = gtk_dialog_new_with_buttons("", GTK_WINDOW(c->window), GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("_Warn"), GTK_RESPONSE_OK, NULL);
gtk_dialog_set_default_response (GTK_DIALOG(w->window), GTK_RESPONSE_OK);
g_signal_connect(G_OBJECT(w->window), "response", G_CALLBACK(do_warn), w);
@@ -689,7 +689,7 @@
if (!imdialog) {
info = g_new0(struct getuserinfo, 1);
info->gc = connections->data;
- imdialog = gtk_dialog_new_with_buttons("Gaim - New Message", blist ? GTK_WINDOW(blist) : NULL, GTK_DIALOG_MODAL,
+ imdialog = gtk_dialog_new_with_buttons(_("Gaim - New Message"), blist ? GTK_WINDOW(blist) : NULL, GTK_DIALOG_MODAL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
gtk_dialog_set_default_response (GTK_DIALOG(imdialog), GTK_RESPONSE_OK);
gtk_container_set_border_width (GTK_CONTAINER(imdialog), 6);
@@ -787,7 +787,7 @@
g_free(filename);
info->gc = connections->data;
- window = gtk_dialog_new_with_buttons("Gaim - Get User Info", blist ? GTK_WINDOW(blist) : NULL, GTK_DIALOG_MODAL,
+ window = gtk_dialog_new_with_buttons(_("Gaim - Get User Info"), blist ? GTK_WINDOW(blist) : NULL, GTK_DIALOG_MODAL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
gtk_dialog_set_default_response (GTK_DIALOG(window), GTK_RESPONSE_OK);
gtk_container_set_border_width (GTK_CONTAINER(window), 6);
@@ -1706,7 +1706,7 @@
while (u) {
a = (struct aim_user *)u->data;
p = (struct prpl *)find_prpl(a->protocol);
- g_snprintf(buf, sizeof buf, "%s (%s)", a->username, (p && p->name)?p->name:"Unknown");
+ g_snprintf(buf, sizeof buf, "%s (%s)", a->username, (p && p->name)?p->name:_("Unknown"));
opt = gtk_menu_item_new_with_label(buf);
gtk_object_set_user_data(GTK_OBJECT(opt), a);
g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(pounce_choose), b);
@@ -2064,7 +2064,7 @@
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_widget_show(vbox);
- g_snprintf(buf, sizeof(buf), "Setting Dir Info for %s:", gc->username);
+ g_snprintf(buf, sizeof(buf), _("Setting Dir Info for %s:"), gc->username);
label = gtk_label_new(buf);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 5);
gtk_widget_show(label);
@@ -2249,7 +2249,7 @@
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_widget_show(vbox);
- g_snprintf(buf, sizeof(buf), "Changing password for %s:", gc->username);
+ g_snprintf(buf, sizeof(buf), _("Changing password for %s:"), gc->username);
label = gtk_label_new(buf);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 5);
gtk_widget_show(label);
@@ -2339,7 +2339,7 @@
gtk_widget_show(vbox);
buf = g_malloc(256);
- g_snprintf(buf, 256, "Changing info for %s:", tmp->username);
+ g_snprintf(buf, 256, _("Changing info for %s:"), tmp->username);
label = gtk_label_new(buf);
g_free(buf);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 5);
@@ -4075,7 +4075,7 @@
g_snprintf(filename, 256, "%s" G_DIR_SEPARATOR_S "logs" G_DIR_SEPARATOR_S "system", tmp);
}
if ((fp = fopen(filename, "r")) == NULL) {
- g_snprintf(buf, BUF_LONG, "Couldn't open log file %s.", filename);
+ g_snprintf(buf, BUF_LONG, _("Couldn't open log file %s."), filename);
do_error_dialog(buf, strerror(errno), GAIM_ERROR);
return;
}
@@ -4195,9 +4195,9 @@
g_signal_connect(GTK_OBJECT(window), "destroy", G_CALLBACK(des_log_win), NULL);
gtk_window_set_role(GTK_WINDOW(window), "log");
if (name)
- g_snprintf(buf, BUF_LONG, "Gaim - Conversations with %s", name);
+ g_snprintf(buf, BUF_LONG, _("Gaim - Conversations with %s"), name);
else
- g_snprintf(buf, BUF_LONG, "Gaim - System Log");
+ g_snprintf(buf, BUF_LONG, _("Gaim - System Log"));
gtk_window_set_title(GTK_WINDOW(window), buf);
gtk_container_set_border_width(GTK_CONTAINER(window), 10);
gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
@@ -4218,7 +4218,7 @@
char *tmp = gaim_user_dir();
g_snprintf(filename, 256, "%s" G_DIR_SEPARATOR_S "logs" G_DIR_SEPARATOR_S "%s.log", tmp, normalize(name));
if ((fp = fopen(filename, "r")) == NULL) {
- g_snprintf(buf, BUF_LONG, "Couldn't open log file %s", filename);
+ g_snprintf(buf, BUF_LONG, _("Couldn't open log file %s"), filename);
do_error_dialog(buf, strerror(errno), GAIM_ERROR);
return;
}
|