After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 792323 - [review] lr/glib-2.40 - Update Glib and Jansson dependencies
[review] lr/glib-2.40 - Update Glib and Jansson dependencies
Status: RESOLVED FIXED
Product: NetworkManager
Classification: Platform
Component: general
unspecified
Other Linux
: Normal normal
: ---
Assigned To: NetworkManager maintainer(s)
NetworkManager maintainer(s)
Depends on:
Blocks: nm-review
 
 
Reported: 2018-01-08 09:59 UTC by Lubomir Rintel
Modified: 2018-01-22 08:30 UTC
See Also:
GNOME target: ---
GNOME version: ---


Description Lubomir Rintel 2018-01-08 09:59:09 UTC 
There doesn't seem to be any point in supporting version noone can realistically be using anymore. Drops quite some compat cruft.
Comment 1 Thomas Haller 2018-01-08 11:18:13 UTC 
-#if GLIB_CHECK_VERSION (2, 34, 0)
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-    if (!g_spawn_check_exit_status (status, &error)) {
-         nmt_newt_message_dialog (_("Editor failed: %s"), error->message);
-         g_error_free (error);
-         goto done;
-    }
-    G_GNUC_END_IGNORE_DEPRECATIONS
-#else
     if (WIFEXITED (status)) {
          if (WEXITSTATUS (status) != 0)
               nmt_newt_message_dialog (_("Editor failed with status %d"), WEXITSTATUS (status));
     } else if (WIFSIGNALED (status))
          nmt_newt_message_dialog (_("Editor failed with signal %d"), WTERMSIG (status));
-#endif


^ drops the wrong side.







-#if GLIB_CHECK_VERSION(2,34,0)
          if (__nmtst_internal.no_expect_message)
               g_log_set_always_fatal (G_LOG_FATAL_MASK);
-#else
          /* g_test_expect_message() is a NOP, so allow any messages */
          g_log_set_always_fatal (G_LOG_FATAL_MASK);
-#endif

wrong.





               G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
               g_test_expect_message (__VA_ARGS__); \
               G_GNUC_END_IGNORE_DEPRECATIONS \

          G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
          g_test_assert_expected_messages_internal (_domain, _file, _line, _func); \
          G_GNUC_END_IGNORE_DEPRECATIONS \


can drop IGNORE_DEPR.



+    if (!g_hash_table_insert (self->checkpoints,
                                  (gpointer) checkpoint_path,
                                  item))
+              if (!g_hash_table_add (priv->device_route_metrics,
                                         _device_route_metric_data_new (device_state->ifindex,
                                                                        device_state->route_metric_default_aspired,
                                                                        device_state->route_metric_default_effective)))


indent.





I always maintain, there is no particular hurry to drop compat code. Bumping to glib 2.40 will not allow us to use a glib API that we previously couldn't. Or does it? Is there anything in glib 2.40 that you would like to use, but currently cannot?
I would still wait longer, but arguably, nobody is using these versions with recent NM anymore. So, doesn't matter. ACK.
Comment 2 Lubomir Rintel 2018-01-18 10:48:31 UTC 
8a46b25cf (HEAD -> master, fd/master, fd/lr/glib-2-40, lr/glib-2-40) all: require glib 2.40
1443bf77e all: require jansson 2.5