[Commits] compose.c 1.382.2.583 1.382.2.584
colin at claws-mail.org
colin at claws-mail.org
Fri Oct 7 12:13:44 CEST 2011
Update of /home/claws-mail/claws/src
In directory claws-mail:/tmp/cvs-serv31821/src
Modified Files:
Tag: gtk2
compose.c
Log Message:
2011-10-07 [colin] 3.7.10cvs23
* src/compose.c
* src/gtk/gtkshruler.c
* src/gtk/gtkshruler.h
Disable ruler starting from 2.24.
Index: compose.c
===================================================================
RCS file: /home/claws-mail/claws/src/compose.c,v
retrieving revision 1.382.2.583
retrieving revision 1.382.2.584
diff -u -d -r1.382.2.583 -r1.382.2.584
--- compose.c 7 Oct 2011 09:40:14 -0000 1.382.2.583
+++ compose.c 7 Oct 2011 10:13:41 -0000 1.382.2.584
@@ -86,7 +86,7 @@
#include "socket.h"
#include "alertpanel.h"
#include "manage_window.h"
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
#include "gtkshruler.h"
#endif
#include "folder.h"
@@ -353,7 +353,7 @@
/* callback functions */
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
static gboolean compose_edit_size_alloc (GtkEditable *widget,
GtkAllocation *allocation,
GtkSHRuler *shruler);
@@ -441,7 +441,7 @@
static void compose_toggle_autoindent_cb(GtkToggleAction *action,
gpointer data);
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
static void compose_toggle_ruler_cb (GtkToggleAction *action,
gpointer data);
#endif
@@ -674,7 +674,7 @@
{"Options/Encrypt", NULL, N_("_Encrypt"), NULL, NULL, G_CALLBACK(compose_toggle_encrypt_cb) }, /* Toggle */
{"Options/RequestRetRcpt", NULL, N_("_Request Return Receipt"), NULL, NULL, G_CALLBACK(compose_toggle_return_receipt_cb) }, /* TOGGLE */
{"Options/RemoveReferences", NULL, N_("Remo_ve references"), NULL, NULL, G_CALLBACK(compose_toggle_remove_refs_cb) }, /* TOGGLE */
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
{"Tools/ShowRuler", NULL, N_("Show _ruler"), NULL, NULL, G_CALLBACK(compose_toggle_ruler_cb) }, /* Toggle */
#endif
};
@@ -794,7 +794,7 @@
{
GtkTextBuffer *buffer;
GdkColor black = {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
GdkColormap *cmap;
gboolean success[8];
#endif
@@ -869,7 +869,7 @@
color[5] = quote_bgcolor3;
color[6] = signature_color;
color[7] = uri_color;
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
cmap = gdk_drawable_get_colormap(gtk_widget_get_window(compose->window));
gdk_colormap_alloc_colors(cmap, color, 8, FALSE, TRUE, success);
@@ -2436,7 +2436,7 @@
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/InsertSig", FALSE);
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit", FALSE);
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options", FALSE);
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Tools/ShowRuler", FALSE);
#endif
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Tools/Actions", FALSE);
@@ -2547,7 +2547,7 @@
static void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
{
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
static GdkColor yellow;
static GdkColor black;
static gboolean yellow_initialised = FALSE;
@@ -2558,7 +2558,7 @@
GSList *h_list;
GtkEntry *entry;
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
if (!yellow_initialised) {
gdk_color_parse("#f5f6be", &yellow);
gdk_color_parse("#000000", &black);
@@ -2573,7 +2573,7 @@
entry = GTK_ENTRY(((ComposeHeaderEntry *)h_list->data)->entry);
if (gtk_entry_get_text(entry) &&
!g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
if (yellow_initialised) {
#endif
gtk_widget_modify_base(
@@ -2582,7 +2582,7 @@
gtk_widget_modify_text(
GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
GTK_STATE_NORMAL, &black);
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
}
#endif
}
@@ -7084,7 +7084,7 @@
GtkWidget *paned;
GtkWidget *edit_vbox;
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
GtkWidget *ruler_hbox;
GtkWidget *ruler;
#endif
@@ -7343,7 +7343,7 @@
/* phew. */
/* Tools menu */
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Tools", "ShowRuler", "Tools/ShowRuler", GTK_UI_MANAGER_MENUITEM)
#endif
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Tools", "AddressBook", "Tools/AddressBook", GTK_UI_MANAGER_MENUITEM)
@@ -7447,7 +7447,7 @@
gtk_box_pack_start(GTK_BOX(edit_vbox), subject_hbox, FALSE, FALSE, 0);
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
/* ruler */
ruler_hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(edit_vbox), ruler_hbox, FALSE, FALSE, 0);
@@ -7480,7 +7480,7 @@
gtk_text_buffer_add_selection_clipboard(buffer, clipboard);
gtk_container_add(GTK_CONTAINER(scrolledwin), text);
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
g_signal_connect_after(G_OBJECT(text), "size_allocate",
G_CALLBACK(compose_edit_size_alloc),
ruler);
@@ -7578,7 +7578,7 @@
compose->notebook = notebook;
compose->edit_vbox = edit_vbox;
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
compose->ruler_hbox = ruler_hbox;
compose->ruler = ruler;
#endif
@@ -7700,7 +7700,7 @@
compose_list = g_list_append(compose_list, compose);
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
if (!prefs_common.show_ruler)
gtk_widget_hide(ruler_hbox);
@@ -9149,7 +9149,7 @@
* includes "non-client" (windows-izm) in calculation, so this calculation
* may not be accurate.
*/
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
static gboolean compose_edit_size_alloc(GtkEditable *widget,
GtkAllocation *allocation,
GtkSHRuler *shruler)
@@ -10593,7 +10593,7 @@
compose_update_privacy_system_menu_item(compose, warn);
}
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#if !GTK_CHECK_VERSION(2, 24, 0)
static void compose_toggle_ruler_cb(GtkToggleAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
More information about the Commits
mailing list