Merge in upstream changes for 4.15.5

Merge commit 'a2f9c0b7de9fc9a853e1c06807177e50f8058fb3'
Xfce-Classic · Nov 20, 2020 · 5a83736 · 5a83736
2 parents f99588b + a2f9c0b
commit 5a83736
Show file tree

Hide file tree

Showing 24 changed files with 533 additions and 141 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -27,6 +27,7 @@ ChangeLog: Makefile
 dist-hook: ChangeLog
 
 EXTRA_DIST = \
+	README.md \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \

diff --git a/NEWS b/NEWS
@@ -1,3 +1,20 @@
+4.15.5
+======
+- Add new API xfce_spawn_no_child (!8):
+  Launch processes re-parenting them to init vs. as children
+- about: Fix icon names
+- about: Display userspace bitness if it differs from OS kernel bitness
+- about: Print GPU name in system info
+- about: Use more understandable arch labels (Issue #27)
+- Improve xfce_icon_name API
+- No startup notification in wayland to prevent crash (Issue #17)
+- Add missing docstring
+- Fix typos
+- Add README.md to EXTRA_DIST
+- Translation Updates:
+  Catalan, Chinese (China), Danish, Galician, German, Italian,
+  Lithuanian, Turkish
+
 4.15.4
 ======
 - Avoid redundant key re-grabbing

diff --git a/configure.ac.in b/configure.ac.in
@@ -9,10 +9,10 @@ m4_define([libxfce4ui_verinfo], [0:0:0])
 m4_define([libxfce4ui_version_api], [2])
 m4_define([libxfce4ui_version_major], [4])
 m4_define([libxfce4ui_version_minor], [15])
-m4_define([libxfce4ui_version_micro], [4])
+m4_define([libxfce4ui_version_micro], [5])
 m4_define([libxfce4ui_version_nano], []) dnl leave this empty to have no nano version
 m4_define([libxfce4ui_version_build], [@REVISION@])
-m4_define([libxfce4ui_version_tag], [git])
+m4_define([libxfce4ui_version_tag], [])
 m4_define([libxfce4ui_version], [libxfce4ui_version_major().libxfce4ui_version_minor().libxfce4ui_version_micro()ifelse(libxfce4ui_version_nano(), [], [], [.libxfce4ui_version_nano()])ifelse(libxfce4ui_version_tag(), [git], [libxfce4ui_version_tag()-libxfce4ui_version_build()], [libxfce4ui_version_tag()])])
 
 m4_define([libxfce4kbd_private_verinfo], [0:0:0])
@@ -144,6 +144,15 @@ AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_42, [Prevent post 2.42 APIs])
 AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_22, [Ignore post 3.22 deprecations])
 AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_22, [Prevent post 3.22 APIs])
 
+dnl **************************************************************
+dnl *** Optional support for system information based on epoxy ***
+dnl **************************************************************
+EPOXY_FOUND="no"
+XDT_CHECK_OPTIONAL_PACKAGE([EPOXY],
+                           [epoxy],
+                           [1.0], [epoxy],
+                           [library for handling OpenGL function pointer management], [yes])
+
 dnl ***************************************
 dnl *** Check for gobject-introspection ***
 dnl ***************************************
@@ -389,9 +398,10 @@ else
 echo "* Vendor:                    none"
 fi
 if test x"$GLIBTOP_FOUND" = x"yes"; then
-echo "* System Info:               yes"
+echo "* System Info (glibtop):     yes"
 else
-echo "* System Info:               no"
+echo "* System Info (glibtop):     no"
 fi
+echo "* System Info (epoxy):       $EPOXY_FOUND"
 echo "* Manual website:            $with_manual_website"
 echo
diff --git a/docs/libxfce4ui-sections.txt b/docs/libxfce4ui-sections.txt
@@ -17,6 +17,7 @@ LIBXFCE4UI_CHECK_VERSION
 <FILE>xfce-spawn</FILE>
 xfce_spawn_on_screen_with_child_watch
 xfce_spawn_on_screen
+xfce_spawn_no_child
 xfce_spawn_command_line_on_screen
 </SECTION>
 

diff --git a/libxfce4ui/libxfce4ui.symbols b/libxfce4ui/libxfce4ui.symbols
@@ -112,6 +112,7 @@ xfce_gtk_menu_item_set_accel_label
 #if IN_SOURCE(__XFCE_SPAWN_C__)
 xfce_spawn_on_screen_with_child_watch
 xfce_spawn_on_screen
+xfce_spawn_no_child
 xfce_spawn_command_line_on_screen
 #endif
 #endif

