2007-07-27 [paul] 2.10.0cvs75

	* src/mainwindow.c
	* src/manual.c
	* src/manual.h
	* src/gtk/gtkutils.c
		make mainwindow's /Help/Manual point to the
		remote copy if the local copy doesn't exist

diff --git a/ChangeLog b/ChangeLog
index 585d6a22adefe0a0869595257ee2c7f78c788bd9..68ea5eaef094c90e50f6ff96a4b04f8dc56d40d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-27 [paul]      2.10.0cvs75
+
+       * src/mainwindow.c
+       * src/manual.c
+       * src/manual.h
+       * src/gtk/gtkutils.c
+               make mainwindow's /Help/Manual point to the
+               remote copy if the local copy doesn't exist
+
 2007-07-27 [paul]      2.10.0cvs74
 
        * src/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index c97620381b1f5abfdbb73a2dbc17a9f34e94dd17..6400da188db26a56d5328808089e56327cb13977 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2728,3 +2728,4 @@
 ( cvs diff -u -r 1.395.2.315 -r 1.395.2.316 src/summaryview.c;  ) > 2.10.0cvs72.patchset
 ( cvs diff -u -r 1.52.2.42 -r 1.52.2.43 src/prefs_folder_item.c;  ) > 2.10.0cvs73.patchset
 ( cvs diff -u -r 1.155.2.72 -r 1.155.2.73 src/Makefile.am;  cvs diff -u -r 1.60.2.35 -r 1.60.2.36 src/filtering.c;  cvs diff -u -r 1.213.2.151 -r 1.213.2.152 src/folder.c;  cvs diff -u -r 1.274.2.202 -r 1.274.2.203 src/mainwindow.c;  cvs diff -u -r 1.75.2.44 -r 1.75.2.45 src/matcher.c;  cvs diff -u -r 1.39.2.14 -r 1.39.2.15 src/matcher.h;  cvs diff -u -r 1.25.2.30 -r 1.25.2.31 src/matcher_parser_parse.y;  cvs diff -u -r 1.150.2.100 -r 1.150.2.101 src/procmsg.c;  cvs diff -u -r 1.60.2.46 -r 1.60.2.47 src/procmsg.h;  cvs diff -u -r 1.25.2.44 -r 1.25.2.45 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.30 -r 1.18.2.31 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.316 -r 1.395.2.317 src/summaryview.c;  cvs diff -u -r 1.68.2.39 -r 1.68.2.40 src/summaryview.h;  cvs diff -u -r 1.43.2.79 -r 1.43.2.80 src/toolbar.c;  cvs diff -u -r 1.19.2.21 -r 1.19.2.22 src/toolbar.h;  diff -u /dev/null src/pixmaps/watchthread.xpm;  ) > 2.10.0cvs74.patchset
+( cvs diff -u -r 1.274.2.203 -r 1.274.2.204 src/mainwindow.c;  cvs diff -u -r 1.11.2.12 -r 1.11.2.13 src/manual.c;  cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/manual.h;  cvs diff -u -r 1.5.2.61 -r 1.5.2.62 src/gtk/gtkutils.c;  ) > 2.10.0cvs75.patchset

diff --git a/configure.ac b/configure.ac
index 39cb0ad90eae4dcc5afcab71cc99b25a256e16b4..b2ba0a1ad0ddca8c57a7a6fd74b053219c92b673 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=74
+EXTRA_VERSION=75
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 792667e407cc747bc629ddf10b6bdaba9d36332e..5f5942a4387f34514e5638f21397c1e9879a04ec 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -116,7 +116,7 @@ void gtkut_stock_button_add_help(GtkWidget *bbox, GtkWidget **help_btn)
        gtk_button_box_set_child_secondary(GTK_BUTTON_BOX (bbox),
                        *help_btn, TRUE);
        gtk_widget_set_sensitive(*help_btn,
-                       manual_available(MANUAL_MANUAL_LOCAL));
+                       manual_available(MANUAL_MANUAL_CLAWS));
        gtk_widget_show(*help_btn);
 }
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index ef829dfa39b34122e2be9e869139792103a30c14..bd4f762abab730ed363c8ca804448dc6fd4f1d52 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -916,7 +916,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Configuration/Plu_gins..."),     NULL, plugins_open_cb, 0, NULL},
 
        {N_("/_Help"),                          NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_Manual"),                  NULL, manual_open_cb, MANUAL_MANUAL_LOCAL, NULL},
+       {N_("/_Help/_Manual"),                  NULL, manual_open_cb, MANUAL_MANUAL_CLAWS, NULL},
        {N_("/_Help/_Online User-contributed FAQ"),     
                                                NULL, manual_open_cb, MANUAL_FAQ_CLAWS, NULL},
        {N_("/_Help/Icon _Legend"),             NULL, legend_open_cb, 0, NULL},
@@ -1407,8 +1407,6 @@ MainWindow *main_window_create()
 /*     gtk_widget_show(gtk_item_factory_get_item(ifactory,"/Message/Mailing-List"));
        main_create_mailing_list_menu (mainwin, NULL); */
 
-       menu_set_sensitive(ifactory, "/Help/Manual", manual_available(MANUAL_MANUAL_LOCAL));
-
        if (prefs_common.toolbar_detachable) {
                handlebox = gtk_handle_box_new();
                gtk_widget_show(handlebox);

diff --git a/src/manual.c b/src/manual.c
index 97b897c21fb256c522fdbe2a853469c8080029f5..690a5479eef872d619bb872a988cd171f06933f9 100644 (file)
--- a/src/manual.c
+++ b/src/manual.c
@@ -92,7 +92,7 @@ gboolean manual_available(ManualType type)
        gchar *dir = NULL, *uri = NULL;
        
        switch (type) {
-               case MANUAL_MANUAL_LOCAL:
+               case MANUAL_MANUAL_CLAWS:
                        dir = get_local_path_with_locale(MANUALDIR);
                        if (dir != NULL) {
                                uri = g_strconcat(dir, G_DIR_SEPARATOR_S, MANUAL_HTML_INDEX, NULL);
@@ -117,7 +117,7 @@ void manual_open(ManualType type, gchar *url_anchor)
        gchar *dir;
 
        switch (type) {
-               case MANUAL_MANUAL_LOCAL:
+               case MANUAL_MANUAL_CLAWS:
                        dir = get_local_path_with_locale(MANUALDIR);
                        if (dir != NULL) {
                                gchar *tmp_anchor = NULL;
@@ -129,6 +129,8 @@ void manual_open(ManualType type, gchar *url_anchor)
                                                NULL);
                                g_free(tmp_anchor);
                                g_free(dir);
+                       } else {
+                               uri = g_strconcat(MANUAL_URI, NULL);
                        }
                        break;
                case MANUAL_FAQ_CLAWS:
@@ -144,5 +146,5 @@ void manual_open(ManualType type, gchar *url_anchor)
 
 void manual_open_with_anchor_cb(GtkWidget *widget, gchar *url_anchor)
 {
-       manual_open(MANUAL_MANUAL_LOCAL, url_anchor);
+       manual_open(MANUAL_MANUAL_CLAWS, url_anchor);
 }

diff --git a/src/manual.h b/src/manual.h
index 1c23f846f096f6c62efb9d6363c9bce947bed792..22c1c9166d06965615c7f0672b1bc83a51dd3573 100644 (file)
--- a/src/manual.h
+++ b/src/manual.h
@@ -22,7 +22,7 @@
 
 typedef enum
 {
-       MANUAL_MANUAL_LOCAL,
+       MANUAL_MANUAL_CLAWS,
        MANUAL_FAQ_CLAWS,
 } ManualType;