2007-02-04 [colin] 2.7.2cvs21

	* src/compose.c
	* src/plugins/pgpcore/passphrase.c
	* src/plugins/pgpcore/select-keys.c
		Set wmclass on new windows

diff --git a/ChangeLog b/ChangeLog
index 073d4b5c902ea44dcd42ae9b2f0b9074fb65d1b6..b70c369cabccdb62ce8c09aa220a82264646f649 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-04 [colin]     2.7.2cvs21
+
+       * src/compose.c
+       * src/plugins/pgpcore/passphrase.c
+       * src/plugins/pgpcore/select-keys.c
+               Set wmclass on new windows
+

 2007-02-04 [colin]     2.7.2cvs20
 
        * src/compose.c
 2007-02-04 [colin]     2.7.2cvs20
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 0521ff1c2a13c103693f29100f6d0d2810392460..902a65926eb501c65381ee95059a469a54f7d22c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2338,3 +2338,4 @@
 ( cvs diff -u -r 1.115.2.132 -r 1.115.2.133 src/main.c;  ) > 2.7.2cvs18.patchset
 ( cvs diff -u -r 1.115.2.133 -r 1.115.2.134 src/main.c;  ) > 2.7.2cvs19.patchset
 ( cvs diff -u -r 1.61.2.58 -r 1.61.2.59 src/account.c;  cvs diff -u -r 1.9.2.12 -r 1.9.2.13 src/addressadd.c;  cvs diff -u -r 1.60.2.79 -r 1.60.2.80 src/addressbook.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/addressbook_foldersel.c;  cvs diff -u -r 1.5.10.16 -r 1.5.10.17 src/addrgather.c;  cvs diff -u -r 1.382.2.356 -r 1.382.2.357 src/compose.c;  cvs diff -u -r 1.50.2.31 -r 1.50.2.32 src/compose.h;  cvs diff -u -r 1.23.2.21 -r 1.23.2.22 src/crash.c;  cvs diff -u -r 1.14.2.22 -r 1.14.2.23 src/editaddress.c;  cvs diff -u -r 1.5.12.9 -r 1.5.12.10 src/editbook.c;  cvs diff -u -r 1.11.2.15 -r 1.11.2.16 src/editgroup.c;  cvs diff -u -r 1.5.12.12 -r 1.5.12.13 src/editjpilot.c;  cvs diff -u -r 1.8.2.19 -r 1.8.2.20 src/editldap.c;  cvs diff -u -r 1.10.2.10 -r 1.10.2.11 src/editldap_basedn.c;  cvs diff -u -r 1.5.12.11 -r 1.5.12.12 src/editvcard.c;  cvs diff -u -r 1.3.2.20 -r 1.3.2.21 src/exphtmldlg.c;  cvs diff -u -r 1.1.4.24 -r 1.1.4.25 src/expldifdlg.c;  cvs diff -u -r 1.8.2.23 -r 1.8.2.24 src/export.c;  cvs diff -u -r 1.26.2.31 -r 1.26.2.32 src/foldersel.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gedit-print.c;  cvs diff -u -r 1.13.2.21 -r 1.13.2.22 src/import.c;  cvs diff -u -r 1.14.2.12 -r 1.14.2.13 src/importldif.c;  cvs diff -u -r 1.4.12.15 -r 1.4.12.16 src/importmutt.c;  cvs diff -u -r 1.1.14.15 -r 1.1.14.16 src/importpine.c;  cvs diff -u -r 1.115.2.134 -r 1.115.2.135 src/main.c;  cvs diff -u -r 1.274.2.170 -r 1.274.2.171 src/mainwindow.c;  cvs diff -u -r 1.3.12.23 -r 1.3.12.24 src/message_search.c;  cvs diff -u -r 1.94.2.122 -r 1.94.2.123 src/messageview.c;  cvs diff -u -r 1.60.2.44 -r 1.60.2.45 src/prefs_actions.c;  cvs diff -u -r 1.16.2.25 -r 1.16.2.26 src/prefs_customheader.c;  cvs diff -u -r 1.16.2.23 -r 1.16.2.24 src/prefs_display_header.c;  cvs diff -u -r 1.59.2.52 -r 1.59.2.53 src/prefs_filtering.c;  cvs diff -u -r 1.1.4.32 -r 1.1.4.33 src/prefs_filtering_action.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_folder_column.c;  cvs diff -u -r 1.10.2.28 -r 1.10.2.29 src/prefs_gtk.c;  cvs diff -u -r 1.43.2.52 -r 1.43.2.53 src/prefs_matcher.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_other.c;  cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/prefs_summaries.c;  cvs diff -u -r 1.10.2.16 -r 1.10.2.17 src/prefs_summary_column.c;  cvs diff -u -r 1.12.2.39 -r 1.12.2.40 src/prefs_template.c;  cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/sourcewindow.c;  cvs diff -u -r 1.3.2.27 -r 1.3.2.28 src/ssl_manager.c;  cvs diff -u -r 1.15.2.43 -r 1.15.2.44 src/summary_search.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/uri_opener.c;  cvs diff -u -r 1.4.2.48 -r 1.4.2.49 src/gtk/about.c;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/gtk/description_window.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/foldersort.c;  cvs diff -u -r 1.5.2.51 -r 1.5.2.52 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.31 -r 1.4.2.32 src/gtk/gtkutils.h;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/icon_legend.c;  cvs diff -u -r 1.1.4.25 -r 1.1.4.26 src/gtk/logwindow.c;  cvs diff -u -r 1.5.2.43 -r 1.5.2.44 src/gtk/pluginwindow.c;  cvs diff -u -r 1.12.2.31 -r 1.12.2.32 src/gtk/prefswindow.c;  ) > 2.7.2cvs20.patchset
 ( cvs diff -u -r 1.115.2.132 -r 1.115.2.133 src/main.c;  ) > 2.7.2cvs18.patchset
 ( cvs diff -u -r 1.115.2.133 -r 1.115.2.134 src/main.c;  ) > 2.7.2cvs19.patchset
 ( cvs diff -u -r 1.61.2.58 -r 1.61.2.59 src/account.c;  cvs diff -u -r 1.9.2.12 -r 1.9.2.13 src/addressadd.c;  cvs diff -u -r 1.60.2.79 -r 1.60.2.80 src/addressbook.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/addressbook_foldersel.c;  cvs diff -u -r 1.5.10.16 -r 1.5.10.17 src/addrgather.c;  cvs diff -u -r 1.382.2.356 -r 1.382.2.357 src/compose.c;  cvs diff -u -r 1.50.2.31 -r 1.50.2.32 src/compose.h;  cvs diff -u -r 1.23.2.21 -r 1.23.2.22 src/crash.c;  cvs diff -u -r 1.14.2.22 -r 1.14.2.23 src/editaddress.c;  cvs diff -u -r 1.5.12.9 -r 1.5.12.10 src/editbook.c;  cvs diff -u -r 1.11.2.15 -r 1.11.2.16 src/editgroup.c;  cvs diff -u -r 1.5.12.12 -r 1.5.12.13 src/editjpilot.c;  cvs diff -u -r 1.8.2.19 -r 1.8.2.20 src/editldap.c;  cvs diff -u -r 1.10.2.10 -r 1.10.2.11 src/editldap_basedn.c;  cvs diff -u -r 1.5.12.11 -r 1.5.12.12 src/editvcard.c;  cvs diff -u -r 1.3.2.20 -r 1.3.2.21 src/exphtmldlg.c;  cvs diff -u -r 1.1.4.24 -r 1.1.4.25 src/expldifdlg.c;  cvs diff -u -r 1.8.2.23 -r 1.8.2.24 src/export.c;  cvs diff -u -r 1.26.2.31 -r 1.26.2.32 src/foldersel.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gedit-print.c;  cvs diff -u -r 1.13.2.21 -r 1.13.2.22 src/import.c;  cvs diff -u -r 1.14.2.12 -r 1.14.2.13 src/importldif.c;  cvs diff -u -r 1.4.12.15 -r 1.4.12.16 src/importmutt.c;  cvs diff -u -r 1.1.14.15 -r 1.1.14.16 src/importpine.c;  cvs diff -u -r 1.115.2.134 -r 1.115.2.135 src/main.c;  cvs diff -u -r 1.274.2.170 -r 1.274.2.171 src/mainwindow.c;  cvs diff -u -r 1.3.12.23 -r 1.3.12.24 src/message_search.c;  cvs diff -u -r 1.94.2.122 -r 1.94.2.123 src/messageview.c;  cvs diff -u -r 1.60.2.44 -r 1.60.2.45 src/prefs_actions.c;  cvs diff -u -r 1.16.2.25 -r 1.16.2.26 src/prefs_customheader.c;  cvs diff -u -r 1.16.2.23 -r 1.16.2.24 src/prefs_display_header.c;  cvs diff -u -r 1.59.2.52 -r 1.59.2.53 src/prefs_filtering.c;  cvs diff -u -r 1.1.4.32 -r 1.1.4.33 src/prefs_filtering_action.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_folder_column.c;  cvs diff -u -r 1.10.2.28 -r 1.10.2.29 src/prefs_gtk.c;  cvs diff -u -r 1.43.2.52 -r 1.43.2.53 src/prefs_matcher.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_other.c;  cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/prefs_summaries.c;  cvs diff -u -r 1.10.2.16 -r 1.10.2.17 src/prefs_summary_column.c;  cvs diff -u -r 1.12.2.39 -r 1.12.2.40 src/prefs_template.c;  cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/sourcewindow.c;  cvs diff -u -r 1.3.2.27 -r 1.3.2.28 src/ssl_manager.c;  cvs diff -u -r 1.15.2.43 -r 1.15.2.44 src/summary_search.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/uri_opener.c;  cvs diff -u -r 1.4.2.48 -r 1.4.2.49 src/gtk/about.c;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/gtk/description_window.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/foldersort.c;  cvs diff -u -r 1.5.2.51 -r 1.5.2.52 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.31 -r 1.4.2.32 src/gtk/gtkutils.h;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/icon_legend.c;  cvs diff -u -r 1.1.4.25 -r 1.1.4.26 src/gtk/logwindow.c;  cvs diff -u -r 1.5.2.43 -r 1.5.2.44 src/gtk/pluginwindow.c;  cvs diff -u -r 1.12.2.31 -r 1.12.2.32 src/gtk/prefswindow.c;  ) > 2.7.2cvs20.patchset

