diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-02-10 12:16:34 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-02-10 12:16:34 +0800 |
commit | 1941ecc23ce7956dda19b9657982004b431ce2ac (patch) | |
tree | f5d63f65d523cd2e9f89e737aa6efb5d82de48a3 /x11-toolkits | |
parent | 6b57339338b7fae6326d3055bc14dd8f5864254a (diff) | |
download | marcuscom-ports-1941ecc23ce7956dda19b9657982004b431ce2ac.tar marcuscom-ports-1941ecc23ce7956dda19b9657982004b431ce2ac.tar.gz marcuscom-ports-1941ecc23ce7956dda19b9657982004b431ce2ac.tar.bz2 marcuscom-ports-1941ecc23ce7956dda19b9657982004b431ce2ac.tar.lz marcuscom-ports-1941ecc23ce7956dda19b9657982004b431ce2ac.tar.xz marcuscom-ports-1941ecc23ce7956dda19b9657982004b431ce2ac.tar.zst marcuscom-ports-1941ecc23ce7956dda19b9657982004b431ce2ac.zip |
Fix the build on 4.X.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3613 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-text.c | 30 | ||||
-rw-r--r-- | x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-vbox.c | 46 |
2 files changed, 76 insertions, 0 deletions
diff --git a/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-text.c b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-text.c new file mode 100644 index 000000000..f1ad3a450 --- /dev/null +++ b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-text.c @@ -0,0 +1,30 @@ +--- gal/a11y/e-table/gal-a11y-e-cell-text.c.orig Wed Feb 9 23:01:26 2005 ++++ gal/a11y/e-table/gal-a11y-e-cell-text.c Wed Feb 9 23:02:02 2005 +@@ -152,11 +152,12 @@ + GalA11yECell *gaec = GAL_A11Y_E_CELL (text); + gunichar ret_val; + gchar *at_offset; ++ gchar *full_text; + + if (!ect_check (text)) + return -1; + +- gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); ++ full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); + at_offset = g_utf8_offset_to_pointer (full_text, offset); + ret_val = g_utf8_get_char_validated (at_offset, -1); + g_free (full_text); +@@ -236,11 +237,12 @@ + { + GalA11yECell *gaec = GAL_A11Y_E_CELL (text); + gint ret_val; ++ gchar *full_text; + + if (!ect_check (text)) + return -1; + +- gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); ++ full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); + + ret_val = g_utf8_strlen (full_text, -1); + g_free (full_text); diff --git a/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-vbox.c b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-vbox.c new file mode 100644 index 000000000..cfde6c47c --- /dev/null +++ b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-vbox.c @@ -0,0 +1,46 @@ +--- gal/a11y/e-table/gal-a11y-e-cell-vbox.c.orig Wed Feb 9 23:03:24 2005 ++++ gal/a11y/e-table/gal-a11y-e-cell-vbox.c Wed Feb 9 23:04:46 2005 +@@ -31,8 +31,9 @@ + static gint + ecv_get_n_children (AtkObject *a11y) + { ++ GalA11yECellVbox *gaev; + g_return_val_if_fail (GAL_A11Y_IS_E_CELL_VBOX (a11y), 0); +- GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y); ++ gaev = GAL_A11Y_E_CELL_VBOX (a11y); + return (gaev->a11y_subcell_count); + } + +@@ -64,9 +65,10 @@ + if (i < gaev->a11y_subcell_count) { + if (gaev->a11y_subcells[i] == NULL) { + gint model_col, row; ++ ECellView *subcell_view; + row = gaec->row; + model_col = ecvv->model_cols[i]; +- ECellView *subcell_view = ecvv->subcell_views[i]; ++ subcell_view = ecvv->subcell_views[i]; + ret = gal_a11y_e_cell_registry_get_object (NULL, + gaec->item, + subcell_view, +@@ -200,14 +202,17 @@ + int row) + { + AtkObject *a11y; ++ GalA11yECell *gaec; ++ GalA11yECellVbox *gaev; ++ ECellVboxView *ecvv; + + a11y = g_object_new (gal_a11y_e_cell_vbox_get_type (), NULL); + + gal_a11y_e_cell_construct (a11y, item, cell_view, parent, model_col, view_col, row); + +- GalA11yECell *gaec = GAL_A11Y_E_CELL (a11y); +- GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y); +- ECellVboxView *ecvv = (ECellVboxView *) (gaec->cell_view); ++ gaec = GAL_A11Y_E_CELL (a11y); ++ gaev = GAL_A11Y_E_CELL_VBOX (a11y); ++ ecvv = (ECellVboxView *) (gaec->cell_view); + gaev->a11y_subcell_count = ecvv->subcell_view_count; + gaev->a11y_subcells = g_malloc0 (sizeof(AtkObject *)*gaev->a11y_subcell_count); + return a11y; |