--- a/gntbindable.c Sat Nov 20 13:02:08 2010 +0000
+++ b/gntbindable.c Sat Jan 08 03:10:40 2011 +0000
@@ -48,7 +48,7 @@
GList * params; /* The list of paramaters */
gnt_bindable_free_rebind_info(void)
g_free(rebind_info.name);
@@ -92,7 +92,7 @@
if (!strcmp(text, GNT_KEY_CTRL_I) || !strcmp(text, GNT_KEY_ENTER)) {
tmp = gnt_key_lookup(text);
new_text = g_strdup_printf("KEY: \"%s\"", tmp);
gnt_text_view_clear(textview);
@@ -105,7 +105,7 @@
gnt_bindable_rebinding_activate(GntBindable *data, gpointer bindable)
@@ -154,18 +154,18 @@
g_signal_connect(G_OBJECT(win), "key_pressed", G_CALLBACK(gnt_bindable_rebinding_grab_key), key_textview);
button_box = gnt_box_new(FALSE, FALSE);
bind_button = gnt_button_new("BIND");
gnt_widget_set_name(bind_button, "bind");
gnt_box_add_widget(GNT_BOX(button_box), bind_button);
cancel_button = gnt_button_new("Cancel");
gnt_widget_set_name(cancel_button, "cancel");
gnt_box_add_widget(GNT_BOX(button_box), cancel_button);
g_signal_connect(G_OBJECT(bind_button), "activate", G_CALLBACK(gnt_bindable_rebinding_rebind), win);
g_signal_connect(G_OBJECT(cancel_button), "activate", G_CALLBACK(gnt_bindable_rebinding_cancel), win);
gnt_box_add_widget(GNT_BOX(vbox), button_box);
gnt_box_add_widget(GNT_BOX(win), vbox);
@@ -320,7 +320,7 @@
while ((p = va_arg(args, void *)) != NULL)
list = g_list_append(list, p);
action = g_hash_table_lookup(klass->actions, name);
if (action && action->u.action) {
return action->u.action(bindable, list);
--- a/gntfilesel.c Sat Nov 20 13:02:08 2010 +0000
+++ b/gntfilesel.c Sat Jan 08 03:10:40 2011 +0000
@@ -245,7 +245,7 @@
dir = g_dir_open(path, 0, error);
if (dir == NULL || (error && *error)) {
@@ -315,7 +315,7 @@
success = sel->read_fn(sel->current, &files, err);
success = local_read_fn(sel->current, &files, err);
gnt_warning("error opening location %s (%s)",
sel->current, *err ? (*err)->message : "reason unknown");
@@ -356,7 +356,7 @@
path = g_build_filename(sel->current, str, NULL);
dir = g_path_get_basename(sel->current);
if (!gnt_file_sel_set_current_location(sel, path)) {
@@ -597,7 +597,7 @@
orig_size_request = kl->size_request;
kl->size_request = gnt_file_sel_size_request;
- signals[SIG_FILE_SELECTED] =
+ signals[SIG_FILE_SELECTED] = g_signal_new("file_selected",
G_TYPE_FROM_CLASS(klass),
--- a/gntstyle.c Sat Nov 20 13:02:08 2010 +0000
+++ b/gntstyle.c Sat Jan 08 03:10:40 2011 +0000
@@ -105,7 +105,7 @@
if (bool_styles[style] != -1)
return bool_styles[style];
str = gnt_style_get(style);
bool_styles[style] = str ? gnt_style_parse_bool(str) : def;
@@ -226,7 +226,7 @@
keys = g_key_file_get_keys(gkfile, name, &len, &error);
@@ -280,7 +280,7 @@
keys = g_key_file_get_keys(gkfile, kname, &len, &error);
@@ -331,14 +331,14 @@
#if GLIB_CHECK_VERSION(2,6,0)
name = g_strdup_printf("%s::remap", g_type_name(type));
if (g_key_file_has_group(gkfile, name))
keys = g_key_file_get_keys(gkfile, name, &len, &error);
--- a/gnttextview.c Sat Nov 20 13:02:08 2010 +0000
+++ b/gnttextview.c Sat Jan 08 03:10:40 2011 +0000
@@ -165,7 +165,7 @@
if (showing + position > rows)
position = rows - showing;
if (showing + position == rows && view->list && view->list->prev)
position = MAX(1, rows - 1 - showing);
else if (showing + position < rows && view->list && !view->list->prev)
@@ -456,7 +456,7 @@
GntTextView *view = GNT_TEXT_VIEW(widget);
GntTextLine *line = g_new0(GntTextLine, 1);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW |
+ GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW | GNT_WIDGET_GROW_Y | GNT_WIDGET_GROW_X);
@@ -636,7 +636,7 @@
list = g_list_last(view->list);
gnt_widget_draw(GNT_WIDGET(view));
@@ -644,7 +644,7 @@
GntTextLine *line = g_new0(GntTextLine, 1);
GList *list = view->list;
view->list = g_list_prepend(g_list_first(view->list), line);
gnt_widget_draw(GNT_WIDGET(view));
--- a/gnttree.c Sat Nov 20 13:02:08 2010 +0000
+++ b/gnttree.c Sat Jan 08 03:10:40 2011 +0000
@@ -275,7 +275,7 @@
return get_root_distance(get_prev(row)) + 1;
-/* Returns the distance between a and b.
+/* Returns the distance between a and b. * If a is 'above' b, then the distance is positive */
get_distance(GntTreeRow *a, GntTreeRow *b)
@@ -627,7 +627,7 @@
GntTree *tree = GNT_TREE(widget);
@@ -1066,7 +1066,7 @@
- signals[SIG_SELECTION_CHANGED] =
+ signals[SIG_SELECTION_CHANGED] = g_signal_new("selection-changed",
G_TYPE_FROM_CLASS(klass),
@@ -1074,7 +1074,7 @@
gnt_closure_marshal_VOID__POINTER_POINTER,
G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
- signals[SIG_SCROLLED] =
+ signals[SIG_SCROLLED] = G_TYPE_FROM_CLASS(klass),
@@ -1082,7 +1082,7 @@
g_cclosure_marshal_VOID__INT,
G_TYPE_NONE, 1, G_TYPE_INT);
G_TYPE_FROM_CLASS(klass),
@@ -1090,7 +1090,7 @@
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
- signals[SIG_COLLAPSED] =
+ signals[SIG_COLLAPSED] = g_signal_new("collapse-toggled",
G_TYPE_FROM_CLASS(klass),
@@ -1384,7 +1384,7 @@
- if (pr == NULL && parent)
+ if (pr == NULL && parent) pr = g_hash_table_lookup(tree->hash, parent);
@@ -1564,7 +1564,7 @@
g_return_if_fail(colno < tree->ncol);
row = g_hash_table_lookup(tree->hash, key);
@@ -1601,7 +1601,7 @@
row = gnt_tree_add_row_after(tree, key, row, parent, bigbro);
--- a/gnttree.h Sat Nov 20 13:02:08 2010 +0000
+++ b/gnttree.h Sat Jan 08 03:10:40 2011 +0000
@@ -62,9 +62,9 @@
GntTreeRow *top; /* The topmost visible item */
GntTreeRow *bottom; /* The bottommost visible item */
GntTreeRow *root; /* The root of all evil */
GList *list; /* List of GntTreeRow s */
GHashTable *hash; /* We need this for quickly referencing the rows */
guint (*hash_func)(gconstpointer);
@@ -216,7 +216,7 @@
* @return A list of texts of a row. The list and its data should be
* freed by the caller. The caller should make sure that if
* any column of the tree contains binary data, it's not freed.
- * @see gnt_tree_get_selection_text_list
+ * @see gnt_tree_get_selection_text_list * @see gnt_tree_get_selection_text
GList * gnt_tree_get_row_text_list(GntTree *tree, gpointer key);
@@ -482,7 +482,7 @@
* @param func The comparison function, which is used to compare
- * @see gnt_tree_sort_row
+ * @see gnt_tree_sort_row void gnt_tree_set_compare_func(GntTree *tree, GCompareFunc func);
@@ -535,7 +535,7 @@
* Set whether a column is visible or not.
* This can be useful when, for example, we want to store some data
* which we don't want/need to display.
* @param col The index of the column
* @param vis If @c FALSE, the column will not be displayed
@@ -545,7 +545,7 @@
* Set whether a column can be resized to keep the same ratio when the
* @param col The index of the column
* @param res If @c FALSE, the column will not be resized when the
--- a/gntwidget.c Sat Nov 20 13:02:08 2010 +0000
+++ b/gntwidget.c Sat Jan 08 03:10:40 2011 +0000
@@ -126,12 +126,12 @@
klass->lost_focus = gnt_widget_focus_change;
klass->gained_focus = gnt_widget_focus_change;
klass->confirm_size = gnt_widget_dummy_confirm_size;
klass->key_pressed = NULL;
G_TYPE_FROM_CLASS(klass),
@@ -139,7 +139,7 @@
g_cclosure_marshal_VOID__VOID,
- signals[SIG_GIVE_FOCUS] =
+ signals[SIG_GIVE_FOCUS] = g_signal_new("gained-focus",
G_TYPE_FROM_CLASS(klass),
@@ -147,7 +147,7 @@
g_cclosure_marshal_VOID__VOID,
- signals[SIG_LOST_FOCUS] =
+ signals[SIG_LOST_FOCUS] = g_signal_new("lost-focus",
G_TYPE_FROM_CLASS(klass),
@@ -155,7 +155,7 @@
g_cclosure_marshal_VOID__VOID,
- signals[SIG_ACTIVATE] =
+ signals[SIG_ACTIVATE] = G_TYPE_FROM_CLASS(klass),
@@ -163,7 +163,7 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_FROM_CLASS(klass),
@@ -171,7 +171,7 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_FROM_CLASS(klass),
@@ -179,7 +179,7 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_FROM_CLASS(klass),
@@ -187,7 +187,7 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_FROM_CLASS(klass),
@@ -195,7 +195,7 @@
gnt_closure_marshal_VOID__INT_INT_INT_INT,
G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
- signals[SIG_POSITION] =
+ signals[SIG_POSITION] = g_signal_new("position-set",
G_TYPE_FROM_CLASS(klass),
@@ -203,7 +203,7 @@
gnt_closure_marshal_VOID__INT_INT,
G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
- signals[SIG_SIZE_REQUEST] =
+ signals[SIG_SIZE_REQUEST] = g_signal_new("size_request",
G_TYPE_FROM_CLASS(klass),
@@ -211,7 +211,7 @@
g_cclosure_marshal_VOID__VOID,
- signals[SIG_SIZE_CHANGED] =
+ signals[SIG_SIZE_CHANGED] = g_signal_new("size_changed",
G_TYPE_FROM_CLASS(klass),
@@ -219,7 +219,7 @@
gnt_closure_marshal_VOID__INT_INT,
G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
- signals[SIG_CONFIRM_SIZE] =
+ signals[SIG_CONFIRM_SIZE] = g_signal_new("confirm_size",
G_TYPE_FROM_CLASS(klass),
@@ -227,7 +227,7 @@
gnt_closure_marshal_BOOLEAN__INT_INT,
G_TYPE_BOOLEAN, 2, G_TYPE_INT, G_TYPE_INT);
- signals[SIG_KEY_PRESSED] =
+ signals[SIG_KEY_PRESSED] = g_signal_new("key_pressed",
G_TYPE_FROM_CLASS(klass),
@@ -236,7 +236,7 @@
gnt_closure_marshal_BOOLEAN__STRING,
G_TYPE_BOOLEAN, 1, G_TYPE_STRING);
G_TYPE_FROM_CLASS(klass),
@@ -245,7 +245,7 @@
gnt_closure_marshal_BOOLEAN__INT_INT_INT,
G_TYPE_BOOLEAN, 3, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
- signals[SIG_CONTEXT_MENU] =
+ signals[SIG_CONTEXT_MENU] = g_signal_new("context-menu",
G_TYPE_FROM_CLASS(klass),
--- a/gntwm.c Sat Nov 20 13:02:08 2010 +0000
+++ b/gntwm.c Sat Jan 08 03:10:40 2011 +0000
@@ -151,7 +151,7 @@
* The following is a workaround for a bug in most versions of ncursesw.
* Read about it in: http://article.gmane.org/gmane.comp.lib.ncurses.bugs/2751
* In short, if a panel hides one cell of a multi-cell character, then the rest
* of the characters in that line get screwed. The workaround here is to erase
* any such character preemptively.
@@ -665,7 +665,7 @@
tree = wm->windows->tree;
gnt_box_set_title(GNT_BOX(win), workspace ? "Workspace List" : "Window List");
populate_window_list(wm, workspace);
@@ -762,7 +762,7 @@
fprintf(file, "%s", end); \
CHECK(A_BOLD, "<b>", "</b>");
CHECK(A_UNDERLINE, "<u>", "</u>");
@@ -800,7 +800,7 @@
if (x) fprintf(file, "</span>");
fprintf(file, "<span style=\"background:#%02x%02x%02x;color:#%02x%02x%02x\">",
bg.r, bg.g, bg.b, fg.r, fg.g, fg.b);
@@ -916,7 +916,7 @@
shift_right(GntBindable *bindable, GList *null)
GntWM *wm = GNT_WM(bindable);
@@ -1032,7 +1032,7 @@
if (GNT_WIDGET_IS_FLAG_SET(win, GNT_WIDGET_NO_BORDER))
gnt_widget_get_size(win, &w, &h);
@@ -1405,8 +1405,8 @@
klass->key_pressed = NULL;
klass->mouse_clicked = NULL;
klass->give_focus = gnt_wm_give_focus;
G_TYPE_FROM_CLASS(klass),
@@ -1414,7 +1414,7 @@
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
- signals[SIG_DECORATE_WIN] =
+ signals[SIG_DECORATE_WIN] = g_signal_new("decorate_win",
G_TYPE_FROM_CLASS(klass),
@@ -1422,7 +1422,7 @@
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
- signals[SIG_CLOSE_WIN] =
+ signals[SIG_CLOSE_WIN] = g_signal_new("close_win",
G_TYPE_FROM_CLASS(klass),
@@ -1430,7 +1430,7 @@
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
- signals[SIG_CONFIRM_RESIZE] =
+ signals[SIG_CONFIRM_RESIZE] = g_signal_new("confirm_resize",
G_TYPE_FROM_CLASS(klass),
@@ -1439,7 +1439,7 @@
gnt_closure_marshal_BOOLEAN__POINTER_POINTER_POINTER,
G_TYPE_BOOLEAN, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER);
- signals[SIG_CONFIRM_MOVE] =
+ signals[SIG_CONFIRM_MOVE] = g_signal_new("confirm_move",
G_TYPE_FROM_CLASS(klass),
@@ -1448,7 +1448,7 @@
gnt_closure_marshal_BOOLEAN__POINTER_POINTER_POINTER,
G_TYPE_BOOLEAN, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER);
g_signal_new("window_resized",
G_TYPE_FROM_CLASS(klass),
@@ -1456,7 +1456,7 @@
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
g_signal_new("window_moved",
G_TYPE_FROM_CLASS(klass),
@@ -1464,7 +1464,7 @@
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
- signals[SIG_UPDATE_WIN] =
+ signals[SIG_UPDATE_WIN] = g_signal_new("window_update",
G_TYPE_FROM_CLASS(klass),
@@ -1473,7 +1473,7 @@
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
- signals[SIG_GIVE_FOCUS] =
+ signals[SIG_GIVE_FOCUS] = g_signal_new("give_focus",
G_TYPE_FROM_CLASS(klass),
@@ -1482,7 +1482,7 @@
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
- signals[SIG_MOUSE_CLICK] =
+ signals[SIG_MOUSE_CLICK] = g_signal_new("mouse_clicked",
G_TYPE_FROM_CLASS(klass),
@@ -1491,7 +1491,7 @@
gnt_closure_marshal_BOOLEAN__INT_INT_INT_POINTER,
G_TYPE_BOOLEAN, 4, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_POINTER);
- signals[SIG_TERMINAL_REFRESH] =
+ signals[SIG_TERMINAL_REFRESH] = g_signal_new("terminal-refresh",
G_TYPE_FROM_CLASS(klass),