Created
December 31, 2024 05:28
-
-
Save ushitora-anqou/033c54ce64c4568b50a0edc95dd57fb5 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff -rup libgda-ui/data-entries/gdaui-entry-bin.c libgda-ui/data-entries/gdaui-entry-bin.c | |
| --- libgda-ui/data-entries/gdaui-entry-bin.c 2020-11-09 05:23:19.000000000 +0900 | |
| +++ libgda-ui/data-entries/gdaui-entry-bin.c 2024-12-31 14:09:02.448329140 +0900 | |
| @@ -239,11 +239,11 @@ create_entry (GdauiEntryWrapper *mgwrap) | |
| label = gtk_label_new (""); | |
| gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); | |
| - dbin->priv->button_label = g_object_ref (G_OBJECT (label)); | |
| + dbin->priv->button_label = (GtkWidget *)(g_object_ref (G_OBJECT (label))); | |
| img = gtk_image_new_from_pixbuf (attach_pixbuf); | |
| gtk_box_pack_start (GTK_BOX (hbox), img, FALSE, FALSE, 0); | |
| - dbin->priv->button_image = g_object_ref (G_OBJECT (img)); | |
| + dbin->priv->button_image = (GtkWidget *)(g_object_ref (G_OBJECT (img))); | |
| arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); | |
| gtk_misc_set_alignment (GTK_MISC (arrow), 1.0, -1); | |
| diff -rup libgda-ui/gdaui-raw-form.c libgda-ui/gdaui-raw-form.c | |
| --- libgda-ui/gdaui-raw-form.c 2020-11-09 05:23:19.000000000 +0900 | |
| +++ libgda-ui/gdaui-raw-form.c 2024-12-31 14:09:41.794371970 +0900 | |
| @@ -383,7 +383,7 @@ gdaui_raw_form_set_property (GObject *ob | |
| if (!form->priv->proxy) { | |
| /* first time setting */ | |
| if (GDA_IS_DATA_PROXY (model)) | |
| - form->priv->proxy = g_object_ref (G_OBJECT (model)); | |
| + form->priv->proxy = (GdaDataProxy *)(g_object_ref (G_OBJECT (model))); | |
| else | |
| form->priv->proxy = GDA_DATA_PROXY (gda_data_proxy_new (model)); | |
| form->priv->data_model = gda_data_proxy_get_proxied_model (form->priv->proxy); | |
| diff -rup libgda-ui/gdaui-raw-grid.c libgda-ui/gdaui-raw-grid.c | |
| --- libgda-ui/gdaui-raw-grid.c 2020-11-09 05:23:19.000000000 +0900 | |
| +++ libgda-ui/gdaui-raw-grid.c 2024-12-31 14:10:59.851450963 +0900 | |
| @@ -517,7 +517,7 @@ gdaui_raw_grid_set_property (GObject *ob | |
| if (!grid->priv->proxy) { | |
| /* first time setting */ | |
| if (GDA_IS_DATA_PROXY (model)) | |
| - grid->priv->proxy = g_object_ref (G_OBJECT (model)); | |
| + grid->priv->proxy = (GdaDataProxy *)(g_object_ref (G_OBJECT (model))); | |
| else | |
| grid->priv->proxy = GDA_DATA_PROXY (gda_data_proxy_new (model)); | |
| @@ -787,7 +787,7 @@ create_columns_data (GdauiRawGrid *grid) | |
| /* FIXME: if nullok is FALSE, then set the column title in bold */ | |
| cdata->tooltip_text = g_strdup (_("Can't be NULL")); | |
| renderer = gdaui_data_cell_renderer_combo_new (grid->priv->iter_info, gdaui_set_group_get_source (group)); | |
| - cdata->data_cell = g_object_ref_sink ((GObject*) renderer); | |
| + cdata->data_cell = (GtkCellRenderer *)(g_object_ref_sink ((GObject*) renderer)); | |
| g_hash_table_insert (grid->priv->columns_hash, renderer, cdata); | |
| g_free (cdata->title); | |
| cdata->title = title; | |
| @@ -827,7 +827,7 @@ create_columns_data (GdauiRawGrid *grid) | |
| GDAUI_ATTRIBUTE_PLUGIN); | |
| } | |
| renderer = _gdaui_new_cell_renderer (g_type, plugin); | |
| - cdata->data_cell = g_object_ref_sink ((GObject*) renderer); | |
| + cdata->data_cell = (GtkCellRenderer *)(g_object_ref_sink ((GObject*) renderer)); | |
| g_hash_table_insert (grid->priv->columns_hash, renderer, cdata); | |
| g_free (cdata->title); | |
| cdata->title = title; | |
| @@ -849,7 +849,7 @@ create_columns_data (GdauiRawGrid *grid) | |
| /* Adding the GValue's information cell as another GtkCellRenderer */ | |
| renderer = gdaui_data_cell_renderer_info_new (grid->priv->store, grid->priv->iter, group); | |
| - cdata->info_cell = g_object_ref_sink ((GObject*) renderer); | |
| + cdata->info_cell = (GtkCellRenderer *)(g_object_ref_sink ((GObject*) renderer)); | |
| g_hash_table_insert (grid->priv->columns_hash, renderer, cdata); | |
| g_signal_connect (G_OBJECT (renderer), "status-changed", | |
| G_CALLBACK (data_cell_status_changed), grid); | |
| @@ -2915,7 +2915,7 @@ paramlist_param_attr_changed_cb (G_GNUC_ | |
| GtkCellRenderer *renderer; | |
| gint model_col; | |
| renderer = _gdaui_new_cell_renderer (gda_holder_get_g_type (param), plugin); | |
| - cdata->data_cell = g_object_ref_sink ((GObject*) renderer); | |
| + cdata->data_cell = (GtkCellRenderer *)(g_object_ref_sink ((GObject*) renderer)); | |
| g_hash_table_insert (grid->priv->columns_hash, renderer, cdata); | |
| model_col = g_slist_index (((GdaSet *)grid->priv->iter)->holders, param); | |
| diff -rup libgda-xslt/sql_backend.c libgda-xslt/sql_backend.c | |
| --- libgda-xslt/sql_backend.c 2020-11-09 05:23:19.000000000 +0900 | |
| +++ libgda-xslt/sql_backend.c 2024-12-31 14:07:55.926251566 +0900 | |
| @@ -152,7 +152,7 @@ _gda_xslt_bk_section (GdaXsltExCont * ex | |
| if (info != NULL) { | |
| xsltCallTemplate | |
| (ctxt, node, | |
| - cur_node, info); | |
| + cur_node, (xsltElemPreCompPtr)info); | |
| } | |
| else { | |
| printf ("the xsltStylePreCompPtr is empthy\n"); | |
| diff -rup providers/web/gda-web-provider.c providers/web/gda-web-provider.c | |
| --- providers/web/gda-web-provider.c 2020-11-09 05:23:20.000000000 +0900 | |
| +++ providers/web/gda-web-provider.c 2024-12-31 12:58:34.260255711 +0900 | |
| @@ -385,8 +385,8 @@ gda_web_provider_open_connection (GdaSer | |
| cdata->mutex = gda_mutex_new (); | |
| cdata->server_id = NULL; | |
| cdata->forced_closing = FALSE; | |
| - cdata->worker_session = soup_session_sync_new (); | |
| - cdata->front_session = soup_session_sync_new_with_options ("max-conns-per-host", 1, NULL); | |
| + cdata->worker_session = soup_session_new_with_options ("ssl-use-system-ca-file", TRUE, NULL); | |
| + cdata->front_session = soup_session_new_with_options ("max-conns-per-host", 1, "ssl-use-system-ca-file", TRUE, NULL); | |
| if (use_ssl) { | |
| server_url = g_string_new ("https://"); | |
| g_print ("USING SSL\n"); | |
| diff -rup tools/browser/browser-virtual-connection.c tools/browser/browser-virtual-connection.c | |
| --- tools/browser/browser-virtual-connection.c 2020-11-09 05:23:20.000000000 +0900 | |
| +++ tools/browser/browser-virtual-connection.c 2024-12-31 14:14:23.192626367 +0900 | |
| @@ -489,7 +489,7 @@ browser_virtual_connection_part_copy (co | |
| if (spm->table_name) | |
| npm->table_name = g_strdup (spm->table_name); | |
| if (spm->model) | |
| - npm->model = g_object_ref (G_OBJECT (spm->model)); | |
| + npm->model = (GdaDataModel *)(g_object_ref (G_OBJECT (spm->model))); | |
| break; | |
| } | |
| case BROWSER_VIRTUAL_CONNECTION_PART_CNC: { | |
| @@ -500,7 +500,7 @@ browser_virtual_connection_part_copy (co | |
| if (scnc->table_schema) | |
| ncnc->table_schema = g_strdup (scnc->table_schema); | |
| if (scnc->source_cnc) | |
| - ncnc->source_cnc = g_object_ref (G_OBJECT (scnc->source_cnc)); | |
| + ncnc->source_cnc = (BrowserConnection *)(g_object_ref (G_OBJECT (scnc->source_cnc))); | |
| break; | |
| } | |
| default: | |
| diff -rup tools/browser/common/fk-declare.c tools/browser/common/fk-declare.c | |
| --- tools/browser/common/fk-declare.c 2020-11-09 05:23:20.000000000 +0900 | |
| +++ tools/browser/common/fk-declare.c 2024-12-31 14:12:47.445548603 +0900 | |
| @@ -403,7 +403,7 @@ fk_declare_new (GtkWindow *parent, GdaMe | |
| g_free (str); | |
| decl = FK_DECLARE (wid); | |
| - decl->priv->mstruct = g_object_ref ((GObject*) mstruct); | |
| + decl->priv->mstruct = (GdaMetaStruct *)(g_object_ref ((GObject*) mstruct)); | |
| decl->priv->mtable = table; | |
| create_internal_layout (decl); | |
| diff -rup tools/browser/common/ui-formgrid.c tools/browser/common/ui-formgrid.c | |
| --- tools/browser/common/ui-formgrid.c 2020-11-09 05:23:20.000000000 +0900 | |
| +++ tools/browser/common/ui-formgrid.c 2024-12-31 14:12:11.829517588 +0900 | |
| @@ -754,11 +754,11 @@ statement_executed_cb (G_GNUC_UNUSED Bro | |
| ui_formgrid_handle_user_prefs (UI_FORMGRID (fg), NULL, stmt); | |
| g_object_unref (stmt); | |
| } | |
| - aed->model = g_object_ref (out_result); | |
| + aed->model = (GdaDataModel *)(g_object_ref (out_result)); | |
| g_signal_connect (aed->params, "holder-changed", | |
| G_CALLBACK (action_executed_holder_changed_cb), aed); | |
| - aed->formgrid = g_object_ref (fg); | |
| + aed->formgrid = (UiFormGrid *)(g_object_ref (fg)); | |
| aed->formgrid->priv->autoupdate_possible = TRUE; | |
| gtk_widget_show (aed->formgrid->priv->autoupdate_toggle); | |
| } | |
| diff -rup tools/browser/connection-binding-properties.c tools/browser/connection-binding-properties.c | |
| --- tools/browser/connection-binding-properties.c 2020-11-09 05:23:20.000000000 +0900 | |
| +++ tools/browser/connection-binding-properties.c 2024-12-31 14:14:55.913651254 +0900 | |
| @@ -147,7 +147,7 @@ connection_binding_properties_new_create | |
| part = g_new0 (BrowserVirtualConnectionPart, 1); | |
| part->part_type = BROWSER_VIRTUAL_CONNECTION_PART_CNC; | |
| part->u.cnc.table_schema = g_strdup (browser_connection_get_name (bcnc)); | |
| - part->u.cnc.source_cnc = g_object_ref (G_OBJECT (bcnc)); | |
| + part->u.cnc.source_cnc = (BrowserConnection *)(g_object_ref (G_OBJECT (bcnc))); | |
| specs->parts = g_slist_append (NULL, part); | |
| cprop = CONNECTION_BINDING_PROPERTIES (g_object_new (CONNECTION_TYPE_BINDING_PROPERTIES, NULL)); | |
| diff -rup tools/browser/schema-browser/table-info.c tools/browser/schema-browser/table-info.c | |
| --- tools/browser/schema-browser/table-info.c 2020-11-09 05:23:20.000000000 +0900 | |
| +++ tools/browser/schema-browser/table-info.c 2024-12-31 14:13:26.856581556 +0900 | |
| @@ -621,7 +621,7 @@ fk_bind_select_executed_cb (G_GNUC_UNUSE | |
| } | |
| } | |
| } | |
| - fkdata->model = g_object_ref (out_result); | |
| + fkdata->model = (GdaDataModel *)(g_object_ref (out_result)); | |
| fkdata->model_rerunning = FALSE; | |
| } |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment