Author: olivier
Date: 2006-07-08 21:02:24 +0000 (Sat, 08 Jul 2006)
New Revision: 22299
Modified:
mousepad/trunk/src/callback.c
mousepad/trunk/src/dnd.c
mousepad/trunk/src/encoding.c
mousepad/trunk/src/encoding.h
mousepad/trunk/src/file.c
mousepad/trunk/src/indent.c
mousepad/trunk/src/indent.h
mousepad/trunk/src/keyevent.c
mousepad/trunk/src/linenum.c
mousepad/trunk/src/main.c
mousepad/trunk/src/menu.c
mousepad/trunk/src/search.c
mousepad/trunk/src/selector.c
mousepad/trunk/src/undo.c
mousepad/trunk/src/window.c
mousepad/trunk/src/window.h
Log:
Fix segfault on file save on x86_64, remove c++ style comments (against our
policy) and apply patch from nick (bug #1866) to use const for menu items
Modified: mousepad/trunk/src/callback.c
===================================================================
--- mousepad/trunk/src/callback.c 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/callback.c 2006-07-08 21:02:24 UTC (rev 22299)
@@ -21,6 +21,8 @@
*/
#include "mousepad.h"
+#include <gtk/gtk.h>
+#include <glib.h>
static gint check_text_modification(StructData *sd)
{
@@ -93,7 +95,7 @@
FileInfo *fi;
if (!check_text_modification(sd)) {
-// fi = get_file_info_by_selector(OPEN, sd->fi);
+/* fi = get_file_info_by_selector(OPEN, sd->fi); */
fi = get_fileinfo_from_chooser(sd->mainwin->window, sd->fi,
OPEN);
if (fi) {
if (file_open_real(sd->mainwin->textview, fi)) {
@@ -123,7 +125,8 @@
gint cb_file_save_as(StructData *sd)
{
FileInfo *fi;
-
+
+ g_return_val_if_fail (sd != NULL, -1);
fi = get_fileinfo_from_chooser(sd->mainwin->window, sd->fi, SAVE);
if (fi) {
if (file_save_real(sd->mainwin->textview, fi))
@@ -144,7 +147,7 @@
GtkTextBuffer *textbuffer;
GtkTextIter start, end;
gchar *str;
- gint rbytes, wbytes;
+ gsize rbytes, wbytes;
gint xfprint_pipe;
GPid child_pid;
@@ -246,14 +249,14 @@
{
gtk_text_buffer_cut_clipboard(sd->mainwin->textbuffer,
gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), TRUE);
- menu_toggle_paste_item(); // TODO: remove this line
+ menu_toggle_paste_item(); /* TODO: remove this line */
}
void cb_edit_copy(StructData *sd)
{
gtk_text_buffer_copy_clipboard(sd->mainwin->textbuffer,
gtk_clipboard_get(GDK_SELECTION_CLIPBOARD));
- menu_toggle_paste_item(); // TODO: remove this line
+ menu_toggle_paste_item(); /* TODO: remove this line */
}
void cb_edit_paste(StructData *sd)
Modified: mousepad/trunk/src/dnd.c
===================================================================
--- mousepad/trunk/src/dnd.c 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/dnd.c 2006-07-08 21:02:24 UTC (rev 22299)
@@ -49,8 +49,8 @@
g_print("selection_data->length = %d\n", selection_data->length);
});
- if (selection_data->data && g_strstr_len(selection_data->data, 5,
"file:")) {
- files = g_strsplit(selection_data->data, "\n" , 2);
+ if (selection_data->data && g_strstr_len((gchar *)
selection_data->data, 5, "file:")) {
+ files = g_strsplit((gchar *) selection_data->data, "\n" , 2);
filename = g_filename_from_uri(files[0], NULL, NULL);
if (g_strrstr(filename, " ")) {
strs = g_strsplit(filename, " ", -1);
@@ -76,11 +76,13 @@
void dnd_init(GtkWidget *widget)
{
-// GtkWidget *w = gtk_widget_get_ancestor(widget, GTK_TYPE_CONTAINER);
-// GtkWidget *w = gtk_widget_get_parent(widget);
-// GtkWidget *w =
gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(widget)));
+#if 0
+ GtkWidget *w = gtk_widget_get_ancestor(widget, GTK_TYPE_CONTAINER);
+ GtkWidget *w = gtk_widget_get_parent(widget);
+ GtkWidget *w =
gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(widget)));
-// g_print(gtk_widget_get_name(w));
+ g_print(gtk_widget_get_name(w));
+#endif
gtk_drag_dest_set(widget, GTK_DEST_DEFAULT_ALL,
drag_types, n_drag_types, GDK_ACTION_COPY);
g_signal_connect(G_OBJECT(widget), "drag_data_received",
Modified: mousepad/trunk/src/encoding.c
===================================================================
--- mousepad/trunk/src/encoding.c 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/encoding.c 2006-07-08 21:02:24 UTC (rev 22299)
@@ -263,7 +263,7 @@
if ((c >= 0x30 && c <= 0x39) || (c >= 0x80 && c <=
0xA0)) {
charset = "GB18030";
break;
- } //else GBK/Big5-HKSCS cannot determine
+ } /* else GBK/Big5-HKSCS cannot determine */
}
else if ((c >= 0xA1 && c <= 0xC6) || (c >= 0xC9 && c <= 0xF9)) {
c = *text++;
@@ -359,25 +359,25 @@
if (c == '$') {
c = *text++;
switch (c) {
- case 'B': // JIS X 0208-1983
- case '@': // JIS X 0208-1978
+ case 'B': /* JIS X 0208-1983 */
+ case '@': /* JIS X 0208-1978 */
charset = "ISO-2022-JP";
continue;
- case 'A': // GB2312-1980
+ case 'A': /* GB2312-1980 */
charset = "ISO-2022-JP-2";
break;
case '(':
c = *text++;
switch (c) {
- case 'C': // KSC5601-1987
- case 'D': // JIS X 0212-1990
+ case 'C': /* KSC5601-1987 */
+ case 'D': /* JIS X 0212-1990 */
charset =
"ISO-2022-JP-2";
}
break;
case ')':
c = *text++;
if (c == 'C')
- charset =
"ISO-2022-KR"; // KSC5601-1987
+ charset =
"ISO-2022-KR"; /* KSC5601-1987 */
}
break;
}
@@ -392,7 +392,7 @@
case LATINC:
case LATINC_UA:
case LATINC_TJ:
- charset = detect_charset_cylillic(text); // fuzzy...
+ charset = detect_charset_cylillic(text); /* fuzzy... */
break;
case CHINESE_CN:
case CHINESE_TW:
Modified: mousepad/trunk/src/encoding.h
===================================================================
--- mousepad/trunk/src/encoding.h 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/encoding.h 2006-07-08 21:02:24 UTC (rev 22299)
@@ -22,7 +22,7 @@
#ifndef _ENCODING_H
#define _ENCODING_H
-//#define ENCODING_MAX_ITEM_NUM 3
+/* #define ENCODING_MAX_ITEM_NUM 3 */
enum {
IANA = 0,
Modified: mousepad/trunk/src/file.c
===================================================================
--- mousepad/trunk/src/file.c 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/file.c 2006-07-08 21:02:24 UTC (rev 22299)
@@ -103,7 +103,7 @@
}
g_free(contents);
-// undo_disconnect_signal(textbuffer);
+/* undo_disconnect_signal(textbuffer); */
undo_block_signal(textbuffer);
gtk_text_buffer_set_text(textbuffer, "", 0);
gtk_text_buffer_get_start_iter(textbuffer, &iter);
@@ -123,7 +123,7 @@
FILE *fp;
GtkTextIter start, end;
gchar *str;
- gint rbytes, wbytes;
+ gsize rbytes, wbytes;
GError *err = NULL;
GtkTextBuffer *textbuffer =
gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
Modified: mousepad/trunk/src/indent.c
===================================================================
--- mousepad/trunk/src/indent.c 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/indent.c 2006-07-08 21:02:24 UTC (rev 22299)
@@ -37,7 +37,7 @@
return auto_indent;
}
-static gchar *compute_indentation(GtkTextBuffer *buffer, gint line) // from
gedit
+static gchar *compute_indentation(GtkTextBuffer *buffer, gint line) /* from
gedit */
{
GtkTextIter start_iter, end_iter;
gunichar ch;
@@ -76,7 +76,7 @@
gtk_text_buffer_get_insert(buffer));
}
-static gint calculate_real_tab_width(GtkWidget *text_view, guint tab_size)
//from gtesourceview
+static gint calculate_real_tab_width(GtkWidget *text_view, guint tab_size) /*
from gtesourceview */
{
PangoLayout *layout;
gchar *tab_string;
@@ -111,7 +111,7 @@
void indent_toggle_tab_width(GtkWidget *text_view)
{
-// PangoTabArray *tab_array;
+/* PangoTabArray *tab_array; */
gint width = 8;
if (current_tab_width == 8)
@@ -179,7 +179,7 @@
end_line = gtk_text_iter_get_line(&end_iter);
gtk_text_buffer_get_iter_at_mark(buffer, &iter,
gtk_text_buffer_get_insert(buffer));
pos = gtk_text_iter_equal(&iter, &start_iter);
-// for (i = start_line; i < end_line; i++) {
+/* for (i = start_line; i < end_line; i++) { */
i = start_line;
do {
ind = compute_indentation(buffer, i);
@@ -196,7 +196,7 @@
}
i++;
} while (i < end_line);
-// }
+/* } */
undo_set_sequency(FALSE);
gtk_text_buffer_get_iter_at_line(buffer, &start_iter, start_line);
Modified: mousepad/trunk/src/indent.h
===================================================================
--- mousepad/trunk/src/indent.h 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/indent.h 2006-07-08 21:02:24 UTC (rev 22299)
@@ -29,6 +29,6 @@
void indent_toggle_tab_width(GtkWidget *text_view);
void indent_multi_line_indent(GtkTextBuffer *buffer);
void indent_multi_line_unindent(GtkTextBuffer *buffer);
-//void indent_init(GtkWidget *text_view);
+/* void indent_init(GtkWidget *text_view); */
#endif /* _INDENT_H */
Modified: mousepad/trunk/src/keyevent.c
===================================================================
--- mousepad/trunk/src/keyevent.c 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/keyevent.c 2006-07-08 21:02:24 UTC (rev 22299)
@@ -27,7 +27,7 @@
#include "undo.h"
static guint keyval = 0;
-//static gchar ctrl_key_flag = 0;
+/* static gchar ctrl_key_flag = 0; */
static GdkWindow *gdkwin;
guint keyevent_getval(void)
@@ -114,7 +114,7 @@
/* case GDK_Control_L:
case GDK_Control_R:
ctrl_key_flag = 1;
-//g_print(">>>>ctrl_key_flag = 1\n");
+ g_print(">>>>ctrl_key_flag = 1\n");
*/ }
return FALSE;
@@ -126,7 +126,7 @@
case GDK_Control_L:
case GDK_Control_R:
ctrl_key_flag = 0;
-//g_print("<<<<ctrl_key_flag = 0\n");
+ g_print("<<<<ctrl_key_flag = 0\n");
}
return FALSE;
@@ -144,8 +144,10 @@
gdkwin = gtk_text_view_get_window(GTK_TEXT_VIEW(text_view),
GTK_TEXT_WINDOW_WIDGET);
g_signal_connect(G_OBJECT(text_view), "key-press-event",
G_CALLBACK(cb_key_press_event), NULL);
-// g_signal_connect(G_OBJECT(text_view), "key-release-event",
-// G_CALLBACK(cb_key_release_event), NULL);
+#if 0
+ g_signal_connect(G_OBJECT(text_view), "key-release-event",
+ G_CALLBACK(cb_key_release_event), NULL);
+#endif
g_signal_connect(G_OBJECT(text_view), "button-press-event",
G_CALLBACK(cb_button_press_event), NULL);
}
Modified: mousepad/trunk/src/linenum.c
===================================================================
--- mousepad/trunk/src/linenum.c 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/linenum.c 2006-07-08 21:02:24 UTC (rev 22299)
@@ -113,7 +113,7 @@
{
GtkTextView *text_view;
GdkWindow *win;
-// GtkStyle *style;
+/* GtkStyle *style; */
PangoLayout *layout;
PangoAttrList *alist;
PangoAttribute *attr;
@@ -124,7 +124,7 @@
gint layout_width;
gint justify_width = 0;
gint i;
-// gchar *str;
+/* gchar *str; */
gchar str [8]; /* we don't expect more than ten million lines */
text_view = GTK_TEXT_VIEW (widget);
@@ -153,9 +153,9 @@
if (event->window != win)
return FALSE;
-// style = gtk_style_copy (widget->style);
-// style = gtk_style_copy (gtk_widget_get_default_style());
-
+/* style = gtk_style_copy (widget->style);
+ * style = gtk_style_copy (gtk_widget_get_default_style());
+ */
y1 = event->area.y;
y2 = y1 + event->area.height;
@@ -201,11 +201,11 @@
layout = gtk_widget_create_pango_layout (widget, "");
-// str = g_strdup_printf ("%d",
gtk_text_buffer_get_line_count(text_view->buffer));
+/* str = g_strdup_printf ("%d",
gtk_text_buffer_get_line_count(text_view->buffer)); */
g_snprintf (str, sizeof (str),
"%d", MAX (99,
gtk_text_buffer_get_line_count(text_view->buffer)));
pango_layout_set_text (layout, str, -1);
-// g_free (str);
+/* g_free (str); */
pango_layout_get_pixel_size (layout, &layout_width, NULL);
@@ -215,11 +215,11 @@
GTK_TEXT_WINDOW_LEFT,
layout_width + margin);
else {
-// if ((gtk_text_view_get_border_window_size (text_view,
GTK_TEXT_WINDOW_LEFT) - 5) > layout_width) {
+/* if ((gtk_text_view_get_border_window_size (text_view,
GTK_TEXT_WINDOW_LEFT) - 5) > layout_width) { */
gtk_text_view_set_border_window_size (text_view,
GTK_TEXT_WINDOW_LEFT,
min_number_window_width + margin);
-// }
+/* } */
justify_width = min_number_window_width - layout_width;
}
@@ -250,7 +250,7 @@
NULL,
&pos);
-// str = g_strdup_printf ("%d", g_array_index (numbers, gint, i) +
1);
+/* str = g_strdup_printf ("%d", g_array_index (numbers, gint, i) +
1); */
g_snprintf (str, sizeof (str),
"%d", g_array_index (numbers, gint, i) + 1);
@@ -265,7 +265,7 @@
NULL,
layout_width + justify_width + 1, pos,
layout);
-// g_free (str);
+/* g_free (str); */
++i;
}
@@ -274,7 +274,7 @@
g_array_free (numbers, TRUE);
g_object_unref (G_OBJECT (layout));
-// g_object_ref (G_OBJECT (style));
+/* g_object_ref (G_OBJECT (style)); */
/* don't stop emission, need to draw children */
return FALSE;
Modified: mousepad/trunk/src/main.c
===================================================================
--- mousepad/trunk/src/main.c 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/main.c 2006-07-08 21:02:24 UTC (rev 22299)
@@ -181,7 +181,7 @@
} else
cb_file_new(sd);
-// dnd_init(sd->mainwin->window);
+/* dnd_init(sd->mainwin->window); */
dnd_init(sd->mainwin->textview);
keyevent_init(sd->mainwin->textview);
Modified: mousepad/trunk/src/menu.c
===================================================================
--- mousepad/trunk/src/menu.c 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/menu.c 2006-07-08 21:02:24 UTC (rev 22299)
@@ -34,7 +34,7 @@
paste_menu_item,
gtk_clipboard_wait_is_text_available(
gtk_clipboard_get(GDK_SELECTION_CLIPBOARD)));
-//g_print("CLIPBOARD_CHECKED!\n");
+/*g_print("CLIPBOARD_CHECKED!\n"); */
return FALSE;
}
@@ -44,7 +44,7 @@
gtk_widget_set_sensitive(cut_menu_item, selected);
gtk_widget_set_sensitive(copy_menu_item, selected);
gtk_widget_set_sensitive(delete_menu_item, selected);
-// menu_toggle_paste_item();
+/* menu_toggle_paste_item(); */
}
static gchar *menu_translate(const gchar *path, gpointer data)
@@ -55,14 +55,16 @@
return retval;
}
-static GtkItemFactoryEntry menu_items[] =
+static const GtkItemFactoryEntry menu_items[] =
{
{ N_("/_File"), NULL,
NULL, 0, "<Branch>" },
{ N_("/File/_New"), "<control>N",
G_CALLBACK(cb_file_new_window), 0, "<StockItem>", GTK_STOCK_NEW
},
-// { N_("/File/New _Window"), "<shift><control>N",
-// G_CALLBACK(cb_file_new), 1 },
+#if 0
+ { N_("/File/New _Window"), "<shift><control>N",
+ G_CALLBACK(cb_file_new), 1 },
+#endif
{ N_("/File/_Open..."), "<control>O",
G_CALLBACK(cb_file_open), 0, "<StockItem>", GTK_STOCK_OPEN },
{ N_("/File/_Save"), "<control>S",
Modified: mousepad/trunk/src/search.c
===================================================================
--- mousepad/trunk/src/search.c 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/search.c 2006-07-08 21:02:24 UTC (rev 22299)
@@ -157,7 +157,7 @@
gtk_dialog_set_response_sensitive(GTK_DIALOG(gtk_widget_get_toplevel(w)),
GTK_RESPONSE_OK, TRUE);
entry_len += pos2;
-// entry_len = entry_len + pos2;
+/* entry_len = entry_len + pos2; */
} else {
entry_len = entry_len + pos1 - pos2;
if (!entry_len)
Modified: mousepad/trunk/src/selector.c
===================================================================
--- mousepad/trunk/src/selector.c 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/selector.c 2006-07-08 21:02:24 UTC (rev 22299)
@@ -64,7 +64,7 @@
for (i = 0; i <= 2; i++) {
menu_item = gtk_menu_item_new_with_label(lineend_str[i]);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
- gtk_widget_show(menu_item); // <- required for width adjustment
+ gtk_widget_show(menu_item); /* <- required for width adjustment
*/
}
gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
@@ -103,7 +103,7 @@
ctable->str[ctable->num] = g_strdup_printf(_("Current Locale
(%s)"), get_default_charset());
ctable->num++;
ctable->charset[ctable->num] = "UTF-8";
- // ctable->str[ctable->num] = g_strdup("Unicode (UTF-8)");
+ /* ctable->str[ctable->num] = g_strdup("Unicode (UTF-8)"); */
ctable->str[ctable->num] = ctable->charset[ctable->num];
ctable->num++;
encarray = get_encoding_items(get_encoding_code());
@@ -154,7 +154,7 @@
menu_item_manual_charset = gtk_menu_item_new_with_label(str);
label = GTK_LABEL(GTK_BIN(menu_item_manual_charset)->child);
} else
-//
gtk_label_set_text(GTK_LABEL(GTK_BIN(menu_item_manual_charset)->child), str);
+/*
gtk_label_set_text(GTK_LABEL(GTK_BIN(menu_item_manual_charset)->child), str); */
gtk_label_set_text(label, str);
g_free(str);
@@ -205,7 +205,7 @@
g_error_free(err);
gtk_widget_hide(dialog);
str = g_strdup_printf(_("'%s' is not supported"),
gtk_entry_get_text(GTK_ENTRY(entry)));
-// run_dialog_message(filesel, GTK_MESSAGE_ERROR, str);
+/* run_dialog_message(filesel, GTK_MESSAGE_ERROR, str); */
run_dialog_message(gtk_widget_get_toplevel(GTK_WIDGET(option_menu)),
GTK_MESSAGE_ERROR, str);
g_free(str);
@@ -270,18 +270,18 @@
if (mode == OPEN) {
menu_item = gtk_menu_item_new_with_label(_("Auto Detect"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
- gtk_widget_show(menu_item); // <- required for width adjustment
+ gtk_widget_show(menu_item); /* <- required for width adjustment
*/
}
ctable = get_charset_table();
for (i = 0; i < ctable->num; i++) {
menu_item = gtk_menu_item_new_with_label(ctable->str[i]);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
- gtk_widget_show(menu_item); // <- required for width adjustment
+ gtk_widget_show(menu_item); /* <- required for width adjustment
*/
}
menu_item_manual_charset = NULL;
gtk_menu_shell_append(GTK_MENU_SHELL(menu),
init_menu_item_manual_charset(selected_fi->manual_charset));
- gtk_widget_show(menu_item_manual_charset); // <- required for width
adjustment
+ gtk_widget_show(menu_item_manual_charset); /* <- required for width
adjustment */
charset_menu_init_flag = TRUE;
g_signal_connect(G_OBJECT(option_menu), "changed",
@@ -325,25 +325,25 @@
title = mode ? _("Open") : _("Save As");
if(mode == OPEN)
- filesel = xfce_file_chooser_new(title, GTK_WINDOW(window),
- XFCE_FILE_CHOOSER_ACTION_OPEN,
+ filesel = gtk_file_chooser_dialog_new(title, GTK_WINDOW(window),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,NULL);
+ GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
else
- filesel = xfce_file_chooser_new(title, GTK_WINDOW(window),
- XFCE_FILE_CHOOSER_ACTION_SAVE,
+ filesel = gtk_file_chooser_dialog_new(title, GTK_WINDOW(window),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE,GTK_RESPONSE_ACCEPT,NULL);
+ GTK_STOCK_SAVE,GTK_RESPONSE_ACCEPT, NULL);
align = gtk_alignment_new(1, 0, 0, 0);
- xfce_file_chooser_set_extra_widget(XFCE_FILE_CHOOSER(filesel),align);
+ gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(filesel),align);
table = gtk_table_new(2, 2, FALSE);
gtk_table_set_row_spacings(GTK_TABLE(table), 5);
gtk_container_add(GTK_CONTAINER(align), table);
option_menu_charset = create_charset_menu(selected_fi);
- label = gtk_label_new_with_mnemonic(_("Ch_aracter Coding: ")); // dummy
for pot
-// gtk_label_set_mnemonic_widget(GTK_LABEL(label), option_menu_charset);
+ label = gtk_label_new_with_mnemonic(_("Ch_aracter Coding: ")); /* dummy
for pot */
+/* gtk_label_set_mnemonic_widget(GTK_LABEL(label), option_menu_charset); */
gtk_table_attach_defaults(GTK_TABLE(table), option_menu_charset, 0, 1,
0, 1);
if (mode == SAVE) {
option_menu_lineend = create_lineend_menu(selected_fi);
@@ -352,7 +352,7 @@
gtk_widget_show_all(GTK_WIDGET(filesel));
if (selected_fi->filename)
- xfce_file_chooser_set_filename(XFCE_FILE_CHOOSER(filesel),
selected_fi->filename);
+ gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel),
selected_fi->filename);
return filesel;
}
@@ -385,14 +385,14 @@
if (selected_fi->filename)
g_free(selected_fi->filename);
selected_fi->filename = g_strdup(
-
xfce_file_chooser_get_filename(XFCE_FILE_CHOOSER(filesel)));
+
gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filesel)));
if (g_file_test(selected_fi->filename,
G_FILE_TEST_IS_DIR)) {
len = strlen(selected_fi->filename);
if (len < 1 || selected_fi->filename[len - 1]
!= G_DIR_SEPARATOR)
str =
g_strconcat(selected_fi->filename, G_DIR_SEPARATOR_S, NULL);
else
str = g_strdup(selected_fi->filename);
-
xfce_file_chooser_set_filename(XFCE_FILE_CHOOSER(filesel), str);
+
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), str);
g_free(str);
continue;
}
@@ -418,8 +418,8 @@
g_free(selected_fi->charset);
if (selected_fi->manual_charset)
g_free(selected_fi->manual_charset);
+ g_free(selected_fi);
selected_fi = NULL;
- g_free(selected_fi);
}
gtk_widget_destroy(filesel);
Modified: mousepad/trunk/src/undo.c
===================================================================
--- mousepad/trunk/src/undo.c 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/undo.c 2006-07-08 21:02:24 UTC (rev 22299)
@@ -30,7 +30,7 @@
gint command;
gint start;
gint end;
- gboolean seq; // sequency flag
+ gboolean seq; /* sequency flag */
gchar *str;
} UndoInfo;
@@ -51,7 +51,7 @@
static GtkWidget *view;
static gboolean overwrite_mode = FALSE;
static guint keyval;
-static guint prev_keyval;//, keyevent_setval(0);
+static guint prev_keyval;/*, keyevent_setval(0); */
static void cb_toggle_overwrite(void)
{
@@ -189,7 +189,7 @@
if (!keyval && prev_keyval)
undo_set_sequency(TRUE);
- if (keyval == 0x10000 && prev_keyval > 0x10000) // for Ctrl+V overwrite
+ if (keyval == 0x10000 && prev_keyval > 0x10000) /* for Ctrl+V overwrite
*/
undo_set_sequency(TRUE);
if (keyval == GDK_BackSpace)
command = BS;
@@ -210,8 +210,10 @@
if (!keyval && prev_keyval)
undo_set_sequency(TRUE);
-// if (keyval == 0x10000 && prev_keyval > 0x10000) // don't need probably
-// undo_set_sequency(TRUE);
+#if 0
+ if (keyval == 0x10000 && prev_keyval > 0x10000) /* don't need probably
*/
+ undo_set_sequency(TRUE);
+#endif
undo_create_undo_info(buffer, INS, start, end);
}
@@ -267,7 +269,7 @@
void undo_init(GtkWidget *textview, GtkTextBuffer *buffer, GtkWidget *menubar)
{
GtkItemFactory *ifactory;
- static guint init_flag = 0; // TODO: divide to undo_clear()
+ static guint init_flag = 0; /* TODO: divide to undo_clear() */
if (undo_list)
undo_clear_undo_info();
@@ -291,7 +293,7 @@
init_flag = undo_connect_signal(buffer);
keyevent_setval(0);
ui_tmp = g_malloc(sizeof(UndoInfo));
- //ui_tmp->str = g_strdup("");
+ /* ui_tmp->str = g_strdup(""); */
undo_gstr = g_string_new("");
}
ui_tmp->command = INS;
@@ -302,7 +304,7 @@
{
return
g_signal_handlers_block_by_func(G_OBJECT(buffer),
G_CALLBACK(cb_delete_range), buffer) +
-// g_signal_handlers_block_by_func(G_OBJECT(buffer),
G_CALLBACK(cb_modified_changed), buffer) +
+/* g_signal_handlers_block_by_func(G_OBJECT(buffer),
G_CALLBACK(cb_modified_changed), buffer) + */
g_signal_handlers_block_by_func(G_OBJECT(buffer),
G_CALLBACK(cb_insert_text), buffer);
}
@@ -310,15 +312,15 @@
{
return
g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
G_CALLBACK(cb_delete_range), buffer) +
-// g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
G_CALLBACK(cb_modified_changed), buffer) +
+/* g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
G_CALLBACK(cb_modified_changed), buffer) + */
g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
G_CALLBACK(cb_insert_text), buffer);
}
-gint undo_disconnect_signal(GtkTextBuffer *buffer) //must be not needed
+gint undo_disconnect_signal(GtkTextBuffer *buffer) /*must be not needed */
{
return
g_signal_handlers_disconnect_by_func(G_OBJECT(buffer),
G_CALLBACK(cb_delete_range), buffer) +
-// g_signal_handlers_disconnect_by_func(G_OBJECT(buffer),
G_CALLBACK(cb_modified_changed), buffer) +
+/* g_signal_handlers_disconnect_by_func(G_OBJECT(buffer),
G_CALLBACK(cb_modified_changed), buffer) + */
g_signal_handlers_disconnect_by_func(G_OBJECT(buffer),
G_CALLBACK(cb_insert_text), buffer);
}
Modified: mousepad/trunk/src/window.c
===================================================================
--- mousepad/trunk/src/window.c 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/window.c 2006-07-08 21:02:24 UTC (rev 22299)
@@ -41,7 +41,7 @@
}
*/
-//static void cb_mark_set(GtkTextBuffer *buffer, GtkTextIter *arg1,
GtkTextMark *arg2, GtkWidget *menubar)
+/* static void cb_mark_set(GtkTextBuffer *buffer, GtkTextIter *arg1,
GtkTextMark *arg2, GtkWidget *menubar) */
static void cb_mark_set(GtkTextBuffer *buffer)
{
/* static gboolean selected_flag = FALSE;
@@ -53,7 +53,8 @@
selected_flag = selected;
}
*/ menu_toggle_clipboard_item(gtk_text_buffer_get_selection_bounds(buffer,
NULL, NULL));
-//g_print("MARK_SET!");
+
+/* g_print("MARK_SET!"); */
}
/*
static void cb_text_receive(GtkClipboard *clipboard, const gchar *text,
gpointer data)
@@ -91,16 +92,17 @@
sw = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-// gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-// GTK_SHADOW_IN);
-// remove_scrollbar_spacing(GTK_SCROLLED_WINDOW(sw));
+/* gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
+ * GTK_SHADOW_IN);
+ * remove_scrollbar_spacing(GTK_SCROLLED_WINDOW(sw));
+ */
gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
textview = gtk_text_view_new();
gtk_container_add(GTK_CONTAINER(sw), textview);
textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
-/* //Following code has possibility of confliction if scroll policy of GTK
changed
+/* Following code has possibility of confliction if scroll policy of GTK
changed
GtkAdjustment *hadj =
gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(sw));
GtkAdjustment *vadj =
gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(sw));
@@ -156,8 +158,9 @@
title = g_strdup_printf("(%s)", basename);
} else
title = g_strdup_printf("(%s)", basename);
-// title = g_strdup(basename);
-// title = g_strdup_printf(PACKAGE_NAME);
+/* title = g_strdup(basename);
+ * title = g_strdup_printf(PACKAGE_NAME);
+ */
gtk_window_set_title(GTK_WINDOW(sd->mainwin->window), title);
g_free(title);
g_free(basename);
Modified: mousepad/trunk/src/window.h
===================================================================
--- mousepad/trunk/src/window.h 2006-07-08 19:39:48 UTC (rev 22298)
+++ mousepad/trunk/src/window.h 2006-07-08 21:02:24 UTC (rev 22299)
@@ -22,12 +22,12 @@
#ifndef _WINDOW_H
#define _WINDOW_H
-//#include "mousepad.h"
-
MainWindow *create_main_window(StructData *sd);
gchar *get_current_file_basename(gchar *filename);
void set_main_window_title(StructData *sd);
-//void set_main_window_title_with_asterisk(gboolean flag);
-//void set_main_window_title_toggle_asterisk(void);
+#if 0
+void set_main_window_title_with_asterisk(gboolean flag);
+void set_main_window_title_toggle_asterisk(void);
+#endif /* 0 */
#endif /* _WINDOW_H */
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