+( cvs diff -u -r 1.382.2.357 -r 1.382.2.358 src/compose.c;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/pgpcore/select-keys.c;  ) > 2.7.2cvs21.patchset

diff --git a/configure.ac b/configure.ac
index 81e7b28b2e6614b48e24e8141dc71f23630c4f67..07c8d050ea5cc48b8035e6c514ff70d3ce2a5584 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=20
+EXTRA_VERSION=21

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 8e80c360d3eedb54c1ec04377b99643ec95ba89e..edf807979bed39e741c1eaff16b8c8add9d832b2 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -7354,7 +7354,7 @@ static void compose_attach_property_create(gboolean *cancelled)
 
        debug_print("Creating attach_property window...\n");
 
 
        debug_print("Creating attach_property window...\n");
 

-       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "compose");
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "compose_attach_property");

        gtk_widget_set_size_request(window, 480, -1);
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
        gtk_window_set_title(GTK_WINDOW(window), _("Properties"));
        gtk_widget_set_size_request(window, 480, -1);
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
        gtk_window_set_title(GTK_WINDOW(window), _("Properties"));

diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index a88397734e41b51dedc455aca718872358b5cd4a..903c3cfd40222ae8ec82475cdd5975f2efedf24f 100644 (file)
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -93,7 +93,7 @@ passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, gi
     
     gtk_menu_popdown(GTK_MENU(summaryview->popupmenu));
 
     
     gtk_menu_popdown(GTK_MENU(summaryview->popupmenu));
 

