CVS: sylpheed-claws/src/gtk gtkaspell.c,1.9.2.39,1.9.2.40 pluginwindow.c,1.5.2.29,1.5.2.30 prefswindow.c,1.12.2.25,1.12.2.26
Colin Leroy <[email protected]>
| Newsgroups | gmane.mail.sylpheed.claws.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/sylpheed-claws/sylpheed-claws/src/gtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15728/src/gtk
Modified Files:
Tag: gtk2
gtkaspell.c pluginwindow.c prefswindow.c
Log Message:
2006-04-25 [cleroy] 2.1.1cvs34
* src/compose.c
* src/gtk/gtkaspell.c
Fix crash on redirect (related to the return
of the aspell menu in compose's toolbar)
* src/image_viewer.c
* src/prefs_msg_colors.c
* src/gtk/pluginwindow.c
* src/gtk/prefswindow.c
Change released signals to clicked (Fabien)
* po/POTFILES.in
* src/common/socket.c
* src/plugins/spamassassin/spamassassin.c
Translate strings (Fabien)
Index: gtkaspell.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/gtk/gtkaspell.c,v
retrieving revision 1.9.2.39
retrieving revision 1.9.2.40
diff -u -r1.9.2.39 -r1.9.2.40
--- gtkaspell.c 19 Apr 2006 17:28:39 -0000 1.9.2.39
+++ gtkaspell.c 25 Apr 2006 16:59:46 -0000 1.9.2.40
@@ -2049,9 +2049,13 @@
{
GtkWidget *item, *submenu;
gchar *dictname;
- GtkAspeller *gtkaspeller = gtkaspell->gtkaspeller;
+ GtkAspeller *gtkaspeller = NULL;
GSList *list = NULL;
+ if (!gtkaspell)
+ return NULL;
+
+ gtkaspeller = gtkaspell->gtkaspeller;
dictname = g_strdup_printf(_("Dictionary: %s"),
gtkaspeller->dictionary->dictname);
item = gtk_menu_item_new_with_label(dictname);
Index: pluginwindow.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/gtk/pluginwindow.c,v
retrieving revision 1.5.2.29
retrieving revision 1.5.2.30
diff -u -r1.5.2.29 -r1.5.2.30
--- pluginwindow.c 28 Mar 2006 17:31:10 -0000 1.5.2.29
+++ pluginwindow.c 25 Apr 2006 16:59:46 -0000 1.5.2.30
@@ -363,11 +363,11 @@
gtk_widget_set_sensitive(GTK_WIDGET(unload_btn), FALSE);
- g_signal_connect(G_OBJECT(load_btn), "released",
+ g_signal_connect(G_OBJECT(load_btn), "clicked",
G_CALLBACK(load_cb), pluginwindow);
- g_signal_connect(G_OBJECT(unload_btn), "released",
+ g_signal_connect(G_OBJECT(unload_btn), "clicked",
G_CALLBACK(unload_cb), pluginwindow);
- g_signal_connect(G_OBJECT(close_btn), "released",
+ g_signal_connect(G_OBJECT(close_btn), "clicked",
G_CALLBACK(close_cb), pluginwindow);
g_signal_connect(G_OBJECT(window), "size_allocate",
G_CALLBACK(pluginwindow_size_allocate_cb), NULL);
Index: prefswindow.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/gtk/prefswindow.c,v
retrieving revision 1.12.2.25
retrieving revision 1.12.2.26
diff -u -r1.12.2.25 -r1.12.2.26
--- prefswindow.c 14 Jan 2006 09:45:38 -0000 1.12.2.25
+++ prefswindow.c 25 Apr 2006 16:59:47 -0000 1.12.2.26
@@ -129,7 +129,7 @@
}
}
-static void apply_button_released(GtkButton *button, gpointer user_data)
+static void apply_button_clicked(GtkButton *button, gpointer user_data)
{
PrefsWindow *prefswindow = (PrefsWindow *) user_data;
@@ -149,7 +149,7 @@
g_free(prefswindow);
}
-static void ok_button_released(GtkButton *button, gpointer user_data)
+static void ok_button_clicked(GtkButton *button, gpointer user_data)
{
PrefsWindow *prefswindow = (PrefsWindow *) user_data;
@@ -159,7 +159,7 @@
}
}
-static void cancel_button_released(GtkButton *button, gpointer user_data)
+static void cancel_button_clicked(GtkButton *button, gpointer user_data)
{
PrefsWindow *prefswindow = (PrefsWindow *) user_data;
@@ -182,7 +182,7 @@
if (event) {
switch (event->keyval) {
case GDK_Escape :
- cancel_button_released(NULL, data);
+ cancel_button_clicked(NULL, data);
break;
case GDK_Return :
case GDK_KP_Enter :
@@ -192,7 +192,7 @@
* and text (anything that accepts return) (can pass
* NULL to any of the GTK_xxx() casts) */
if (!GTK_IS_TEXT_VIEW(focused_child))
- ok_button_released(NULL, data);
+ ok_button_clicked(NULL, data);
break;
default:
break;
@@ -424,12 +424,12 @@
gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->confirm_area, 0, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 2);
- g_signal_connect(G_OBJECT(prefswindow->ok_btn), "released",
- G_CALLBACK(ok_button_released), prefswindow);
- g_signal_connect(G_OBJECT(prefswindow->cancel_btn), "released",
- G_CALLBACK(cancel_button_released), prefswindow);
- g_signal_connect(G_OBJECT(prefswindow->apply_btn), "released",
- G_CALLBACK(apply_button_released), prefswindow);
+ g_signal_connect(G_OBJECT(prefswindow->ok_btn), "clicked",
+ G_CALLBACK(ok_button_clicked), prefswindow);
+ g_signal_connect(G_OBJECT(prefswindow->cancel_btn), "clicked",
+ G_CALLBACK(cancel_button_clicked), prefswindow);
+ g_signal_connect(G_OBJECT(prefswindow->apply_btn), "clicked",
+ G_CALLBACK(apply_button_clicked), prefswindow);
g_signal_connect(G_OBJECT(prefswindow->window), "delete_event",
G_CALLBACK(window_closed), prefswindow);
g_signal_connect(G_OBJECT(prefswindow->window), "key_press_event",
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642