diff --git a/libxfce4ui/xfce-dialogs.c b/libxfce4ui/xfce-dialogs.c
@@ -761,7 +761,7 @@ xfce_message_dialog_new_valist (GtkWindow   *parent,
  *     <listitem>
  *       <para>
  *         Creates a button with the #GdkPixbuf as button icon.
- *         @param1 is the #GdkPixuf, @param2 for the label and
+ *         @param1 is the #GdkPixbuf, @param2 for the label and
  *         @param3 for the response_id.
  *       </para>
  *     </listitem>

diff --git a/libxfce4ui/xfce-dialogs.h b/libxfce4ui/xfce-dialogs.h
@@ -42,7 +42,7 @@ G_BEGIN_DECLS
  * XFCE_BUTTON_TYPE_PIXBUF:
  *
  * Creates a button with the #GdkPixbuf as button icon.
- * param1 is the #GdkPixuf, param2 for the label and
+ * param1 is the #GdkPixbuf, param2 for the label and
  * param3 for the response_id.
  *
  **/

diff --git a/libxfce4ui/xfce-gtk-extensions.c b/libxfce4ui/xfce-gtk-extensions.c
@@ -312,6 +312,7 @@ xfce_gtk_menu_item_new_from_action_entry (const XfceGtkActionEntry *action_entry
  * xfce_gtk_toggle_menu_item_new_from_action_entry:
  * @action_entry : Label to use for the #GtkCheckMenuItem
  * @callback_param : optional callback parameter, or NULL.
+ * @active : boolean value indicating whether the check box is active.
  * @menu_to_append_item : #GtkMenuShell on which the item should be appended, or NULL
  *
  * Method to create a toggle menu item from the passed action entry
@@ -829,10 +830,10 @@ xfce_widget_reparent (GtkWidget *widget,
  *
  * Since: 4.16
  **/
-const gchar *
+gchar *
 xfce_icon_name_from_desktop_id (const gchar *desktop_id)
 {
-    const gchar *icon_file;
+    gchar *icon_file;
     gchar *resource;
     XfceRc *rcfile;
 
@@ -845,8 +846,10 @@ xfce_icon_name_from_desktop_id (const gchar *desktop_id)
 
     if (rcfile && xfce_rc_has_group (rcfile, "Desktop Entry")) {
         xfce_rc_set_group (rcfile, "Desktop Entry");
-        icon_file = xfce_rc_read_entry (rcfile, "Icon", NULL);
+        icon_file = g_strdup (xfce_rc_read_entry (rcfile, "Icon", NULL));
+
         xfce_rc_close (rcfile);
+
         return icon_file;
     }
     else
@@ -872,30 +875,47 @@ xfce_icon_name_from_desktop_id (const gchar *desktop_id)
 GIcon *
 xfce_gicon_from_name (const gchar *name)
 {
-    const gchar *icon_name;
-    GIcon *gicon;
+    gchar *icon_name;
+    GIcon *gicon = NULL;
     GtkIconInfo *icon_info;
+    GFile *path = NULL;
 
     /* Check if there is a desktop file of 'name' */
     icon_name = xfce_icon_name_from_desktop_id (name);
     if (icon_name) {
-        gicon = g_themed_icon_new_with_default_fallbacks (icon_name);
+        if (g_path_is_absolute (icon_name)) {
+            path = g_file_new_for_path (icon_name);
+        }
+        else if (g_str_has_prefix (icon_name, "file://")) {
+            path = g_file_new_for_uri (icon_name);
+        }
+        else {
+            gicon = g_themed_icon_new_with_default_fallbacks (icon_name);
+        }
+
+        if (path) {
+            gicon = g_file_icon_new (path);
+            g_object_unref (path);
+        }
+        g_free (icon_name);
     }
     else {
         gicon = g_themed_icon_new_with_default_fallbacks (name);
     }
 
     /* As g_themed_icon_new_with_default_fallbacks always returns 'something'
        check if there's anything that matches in the icon theme */
-    icon_info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (),
-                                                gicon,
-                                                GTK_ICON_SIZE_BUTTON,
-                                                GTK_ICON_LOOKUP_FORCE_REGULAR);
+    if (gicon) {
+        icon_info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (),
+                                                    gicon,
+                                                    GTK_ICON_SIZE_BUTTON,
+                                                    GTK_ICON_LOOKUP_FORCE_REGULAR);
+
+        if (icon_info)
+            return gicon;
+    }
 
-    if (icon_info)
-        return gicon;
-    else
-        return NULL;
+    return NULL;
 }
 
 

diff --git a/libxfce4ui/xfce-gtk-extensions.h b/libxfce4ui/xfce-gtk-extensions.h
@@ -151,7 +151,7 @@ gboolean                  xfce_gtk_menu_popup_until_mapped                (GtkMe
 gboolean                  xfce_widget_reparent                            (GtkWidget                 *widget,
                                                                            GtkWidget                 *new_parent);
 
-const gchar              *xfce_icon_name_from_desktop_id                  (const gchar               *desktop_id);
+gchar                    *xfce_icon_name_from_desktop_id                  (const gchar               *desktop_id);
 
 GIcon                    *xfce_gicon_from_name                            (const gchar               *name);
 void                      xfce_gtk_menu_item_set_accel_label              (GtkMenuItem               *menu_item,