-    window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "passphrase");

     gtk_window_set_title(GTK_WINDOW(window), _("Passphrase"));
     gtk_window_set_default_size(GTK_WINDOW(window), 375, 100);
     gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
     gtk_window_set_title(GTK_WINDOW(window), _("Passphrase"));
     gtk_window_set_default_size(GTK_WINDOW(window), 375, 100);
     gtk_window_set_resizable(GTK_WINDOW(window), TRUE);

diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index 4ba1f3d205a11805d16c9961406a74e1db436516..83d772a471f88c27f4921caba153195286920c21 100644 (file)
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -370,7 +370,7 @@ create_dialog (struct select_keys_s *sk)
     const char *titles[N_COL_TITLES];
 
     g_assert (!sk->window);
     const char *titles[N_COL_TITLES];
 
     g_assert (!sk->window);

-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    window = gtkut_window_new (GTK_WINDOW_TOPLEVEL, "select-keys");

     gtk_widget_set_size_request (window, 520, 280);
     gtk_container_set_border_width (GTK_CONTAINER (window), 8);
     gtk_window_set_title (GTK_WINDOW (window), _("Select Keys"));
     gtk_widget_set_size_request (window, 520, 280);
     gtk_container_set_border_width (GTK_CONTAINER (window), 8);
     gtk_window_set_title (GTK_WINDOW (window), _("Select Keys"));