<p><a href="https://github.com/codebrainz" class="user-mention">@codebrainz</a> I prefer my implementation for the compat function, but either is fine.  Maybe your checks for emptiness are nice though (as <code>add_from_string()</code> doesn't accept it for some reason, although <code>from_resource()</code> does), although it really shouldn't ever happen.</p>
<p>Otherwise, I think the changes in <code>ui_utils.c</code> are slightly better in mine, and closer to master (less unnecessary changes):</p>
<div class="highlight highlight-source-diff"><pre><span class="pl-c1">diff --git a/src/ui_utils.c b/src/ui_utils.c</span>
index a0093174a..5b544bff4 100644
<span class="pl-md">--- a/src/ui_utils.c</span>
<span class="pl-mi1">+++ b/src/ui_utils.c</span>
<span class="pl-mdr">@@ -42,7 +42,6 @@</span>
 #include "msgwindow.h"
 #include "prefs.h"
 #include "project.h"
<span class="pl-md"><span class="pl-md">-</span>#include "resources.h"</span>
 #include "sciwrappers.h"
 #include "sidebar.h"
 #include "stash.h"
<span class="pl-mdr">@@ -2427,7 +2426,6 @@</span> static GtkWidget *ui_get_top_parent(GtkWidget *widget)
 void ui_init_builder(void)
 {
     const gchar *name;
<span class="pl-md"><span class="pl-md">-</span>    GBytes *ui_data;</span>
     GError *error;
     GSList *iter, *all_objects;
     GtkWidget *widget, *toplevel;
<span class="pl-mdr">@@ -2445,7 +2443,7 @@</span> void ui_init_builder(void)
     {
         dialogs_show_msgbox_with_secondary(GTK_MESSAGE_ERROR,
             _("Geany cannot start!"), error->message);
<span class="pl-md"><span class="pl-md">-</span>        g_error(_("Cannot load user-interface: %s"), error->message);</span>
<span class="pl-mi1"><span class="pl-mi1">+</span>        g_error("Cannot create user-interface: %s", error->message);</span>
         g_error_free(error);
         g_object_unref(builder);
         return;</pre></div>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/geany/geany/pull/1703#issuecomment-348734678">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABDrJ2x4SfiZIQgH1afttpn2JVNMLRQ9ks5s8gI5gaJpZM4QzP2F">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABDrJzsDXqoQqFNy1vVSJeJdydEhNIn-ks5s8gI5gaJpZM4QzP2F.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/geany/geany/pull/1703#issuecomment-348734678"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>

<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/geany/geany","title":"geany/geany","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/geany/geany"}},"updates":{"snippets":[{"icon":"PERSON","message":"@b4n in #1703: @codebrainz I prefer my implementation for the compat function, but either is fine.  Maybe your checks for emptiness are nice though (as `add_from_string()` doesn't accept it for some reason, although `from_resource()` does), although it really shouldn't ever happen.\r\n\r\nOtherwise, I think the changes in `ui_utils.c` are slightly better in mine, and closer to master (less unnecessary changes):\r\n```diff\r\ndiff --git a/src/ui_utils.c b/src/ui_utils.c\r\nindex a0093174a..5b544bff4 100644\r\n--- a/src/ui_utils.c\r\n+++ b/src/ui_utils.c\r\n@@ -42,7 +42,6 @@\r\n #include \"msgwindow.h\"\r\n #include \"prefs.h\"\r\n #include \"project.h\"\r\n-#include \"resources.h\"\r\n #include \"sciwrappers.h\"\r\n #include \"sidebar.h\"\r\n #include \"stash.h\"\r\n@@ -2427,7 +2426,6 @@ static GtkWidget *ui_get_top_parent(GtkWidget *widget)\r\n void ui_init_builder(void)\r\n {\r\n     const gchar *name;\r\n-    GBytes *ui_data;\r\n     GError *error;\r\n     GSList *iter, *all_objects;\r\n     GtkWidget *widget, *toplevel;\r\n@@ -2445,7 +2443,7 @@ void ui_init_builder(void)\r\n     {\r\n         dialogs_show_msgbox_with_secondary(GTK_MESSAGE_ERROR,\r\n             _(\"Geany cannot start!\"), error-\u003emessage);\r\n-        g_error(_(\"Cannot load user-interface: %s\"), error-\u003emessage);\r\n+        g_error(\"Cannot create user-interface: %s\", error-\u003emessage);\r\n         g_error_free(error);\r\n         g_object_unref(builder);\r\n         return;\r\n```"}],"action":{"name":"View Pull Request","url":"https://github.com/geany/geany/pull/1703#issuecomment-348734678"}}}</script>