Mercurial > pidgin
changeset 15928:f00f2e283ffb
Some define changes. This helps in generating the python bindings.
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Mon, 26 Mar 2007 04:10:39 +0000 |
| parents | 846a00760176 |
| children | 8fd5ab3f9716 |
| files | finch/gntblist.c finch/libgnt/gnt-skel.h finch/libgnt/gnt.h finch/libgnt/gntbindable.h finch/libgnt/gntbox.h finch/libgnt/gntbutton.h finch/libgnt/gntcheckbox.h finch/libgnt/gntclipboard.h finch/libgnt/gntcombobox.h finch/libgnt/gntentry.h finch/libgnt/gntlabel.h finch/libgnt/gntline.h finch/libgnt/gntmenu.c finch/libgnt/gntmenu.h finch/libgnt/gntmenuitem.c finch/libgnt/gntmenuitem.h finch/libgnt/gntmenuitemcheck.c finch/libgnt/gntmenuitemcheck.h finch/libgnt/gnttextview.c finch/libgnt/gnttextview.h finch/libgnt/gnttree.c finch/libgnt/gnttree.h finch/libgnt/gntwidget.h finch/libgnt/gntwindow.h finch/libgnt/gntwm.h finch/libgnt/test/file.c finch/libgnt/test/menu.c |
| diffstat | 27 files changed, 169 insertions(+), 169 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/gntblist.c Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/gntblist.c Mon Mar 26 04:10:39 2007 +0000 @@ -642,8 +642,8 @@ item = gnt_menuitem_new(action->label); if (action->callback) - gnt_menuitem_set_callback(GNT_MENUITEM(item), context_menu_callback, action); - gnt_menu_add_item(menu, GNT_MENUITEM(item)); + gnt_menuitem_set_callback(GNT_MENU_ITEM(item), context_menu_callback, action); + gnt_menu_add_item(menu, GNT_MENU_ITEM(item)); if (action->children) { GntWidget *sub = gnt_menu_new(GNT_MENU_POPUP); @@ -745,7 +745,7 @@ { PurpleMenuAction *action = data; purple_blist_node_set_bool(action->data, "gnt-autojoin", - gnt_menuitem_check_get_checked(GNT_MENUITEM_CHECK(item))); + gnt_menuitem_check_get_checked(GNT_MENU_ITEM_CHECK(item))); } static void @@ -753,7 +753,7 @@ { PurpleMenuAction *action = purple_menu_action_new(_("Auto-join"), NULL, chat, NULL); GntMenuItem *check = gnt_menuitem_check_new(action->label); - gnt_menuitem_check_set_checked(GNT_MENUITEM_CHECK(check), + gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(check), purple_blist_node_get_bool((PurpleBlistNode*)chat, "gnt-autojoin")); gnt_menu_add_item(menu, check); gnt_menuitem_set_callback(check, autojoin_toggled, action); @@ -2072,25 +2072,25 @@ item = gnt_menuitem_new(_("Send IM...")); gnt_menu_add_item(GNT_MENU(sub), item); - gnt_menuitem_set_callback(GNT_MENUITEM(item), send_im_select, NULL); + gnt_menuitem_set_callback(GNT_MENU_ITEM(item), send_im_select, NULL); item = gnt_menuitem_check_new(_("Toggle offline buddies")); - gnt_menuitem_check_set_checked(GNT_MENUITEM_CHECK(item), + gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(item), purple_prefs_get_bool(PREF_ROOT "/showoffline")); gnt_menu_add_item(GNT_MENU(sub), item); - gnt_menuitem_set_callback(GNT_MENUITEM(item), show_offline_cb, NULL); + gnt_menuitem_set_callback(GNT_MENU_ITEM(item), show_offline_cb, NULL); item = gnt_menuitem_new(_("Sort by status")); gnt_menu_add_item(GNT_MENU(sub), item); - gnt_menuitem_set_callback(GNT_MENUITEM(item), sort_blist_change_cb, "status"); + gnt_menuitem_set_callback(GNT_MENU_ITEM(item), sort_blist_change_cb, "status"); item = gnt_menuitem_new(_("Sort alphabetically")); gnt_menu_add_item(GNT_MENU(sub), item); - gnt_menuitem_set_callback(GNT_MENUITEM(item), sort_blist_change_cb, "text"); + gnt_menuitem_set_callback(GNT_MENU_ITEM(item), sort_blist_change_cb, "text"); item = gnt_menuitem_new(_("Sort by log size")); gnt_menu_add_item(GNT_MENU(sub), item); - gnt_menuitem_set_callback(GNT_MENUITEM(item), sort_blist_change_cb, "log"); + gnt_menuitem_set_callback(GNT_MENU_ITEM(item), sort_blist_change_cb, "log"); reconstruct_accounts_menu(); gnt_menu_add_item(GNT_MENU(menu), ggblist->accounts);
--- a/finch/libgnt/gnt-skel.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gnt-skel.h Mon Mar 26 04:10:39 2007 +0000 @@ -17,16 +17,16 @@ #define GNT_SKEL_SET_FLAGS(obj, flags) (GNT_SKEL_FLAGS(obj) |= flags) #define GNT_SKEL_UNSET_FLAGS(obj, flags) (GNT_SKEL_FLAGS(obj) &= ~(flags)) -typedef struct _GnSkel GntSkel; -typedef struct _GnSkelPriv GntSkelPriv; -typedef struct _GnSkelClass GntSkelClass; +typedef struct _GntSkel GntSkel; +typedef struct _GntSkelPriv GntSkelPriv; +typedef struct _GntSkelClass GntSkelClass; -struct _GnSkel +struct _GntSkel { GntWidget parent; }; -struct _GnSkelClass +struct _GntSkelClass { GntWidgetClass parent;
--- a/finch/libgnt/gnt.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gnt.h Mon Mar 26 04:10:39 2007 +0000 @@ -16,8 +16,6 @@ void gnt_screen_update(GntWidget *widget); -void gnt_screen_take_focus(GntWidget *widget); - void gnt_screen_resize_widget(GntWidget *widget, int width, int height); void gnt_screen_move_widget(GntWidget *widget, int x, int y); @@ -38,4 +36,4 @@ gchar *gnt_get_clipboard_string(void); -void gnt_set_clipboard_string(gchar *); +void gnt_set_clipboard_string(gchar *string);
--- a/finch/libgnt/gntbindable.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntbindable.h Mon Mar 26 04:10:39 2007 +0000 @@ -15,15 +15,15 @@ #define GNTDEBUG g_printerr("%s\n", __FUNCTION__) -typedef struct _GnBindable GntBindable; -typedef struct _GnBindableClass GntBindableClass; +typedef struct _GntBindable GntBindable; +typedef struct _GntBindableClass GntBindableClass; -struct _GnBindable +struct _GntBindable { GObject inherit; }; -struct _GnBindableClass +struct _GntBindableClass { GObjectClass parent; @@ -52,10 +52,10 @@ typedef gboolean (*GntBindableActionCallback) (GntBindable *bindable, GList *params); typedef gboolean (*GntBindableActionCallbackNoParam)(GntBindable *bindable); -typedef struct _GnBindableAction GntBindableAction; -typedef struct _GnBindableActionParam GntBindableActionParam; +typedef struct _GntBindableAction GntBindableAction; +typedef struct _GntBindableActionParam GntBindableActionParam; -struct _GnBindableAction +struct _GntBindableAction { char *name; /* The name of the action */ union { @@ -64,7 +64,7 @@ } u; }; -struct _GnBindableActionParam +struct _GntBindableActionParam { GntBindableAction *action; GList *list;
--- a/finch/libgnt/gntbox.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntbox.h Mon Mar 26 04:10:39 2007 +0000 @@ -11,8 +11,8 @@ #define GNT_IS_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_BOX)) #define GNT_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_BOX, GntBoxClass)) -typedef struct _GnBox GntBox; -typedef struct _GnBoxClass GntBoxClass; +typedef struct _GntBox GntBox; +typedef struct _GntBoxClass GntBoxClass; typedef enum { @@ -27,7 +27,7 @@ GNT_ALIGN_BOTTOM } GntAlignment; -struct _GnBox +struct _GntBox { GntWidget parent; @@ -49,7 +49,7 @@ void (*gnt_reserved4)(void); }; -struct _GnBoxClass +struct _GntBoxClass { GntWidgetClass parent;
--- a/finch/libgnt/gntbutton.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntbutton.h Mon Mar 26 04:10:39 2007 +0000 @@ -13,16 +13,16 @@ #define GNT_IS_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_BUTTON)) #define GNT_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_BUTTON, GntButtonClass)) -typedef struct _GnButton GntButton; -typedef struct _GnButtonPriv GntButtonPriv; -typedef struct _GnButtonClass GntButtonClass; +typedef struct _GntButton GntButton; +typedef struct _GntButtonPriv GntButtonPriv; +typedef struct _GntButtonClass GntButtonClass; -struct _GnButtonPriv +struct _GntButtonPriv { char *text; }; -struct _GnButton +struct _GntButton { GntWidget parent; @@ -34,7 +34,7 @@ void (*gnt_reserved4)(void); }; -struct _GnButtonClass +struct _GntButtonClass { GntWidgetClass parent;
--- a/finch/libgnt/gntcheckbox.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntcheckbox.h Mon Mar 26 04:10:39 2007 +0000 @@ -17,17 +17,17 @@ #define GNT_CHECK_BOX_SET_FLAGS(obj, flags) (GNT_CHECK_BOX_FLAGS(obj) |= flags) #define GNT_CHECK_BOX_UNSET_FLAGS(obj, flags) (GNT_CHECK_BOX_FLAGS(obj) &= ~(flags)) -typedef struct _GnCheckBox GntCheckBox; -typedef struct _GnCheckBoxPriv GntCheckBoxPriv; -typedef struct _GnCheckBoxClass GntCheckBoxClass; +typedef struct _GntCheckBox GntCheckBox; +typedef struct _GntCheckBoxPriv GntCheckBoxPriv; +typedef struct _GntCheckBoxClass GntCheckBoxClass; -struct _GnCheckBox +struct _GntCheckBox { GntButton parent; gboolean checked; }; -struct _GnCheckBoxClass +struct _GntCheckBoxClass { GntButtonClass parent;
--- a/finch/libgnt/gntclipboard.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntclipboard.h Mon Mar 26 04:10:39 2007 +0000 @@ -14,16 +14,16 @@ #define GNTDEBUG g_printerr("%s\n", __FUNCTION__) -typedef struct _GnClipboard GntClipboard; -typedef struct _GnClipboardClass GntClipboardClass; +typedef struct _GntClipboard GntClipboard; +typedef struct _GntClipboardClass GntClipboardClass; -struct _GnClipboard +struct _GntClipboard { GObject inherit; gchar *string; }; -struct _GnClipboardClass +struct _GntClipboardClass { GObjectClass parent; @@ -37,9 +37,9 @@ GType gnt_clipboard_get_gtype(void); -gchar *gnt_clipboard_get_string(GntClipboard *); +gchar *gnt_clipboard_get_string(GntClipboard *clip); -void gnt_clipboard_set_string(GntClipboard *, gchar *); +void gnt_clipboard_set_string(GntClipboard *clip, gchar *string); G_END_DECLS
--- a/finch/libgnt/gntcombobox.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntcombobox.h Mon Mar 26 04:10:39 2007 +0000 @@ -17,11 +17,11 @@ #define GNT_COMBO_BOX_SET_FLAGS(obj, flags) (GNT_COMBO_BOX_FLAGS(obj) |= flags) #define GNT_COMBO_BOX_UNSET_FLAGS(obj, flags) (GNT_COMBO_BOX_FLAGS(obj) &= ~(flags)) -typedef struct _GnComboBox GntComboBox; -typedef struct _GnComboBoxPriv GntComboBoxPriv; -typedef struct _GnComboBoxClass GntComboBoxClass; +typedef struct _GntComboBox GntComboBox; +typedef struct _GntComboBoxPriv GntComboBoxPriv; +typedef struct _GntComboBoxClass GntComboBoxClass; -struct _GnComboBox +struct _GntComboBox { GntWidget parent; @@ -30,7 +30,7 @@ void *selected; /* Currently selected key */ }; -struct _GnComboBoxClass +struct _GntComboBoxClass { GntWidgetClass parent;
--- a/finch/libgnt/gntentry.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntentry.h Mon Mar 26 04:10:39 2007 +0000 @@ -19,9 +19,9 @@ #define ENTRY_CHAR '_' /* The character to use to fill in the blank places */ -typedef struct _GnEntry GntEntry; -typedef struct _GnEntryPriv GntEntryPriv; -typedef struct _GnEntryClass GntEntryClass; +typedef struct _GntEntry GntEntry; +typedef struct _GntEntryPriv GntEntryPriv; +typedef struct _GntEntryClass GntEntryClass; typedef enum { @@ -34,7 +34,7 @@ #define GNT_ENTRY_FLAG_ALL (GNT_ENTRY_FLAG_ALPHA | GNT_ENTRY_FLAG_INT) -struct _GnEntry +struct _GntEntry { GntWidget parent; @@ -60,7 +60,7 @@ GntWidget *ddown; /* The dropdown with the suggested list */ }; -struct _GnEntryClass +struct _GntEntryClass { GntWidgetClass parent;
--- a/finch/libgnt/gntlabel.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntlabel.h Mon Mar 26 04:10:39 2007 +0000 @@ -12,10 +12,10 @@ #define GNT_IS_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_LABEL)) #define GNT_LABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_LABEL, GntLabelClass)) -typedef struct _GnLabel GntLabel; -typedef struct _GnLabelClass GntLabelClass; +typedef struct _GntLabel GntLabel; +typedef struct _GntLabelClass GntLabelClass; -struct _GnLabel +struct _GntLabel { GntWidget parent; @@ -28,7 +28,7 @@ void (*gnt_reserved4)(void); }; -struct _GnLabelClass +struct _GntLabelClass { GntWidgetClass parent;
--- a/finch/libgnt/gntline.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntline.h Mon Mar 26 04:10:39 2007 +0000 @@ -17,18 +17,18 @@ #define GNT_LINE_SET_FLAGS(obj, flags) (GNT_LINE_FLAGS(obj) |= flags) #define GNT_LINE_UNSET_FLAGS(obj, flags) (GNT_LINE_FLAGS(obj) &= ~(flags)) -typedef struct _GnLine GntLine; -typedef struct _GnLinePriv GntLinePriv; -typedef struct _GnLineClass GntLineClass; +typedef struct _GntLine GntLine; +typedef struct _GntLinePriv GntLinePriv; +typedef struct _GntLineClass GntLineClass; -struct _GnLine +struct _GntLine { GntWidget parent; gboolean vertical; }; -struct _GnLineClass +struct _GntLineClass { GntWidgetClass parent;
--- a/finch/libgnt/gntmenu.c Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntmenu.c Mon Mar 26 04:10:39 2007 +0000 @@ -28,7 +28,7 @@ werase(widget->window); for (i = 0, iter = menu->list; iter; iter = iter->next, i++) { - GntMenuItem *item = GNT_MENUITEM(iter->data); + GntMenuItem *item = GNT_MENU_ITEM(iter->data); type = ' ' | COLOR_PAIR(GNT_COLOR_HIGHLIGHT); if (i == menu->selected) type |= A_REVERSE; @@ -61,10 +61,10 @@ static void menu_tree_add(GntMenu *menu, GntMenuItem *item, GntMenuItem *parent) { - if (GNT_IS_MENUITEM_CHECK(item)) { + if (GNT_IS_MENU_ITEM_CHECK(item)) { gnt_tree_add_choice(GNT_TREE(menu), item, gnt_tree_create_row(GNT_TREE(menu), item->text, " "), parent, NULL); - gnt_tree_set_choice(GNT_TREE(menu), item, gnt_menuitem_check_get_checked(GNT_MENUITEM_CHECK(item))); + gnt_tree_set_choice(GNT_TREE(menu), item, gnt_menuitem_check_get_checked(GNT_MENU_ITEM_CHECK(item))); } else gnt_tree_add_row_last(GNT_TREE(menu), item, gnt_tree_create_row(GNT_TREE(menu), item->text, item->submenu ? ">" : " "), parent); @@ -73,7 +73,7 @@ GntMenu *sub = GNT_MENU(item->submenu); GList *iter; for (iter = sub->list; iter; iter = iter->next) { - GntMenuItem *it = GNT_MENUITEM(iter->data); + GntMenuItem *it = GNT_MENU_ITEM(iter->data); menu_tree_add(menu, it, item); } } @@ -91,7 +91,7 @@ GList *iter; gnt_tree_remove_all(GNT_TREE(widget)); for (iter = menu->list; iter; iter = iter->next) { - GntMenuItem *item = GNT_MENUITEM(iter->data); + GntMenuItem *item = GNT_MENU_ITEM(iter->data); menu_tree_add(menu, item, NULL); } org_map(widget); @@ -185,10 +185,10 @@ static void gnt_menu_toggled(GntTree *tree, gpointer key) { - GntMenuItem *item = GNT_MENUITEM(key); + GntMenuItem *item = GNT_MENU_ITEM(key); GntMenu *menu = GNT_MENU(tree); - gboolean check = gnt_menuitem_check_get_checked(GNT_MENUITEM_CHECK(item)); - gnt_menuitem_check_set_checked(GNT_MENUITEM_CHECK(item), !check); + gboolean check = gnt_menuitem_check_get_checked(GNT_MENU_ITEM_CHECK(item)); + gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(item), !check); if (item->callback) item->callback(item, item->callbackdata); while (menu) { @@ -210,7 +210,7 @@ } if (item) { - if (GNT_IS_MENUITEM_CHECK(item)) + if (GNT_IS_MENU_ITEM_CHECK(item)) gnt_menu_toggled(GNT_TREE(widget), item); else menuitem_activate(menu, item);
--- a/finch/libgnt/gntmenu.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntmenu.h Mon Mar 26 04:10:39 2007 +0000 @@ -16,9 +16,9 @@ #define GNT_MENU_SET_FLAGS(obj, flags) (GNT_MENU_FLAGS(obj) |= flags) #define GNT_MENU_UNSET_FLAGS(obj, flags) (GNT_MENU_FLAGS(obj) &= ~(flags)) -typedef struct _GnMenu GntMenu; -typedef struct _GnMenuPriv GntMenuPriv; -typedef struct _GnMenuClass GntMenuClass; +typedef struct _GntMenu GntMenu; +typedef struct _GntMenuPriv GntMenuPriv; +typedef struct _GntMenuClass GntMenuClass; #include "gntmenuitem.h" @@ -33,7 +33,7 @@ GNT_MENU_POPUP, /* A popup menu */ } GntMenuType; -struct _GnMenu +struct _GntMenu { GntTree parent; GntMenuType type; @@ -47,7 +47,7 @@ GntMenu *parentmenu; }; -struct _GnMenuClass +struct _GntMenuClass { GntTreeClass parent;
--- a/finch/libgnt/gntmenuitem.c Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntmenuitem.c Mon Mar 26 04:10:39 2007 +0000 @@ -6,7 +6,7 @@ static void gnt_menuitem_destroy(GObject *obj) { - GntMenuItem *item = GNT_MENUITEM(obj); + GntMenuItem *item = GNT_MENU_ITEM(obj); g_free(item->text); item->text = NULL; if (item->submenu) @@ -61,8 +61,8 @@ GntMenuItem *gnt_menuitem_new(const char *text) { - GObject *item = g_object_new(GNT_TYPE_MENUITEM, NULL); - GntMenuItem *menuitem = GNT_MENUITEM(item); + GObject *item = g_object_new(GNT_TYPE_MENU_ITEM, NULL); + GntMenuItem *menuitem = GNT_MENU_ITEM(item); menuitem->text = g_strdup(text);
--- a/finch/libgnt/gntmenuitem.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntmenuitem.h Mon Mar 26 04:10:39 2007 +0000 @@ -4,24 +4,24 @@ #include <glib.h> #include <glib-object.h> -#define GNT_TYPE_MENUITEM (gnt_menuitem_get_gtype()) -#define GNT_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_MENUITEM, GntMenuItem)) -#define GNT_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_MENUITEM, GntMenuItemClass)) -#define GNT_IS_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_MENUITEM)) -#define GNT_IS_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_MENUITEM)) -#define GNT_MENUITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_MENUITEM, GntMenuItemClass)) +#define GNT_TYPE_MENU_ITEM (gnt_menuitem_get_gtype()) +#define GNT_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_MENU_ITEM, GntMenuItem)) +#define GNT_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_MENU_ITEM, GntMenuItemClass)) +#define GNT_IS_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_MENU_ITEM)) +#define GNT_IS_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_MENU_ITEM)) +#define GNT_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_MENU_ITEM, GntMenuItemClass)) -#define GNT_MENUITEM_FLAGS(obj) (GNT_MENUITEM(obj)->priv.flags) -#define GNT_MENUITEM_SET_FLAGS(obj, flags) (GNT_MENUITEM_FLAGS(obj) |= flags) -#define GNT_MENUITEM_UNSET_FLAGS(obj, flags) (GNT_MENUITEM_FLAGS(obj) &= ~(flags)) +#define GNT_MENU_ITEM_FLAGS(obj) (GNT_MENU_ITEM(obj)->priv.flags) +#define GNT_MENU_ITEM_SET_FLAGS(obj, flags) (GNT_MENU_ITEM_FLAGS(obj) |= flags) +#define GNT_MENU_ITEM_UNSET_FLAGS(obj, flags) (GNT_MENU_ITEM_FLAGS(obj) &= ~(flags)) -typedef struct _GnMenuItem GntMenuItem; -typedef struct _GnMenuItemPriv GntMenuItemPriv; -typedef struct _GnMenuItemClass GntMenuItemClass; +typedef struct _GntMenuItem GntMenuItem; +typedef struct _GntMenuItemPriv GntMenuItemPriv; +typedef struct _GntMenuItemClass GntMenuItemClass; #include "gntmenu.h" -struct _GnMenuItemPriv +struct _GntMenuItemPriv { /* These will be used to determine the position of the submenu */ int x; @@ -30,7 +30,7 @@ typedef void (*GntMenuItemCallback)(GntMenuItem *item, gpointer data); -struct _GnMenuItem +struct _GntMenuItem { GObject parent; GntMenuItemPriv priv; @@ -46,7 +46,7 @@ GntMenu *submenu; }; -struct _GnMenuItemClass +struct _GntMenuItemClass { GObjectClass parent;
--- a/finch/libgnt/gntmenuitemcheck.c Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntmenuitemcheck.c Mon Mar 26 04:10:39 2007 +0000 @@ -5,7 +5,7 @@ static void gnt_menuitem_check_class_init(GntMenuItemCheckClass *klass) { - parent_class = GNT_MENUITEM_CLASS(klass); + parent_class = GNT_MENU_ITEM_CLASS(klass); GNTDEBUG; } @@ -39,7 +39,7 @@ NULL /* value_table */ }; - type = g_type_register_static(GNT_TYPE_MENUITEM, + type = g_type_register_static(GNT_TYPE_MENU_ITEM, "GntMenuItemCheck", &info, 0); } @@ -49,8 +49,8 @@ GntMenuItem *gnt_menuitem_check_new(const char *text) { - GntMenuItem *item = g_object_new(GNT_TYPE_MENUITEM_CHECK, NULL); - GntMenuItem *menuitem = GNT_MENUITEM(item); + GntMenuItem *item = g_object_new(GNT_TYPE_MENU_ITEM_CHECK, NULL); + GntMenuItem *menuitem = GNT_MENU_ITEM(item); menuitem->text = g_strdup(text); return item;
--- a/finch/libgnt/gntmenuitemcheck.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntmenuitemcheck.h Mon Mar 26 04:10:39 2007 +0000 @@ -1,33 +1,33 @@ -#ifndef GNT_MENUITEM_CHECK_H -#define GNT_MENUITEM_CHECK_H +#ifndef GNT_MENU_ITEM_CHECK_H +#define GNT_MENU_ITEM_CHECK_H #include "gnt.h" #include "gntcolors.h" #include "gntkeys.h" #include "gntmenuitem.h" -#define GNT_TYPE_MENUITEM_CHECK (gnt_menuitem_check_get_gtype()) -#define GNT_MENUITEM_CHECK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_MENUITEM_CHECK, GntMenuItemCheck)) -#define GNT_MENUITEM_CHECK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_MENUITEM_CHECK, GntMenuItemCheckClass)) -#define GNT_IS_MENUITEM_CHECK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_MENUITEM_CHECK)) -#define GNT_IS_MENUITEM_CHECK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_MENUITEM_CHECK)) -#define GNT_MENUITEM_CHECK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_MENUITEM_CHECK, GntMenuItemCheckClass)) +#define GNT_TYPE_MENU_ITEM_CHECK (gnt_menuitem_check_get_gtype()) +#define GNT_MENU_ITEM_CHECK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_MENU_ITEM_CHECK, GntMenuItemCheck)) +#define GNT_MENU_ITEM_CHECK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_MENU_ITEM_CHECK, GntMenuItemCheckClass)) +#define GNT_IS_MENU_ITEM_CHECK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_MENU_ITEM_CHECK)) +#define GNT_IS_MENU_ITEM_CHECK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_MENU_ITEM_CHECK)) +#define GNT_MENU_ITEM_CHECK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_MENU_ITEM_CHECK, GntMenuItemCheckClass)) -#define GNT_MENUITEM_CHECK_FLAGS(obj) (GNT_MENUITEM_CHECK(obj)->priv.flags) -#define GNT_MENUITEM_CHECK_SET_FLAGS(obj, flags) (GNT_MENUITEM_CHECK_FLAGS(obj) |= flags) -#define GNT_MENUITEM_CHECK_UNSET_FLAGS(obj, flags) (GNT_MENUITEM_CHECK_FLAGS(obj) &= ~(flags)) +#define GNT_MENU_ITEM_CHECK_FLAGS(obj) (GNT_MENU_ITEM_CHECK(obj)->priv.flags) +#define GNT_MENU_ITEM_CHECK_SET_FLAGS(obj, flags) (GNT_MENU_ITEM_CHECK_FLAGS(obj) |= flags) +#define GNT_MENU_ITEM_CHECK_UNSET_FLAGS(obj, flags) (GNT_MENU_ITEM_CHECK_FLAGS(obj) &= ~(flags)) -typedef struct _GnMenuItemCheck GntMenuItemCheck; -typedef struct _GnMenuItemCheckPriv GntMenuItemCheckPriv; -typedef struct _GnMenuItemCheckClass GntMenuItemCheckClass; +typedef struct _GntMenuItemCheck GntMenuItemCheck; +typedef struct _GntMenuItemCheckPriv GntMenuItemCheckPriv; +typedef struct _GntMenuItemCheckClass GntMenuItemCheckClass; -struct _GnMenuItemCheck +struct _GntMenuItemCheck { GntMenuItem parent; gboolean checked; }; -struct _GnMenuItemCheckClass +struct _GntMenuItemCheckClass { GntMenuItemClass parent; @@ -49,4 +49,4 @@ G_END_DECLS -#endif /* GNT_MENUITEM_CHECK_H */ +#endif /* GNT_MENU_ITEM_CHECK_H */
--- a/finch/libgnt/gnttextview.c Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gnttextview.c Mon Mar 26 04:10:39 2007 +0000 @@ -44,6 +44,7 @@ GList *lines; int rows, scrcol; + wbkgd(widget->window, COLOR_PAIR(GNT_COLOR_NORMAL)); werase(widget->window); for (i = 0, lines = view->list; i < widget->priv.height && lines; i++, lines = lines->next) @@ -434,7 +435,7 @@ GntWidget *gnt_text_view_new() { - GntWidget *widget = g_object_new(GNT_TYPE_TEXTVIEW, NULL); + GntWidget *widget = g_object_new(GNT_TYPE_TEXT_VIEW, NULL); GntTextView *view = GNT_TEXT_VIEW(widget); GntTextLine *line = g_new0(GntTextLine, 1);
--- a/finch/libgnt/gnttextview.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gnttextview.h Mon Mar 26 04:10:39 2007 +0000 @@ -6,22 +6,22 @@ #include "gntcolors.h" #include "gntkeys.h" -#define GNT_TYPE_TEXTVIEW (gnt_text_view_get_gtype()) -#define GNT_TEXT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TEXTVIEW, GntTextView)) -#define GNT_TEXT_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_TEXTVIEW, GntTextViewClass)) -#define GNT_IS_TEXTVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_TEXTVIEW)) -#define GNT_IS_TEXTVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_TEXTVIEW)) -#define GNT_TEXT_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_TEXTVIEW, GntTextViewClass)) +#define GNT_TYPE_TEXT_VIEW (gnt_text_view_get_gtype()) +#define GNT_TEXT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TEXT_VIEW, GntTextView)) +#define GNT_TEXT_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_TEXT_VIEW, GntTextViewClass)) +#define GNT_IS_TEXT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_TEXT_VIEW)) +#define GNT_IS_TEXT_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_TEXT_VIEW)) +#define GNT_TEXT_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_TEXT_VIEW, GntTextViewClass)) #define GNT_TEXT_VIEW_FLAGS(obj) (GNT_TEXT_VIEW(obj)->priv.flags) #define GNT_TEXT_VIEW_SET_FLAGS(obj, flags) (GNT_TEXT_VIEW_FLAGS(obj) |= flags) #define GNT_TEXT_VIEW_UNSET_FLAGS(obj, flags) (GNT_TEXT_VIEW_FLAGS(obj) &= ~(flags)) -typedef struct _GnTextView GntTextView; -typedef struct _GnTextViewPriv GntTextViewPriv; -typedef struct _GnTextViewClass GntTextViewClass; +typedef struct _GntTextView GntTextView; +typedef struct _GntTextViewPriv GntTextViewPriv; +typedef struct _GntTextViewClass GntTextViewClass; -struct _GnTextView +struct _GntTextView { GntWidget parent; @@ -41,7 +41,7 @@ GNT_TEXT_FLAG_HIGHLIGHT = 1 << 4, } GntTextFormatFlags; -struct _GnTextViewClass +struct _GntTextViewClass { GntWidgetClass parent;
--- a/finch/libgnt/gnttree.c Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gnttree.c Mon Mar 26 04:10:39 2007 +0000 @@ -20,7 +20,7 @@ /* XXX: Make this one into a GObject? * ... Probably not */ -struct _GnTreeRow +struct _GntTreeRow { void *key; void *data; /* XXX: unused */ @@ -40,7 +40,7 @@ GntTree *tree; }; -struct _GnTreeCol +struct _GntTreeCol { char *text; int span; /* How many columns does it span? */
--- a/finch/libgnt/gnttree.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gnttree.h Mon Mar 26 04:10:39 2007 +0000 @@ -18,14 +18,14 @@ #define GNT_TREE_SET_FLAGS(obj, flags) (GNT_TREE_FLAGS(obj) |= flags) #define GNT_TREE_UNSET_FLAGS(obj, flags) (GNT_TREE_FLAGS(obj) &= ~(flags)) -typedef struct _GnTree GntTree; -typedef struct _GnTreePriv GntTreePriv; -typedef struct _GnTreeClass GntTreeClass; +typedef struct _GntTree GntTree; +typedef struct _GntTreePriv GntTreePriv; +typedef struct _GntTreeClass GntTreeClass; -typedef struct _GnTreeRow GntTreeRow; -typedef struct _GnTreeCol GntTreeCol; +typedef struct _GntTreeRow GntTreeRow; +typedef struct _GntTreeCol GntTreeCol; -struct _GnTree +struct _GntTree { GntWidget parent; @@ -58,7 +58,7 @@ GCompareFunc compare; }; -struct _GnTreeClass +struct _GntTreeClass { GntWidgetClass parent;
--- a/finch/libgnt/gntwidget.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntwidget.h Mon Mar 26 04:10:39 2007 +0000 @@ -19,11 +19,11 @@ #define GNT_WIDGET_UNSET_FLAGS(obj, flags) (GNT_WIDGET_FLAGS(obj) &= ~(flags)) #define GNT_WIDGET_IS_FLAG_SET(obj, flags) (GNT_WIDGET_FLAGS(obj) & (flags)) -typedef struct _GnWidget GntWidget; -typedef struct _GnWidgetPriv GntWidgetPriv; -typedef struct _GnWidgetClass GntWidgetClass; +typedef struct _GntWidget GntWidget; +typedef struct _GntWidgetPriv GntWidgetPriv; +typedef struct _GntWidgetClass GntWidgetClass; -typedef enum _GnWidgetFlags +typedef enum _GntWidgetFlags { GNT_WIDGET_DESTROYING = 1 << 0, GNT_WIDGET_CAN_TAKE_FOCUS = 1 << 1, @@ -42,7 +42,7 @@ } GntWidgetFlags; /* XXX: This will probably move elsewhere */ -typedef enum _GnMouseEvent +typedef enum _GntMouseEvent { GNT_LEFT_MOUSE_DOWN = 1, GNT_RIGHT_MOUSE_DOWN, @@ -53,12 +53,12 @@ } GntMouseEvent; /* XXX: I'll have to ask grim what he's using this for in guifications. */ -typedef enum _GnParamFlags +typedef enum _GntParamFlags { GNT_PARAM_SERIALIZABLE = 1 << G_PARAM_USER_SHIFT } GntParamFlags; -struct _GnWidgetPriv +struct _GntWidgetPriv { int x, y; int width, height; @@ -68,7 +68,7 @@ int minw, minh; /* Minimum size for the widget */ }; -struct _GnWidget +struct _GntWidget { GntBindable inherit; @@ -83,7 +83,7 @@ void (*gnt_reserved4)(void); }; -struct _GnWidgetClass +struct _GntWidgetClass { GntBindableClass parent;
--- a/finch/libgnt/gntwindow.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntwindow.h Mon Mar 26 04:10:39 2007 +0000 @@ -18,17 +18,17 @@ #define GNT_WINDOW_SET_FLAGS(obj, flags) (GNT_WINDOW_FLAGS(obj) |= flags) #define GNT_WINDOW_UNSET_FLAGS(obj, flags) (GNT_WINDOW_FLAGS(obj) &= ~(flags)) -typedef struct _GnWindow GntWindow; -typedef struct _GnWindowPriv GntWindowPriv; -typedef struct _GnWindowClass GntWindowClass; +typedef struct _GntWindow GntWindow; +typedef struct _GntWindowPriv GntWindowPriv; +typedef struct _GntWindowClass GntWindowClass; -struct _GnWindow +struct _GntWindow { GntBox parent; GntMenu *menu; }; -struct _GnWindowClass +struct _GntWindowClass { GntBoxClass parent;
--- a/finch/libgnt/gntwm.h Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/gntwm.h Mon Mar 26 04:10:39 2007 +0000 @@ -27,9 +27,9 @@ PANEL *panel; } GntNode; -typedef struct _GntWM GntWM; +typedef struct _GnttWM GntWM; -typedef struct _GnPosition +typedef struct _GntPosition { int x; int y; @@ -38,13 +38,13 @@ /** * An application can register actions which will show up in a 'start-menu' like popup */ -typedef struct _GnAction +typedef struct _GntAction { const char *label; void (*callback)(); } GntAction; -struct _GntWM +struct _GnttWM { GntBindable inherit; @@ -89,9 +89,9 @@ void *res4; }; -typedef struct _GnWMClass GntWMClass; +typedef struct _GntWMClass GntWMClass; -struct _GnWMClass +struct _GntWMClass { GntBindableClass parent;
--- a/finch/libgnt/test/file.c Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/test/file.c Mon Mar 26 04:10:39 2007 +0000 @@ -9,6 +9,7 @@ GntWidget *w = gnt_file_sel_new(); gnt_file_sel_set_current_location(GNT_FILE_SEL(w), "/home/"); gnt_file_sel_set_dirs_only(GNT_FILE_SEL(w), TRUE); + gnt_file_sel_set_multi_select(GNT_FILE_SEL(w), TRUE); gnt_widget_show(w); gnt_main();
--- a/finch/libgnt/test/menu.c Mon Mar 26 04:06:15 2007 +0000 +++ b/finch/libgnt/test/menu.c Mon Mar 26 04:10:39 2007 +0000 @@ -22,29 +22,29 @@ GntWidget *menu = gnt_menu_new(GNT_MENU_TOPLEVEL); GObject *item = gnt_menuitem_new("File"); - gnt_menu_add_item(GNT_MENU(menu), GNT_MENUITEM(item)); + gnt_menu_add_item(GNT_MENU(menu), GNT_MENU_ITEM(item)); item = gnt_menuitem_new("Edit"); - gnt_menu_add_item(GNT_MENU(menu), GNT_MENUITEM(item)); + gnt_menu_add_item(GNT_MENU(menu), GNT_MENU_ITEM(item)); item = gnt_menuitem_new("Help"); - gnt_menu_add_item(GNT_MENU(menu), GNT_MENUITEM(item)); + gnt_menu_add_item(GNT_MENU(menu), GNT_MENU_ITEM(item)); GntWidget *sub = gnt_menu_new(GNT_MENU_POPUP); - gnt_menuitem_set_submenu(GNT_MENUITEM(item), GNT_MENU(sub)); + gnt_menuitem_set_submenu(GNT_MENU_ITEM(item), GNT_MENU(sub)); item = gnt_menuitem_new("Online Help"); - gnt_menu_add_item(GNT_MENU(sub), GNT_MENUITEM(item)); + gnt_menu_add_item(GNT_MENU(sub), GNT_MENU_ITEM(item)); item = gnt_menuitem_new("About"); - gnt_menu_add_item(GNT_MENU(sub), GNT_MENUITEM(item)); + gnt_menu_add_item(GNT_MENU(sub), GNT_MENU_ITEM(item)); sub = gnt_menu_new(GNT_MENU_POPUP); - gnt_menuitem_set_submenu(GNT_MENUITEM(item), GNT_MENU(sub)); + gnt_menuitem_set_submenu(GNT_MENU_ITEM(item), GNT_MENU(sub)); item = gnt_menuitem_new("Online Help"); - gnt_menu_add_item(GNT_MENU(sub), GNT_MENUITEM(item)); - gnt_menuitem_set_callback(GNT_MENUITEM(item), dothis, NULL); + gnt_menu_add_item(GNT_MENU(sub), GNT_MENU_ITEM(item)); + gnt_menuitem_set_callback(GNT_MENU_ITEM(item), dothis, NULL); gnt_screen_menu_show(menu);