Menu
▾
▴
[Corem-cvs] CORE CVS: src smugg
|
From: CORE C. L. <cor...@li...> - 2000-11-30 22:28:22
|
Core CVS committal
Author : smugg
Project : core
Module : src
Modified Files:
callbacks.c main.c menus.c panes.c
Log Message:
bleh just tested som stuff iirc
===================================================================
RCS file: /cvsroot/corem/core/src/callbacks.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- callbacks.c 2000/11/27 10:12:11 1.33
+++ callbacks.c 2000/11/30 22:28:21 1.34
@@ -1,8 +1,12 @@
+#include <gdk/gdk.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <signal.h>
+
#include "message.h"
#include "core.h"
#include "callbacks.h"
#include "panes.h"
-#include <signal.h>
#define TIMEOUT 30
@@ -479,33 +483,26 @@
break;
col = 0;
-
- if (config.ml_from == 1) {
- found = find_header(head, "From:");
- if (found)
- text[col] = header_get_value(found);
- else
- text[col] = g_strdup("");
- col++;
- }
- if (config.ml_subject == 1) {
+ found = find_header(head, "From:");
+ if (found)
+ text[col] = header_get_value(found);
+ else
+ text[col] = g_strdup("");
+ col++;
found = find_header(head, "Subject:");
- if (found)
- text[col] = header_get_value(found);
- else
- text[col] = g_strdup("");
- col++;
- }
-
- if (config.ml_date == 1) {
- found = find_header(head, "Date:");
- if (found)
- text[col] = header_get_value(found);
- else
- text[col] = g_strdup("");
- col++;
- }
+ if (found)
+ text[col] = header_get_value(found);
+ else
+ text[col] = g_strdup("");
+ col++;
+
+ found = find_header(head, "Date:");
+ if (found)
+ text[col] = header_get_value(found);
+ else
+ text[col] = g_strdup("");
+ col++;
if (config.ml_server == 1) {
found = find_header(head, "Server:");
===================================================================
RCS file: /cvsroot/corem/core/src/main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- main.c 2000/11/23 02:23:03 1.15
+++ main.c 2000/11/30 22:28:21 1.16
@@ -6,9 +6,9 @@
#include <sys/types.h>
#define PREFIX "/usr"
+gchar *theme, *title;
GtkWidget *message_pane;
ConfigData config;
-gchar *title;
GtkWidget *main_win;
GtkWidget *mhandle;
GtkWidget *thandle;
@@ -18,7 +18,6 @@
GtkWidget *reply;
GtkWidget *reply_all;
GtkWidget *forward;
-gchar *theme;
int main(int argc, char **argv)
{
@@ -93,8 +92,6 @@
thandle = gtk_handle_box_new();
create_main_toolbar();
-
-
hpane = gtk_hpaned_new();
{
@@ -118,6 +115,7 @@
gtk_box_pack_start(GTK_BOX(main_vbox), thandle, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(main_vbox), hpane, TRUE, TRUE, 0);
+
gtk_widget_show_all(main_win);
if (config.tb_show == 0) {
@@ -160,6 +158,10 @@
g_strconcat(CORE_SHARE, "/themes/", config.theme, "/",
NULL);
return TRUE;
+ }
+
+ else {
+ create_error_window(g_strdup("ERROR"), g_strdup("Theme not found"), g_strdup("Quit"));
}
return FALSE;
===================================================================
RCS file: /cvsroot/corem/core/src/menus.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- menus.c 2000/11/23 09:32:12 1.10
+++ menus.c 2000/11/30 22:28:21 1.11
@@ -46,7 +46,7 @@
*mline_tabbed, *folder_list, *folder_listmenu, *fline_style,
*fline_stylemenu, *fline_none, *fline_solid, *fline_dotted,
*fline_tabbed, *mpriority, *mread, *mattachment, *mscore,
- *mfrom, *msubject, *mdate, *mserver;
+ *mserver;
GSList *radio_buttons = NULL;
GSList *mline_radio = NULL;
GSList *fline_radio = NULL;
@@ -265,28 +265,6 @@
gtk_menu_append(GTK_MENU(message_listmenu), mscore);
if (config.ml_score == 1)
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mscore),
- TRUE);
-
- mfrom = gtk_check_menu_item_new_with_label("Show From");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mfrom), FALSE);
- gtk_menu_append(GTK_MENU(message_listmenu), mfrom);
- if (config.ml_from == 1)
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mfrom),
- TRUE);
-
- msubject = gtk_check_menu_item_new_with_label("Show Subject");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(msubject),
- FALSE);
- gtk_menu_append(GTK_MENU(message_listmenu), msubject);
- if (config.ml_subject == 1)
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM
- (msubject), TRUE);
-
- mdate = gtk_check_menu_item_new_with_label("Show Date");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mdate), FALSE);
- gtk_menu_append(GTK_MENU(message_listmenu), mdate);
- if (config.ml_date == 1)
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mdate),
TRUE);
mserver = gtk_check_menu_item_new_with_label("Show Server");
===================================================================
RCS file: /cvsroot/corem/core/src/panes.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- panes.c 2000/11/26 23:32:45 1.18
+++ panes.c 2000/11/30 22:28:21 1.19
@@ -135,24 +135,18 @@
iserver;
gchar **text = NULL;
- if (config.ml_from == 1) {
- field_titles[col] = "From";
- ifrom = col;
- col++;
- }
-
- if (config.ml_subject == 1) {
- field_titles[col] = "Subject";
- isubject = col;
- col++;
- }
+ field_titles[col] = "From";
+ ifrom = col;
+ col++;
+
+ field_titles[col] = "Subject";
+ isubject = col;
+ col++;
+
+ field_titles[col] = "Date";
+ idate = col;
+ col++;
- if (config.ml_date == 1) {
- field_titles[col] = "Date";
- idate = col;
- col++;
- }
-
if (config.ml_server == 1) {
field_titles[col] = "Server";
iserver = col;
@@ -195,22 +189,16 @@
gdk_font_ref(style->font);
gtk_widget_set_style(mail_ctree, style);
- if (config.ml_from == 1) {
gtk_clist_set_column_width(GTK_CLIST(mail_ctree), ifrom,
237);
gtk_clist_set_column_auto_resize(GTK_CLIST(mail_ctree),
ifrom, FALSE);
- }
- if (config.ml_subject == 1) {
gtk_clist_set_column_width(GTK_CLIST(mail_ctree), isubject,
175);
- }
- if (config.ml_date == 1) {
gtk_clist_set_column_width(GTK_CLIST(mail_ctree), idate,
150);
- }
if (config.ml_server == 1) {
gtk_clist_set_column_width(GTK_CLIST(mail_ctree), iserver,
|
