Merge pull request #153 from monsta/do-not-reap-child-1.8

[1.8] libslab: do not reap child when launching desktop items

NEWS

@@ -1,3 +1,15 @@
+1.8.3
+  * Update Marco WM name
+  * Fix segfault with custom keybindings
+
+1.8.2
+  * Fix typo in togglekeys-enable (a11y).
+  * Allow metacity-2 themes in appearance capplet.
+  * Several man page and desktop file fixes.
+
+1.8.1
+  * default-applications: Add support for accessibility applications
+
 1.8.0
   * Use yelp-tools instead of mate-doc-utils
   * windows: Add option to enable side by side tiling

capplets/about-me/mate-about-me.1

@@ -11,8 +11,8 @@ mate-about-me \(em is a control center applet.
 .PP 
 MATE About Me is a control center applet to set user information.
 .PP
-It allows to change user password and set user avatar image (~/.face file). 
+It allows one to change user password and set user avatar image (~/.face file). 
 
 .SH "AUTHOR" 
 .PP 
-This manual page was written by Stefano Karapetsas <stefano@karapetsas.com>.
+This manual page was written by Stefano Karapetsas <stefano@karapetsas.com>.

capplets/about-me/mate-about-me.desktop.in.in

@@ -7,4 +7,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;X-MATE-PersonalSettings;
+Keywords=mate-control-center;MATE;personal;information;
 OnlyShowIn=MATE;

capplets/accessibility/at-properties/mate-at-properties.desktop.in.in

@@ -7,4 +7,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;
+Keywords=mate-control-center;MATE;accessibility;features;
 OnlyShowIn=MATE;

capplets/appearance/data/mate-appearance-properties.1

@@ -12,7 +12,7 @@ mate-appearance-properties \(em is a control center applet.
 MATE Appearance Properties is a control center applet to edit appearance
 settings.
 .PP
-It allows to change: GTK theme, window manager theme, icon theme, cursor
+It allows one to change: GTK theme, window manager theme, icon theme, cursor
 theme, desktop background and font settings. 
 
 .SH "OPTIONS" 
@@ -25,4 +25,4 @@ Specify the name of the page to show (theme|background|fonts|interface)
 
 .SH "AUTHOR" 
 .PP 
-This manual page was written by Stefano Karapetsas <stefano@karapetsas.com>.
+This manual page was written by Stefano Karapetsas <stefano@karapetsas.com>.

capplets/appearance/data/mate-appearance-properties.desktop.in.in

@@ -7,4 +7,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;DesktopSettings;
+Keywords=mate-control-center;MATE;appearance;properties;desktop;customize;look;
 OnlyShowIn=MATE;

capplets/appearance/data/mate-theme-installer.desktop.in.in

@@ -7,6 +7,7 @@ Terminal=false
 Type=Application
 MimeType=application/x-mate-theme-package;
 StartupNotify=true
-Categories=GTK;
+Categories=GTK;Settings;
+Keywords=mate-control-center;MATE;install;desktop;themes;
 NoDisplay=true
 OnlyShowIn=MATE;

capplets/appearance/theme-installer.c

@@ -128,6 +128,13 @@ file_theme_type (const gchar *dir)
 	if (exists)
 		return THEME_GTK;
 
+	filename = g_build_filename (dir, "metacity-1", "metacity-theme-2.xml", NULL);
+	exists = g_file_test (filename, G_FILE_TEST_IS_REGULAR);
+	g_free (filename);
+
+	if (exists)
+		return THEME_MARCO;
+
 	filename = g_build_filename (dir, "metacity-1", "metacity-theme-1.xml", NULL);
 	exists = g_file_test (filename, G_FILE_TEST_IS_REGULAR);
 	g_free (filename);

capplets/common/mate-theme-info.c

@@ -1062,8 +1062,8 @@ marco_dir_changed (GFileMonitor              *monitor,
 
   affected_file = g_file_get_basename (file);
 
-  /* The only file we care about is marco-theme-1.xml */
-  if (!strcmp (affected_file, "metacity-theme-1.xml")) {
+  /* The only file we care about is metacity-theme-(1|2).xml */
+  if (!strcmp (affected_file, "metacity-theme-1.xml") || !strcmp (affected_file, "metacity-theme-2.xml")) {
     update_marco_index (file, monitor_data->priority);
   }
 
@@ -1180,10 +1180,17 @@ add_common_theme_dir_monitor (GFile                      *theme_dir_uri,
 
   /* marco theme subdir */
   subdir = g_file_get_child (theme_dir_uri, "metacity-1");
-  uri = g_file_get_child (subdir, "metacity-theme-1.xml");
+  uri = g_file_get_child (subdir, "metacity-theme-2.xml");
   if (g_file_query_exists (uri, NULL)) {
     update_marco_index (uri, monitor_data->priority);
   }
+  else {
+    g_object_unref (uri);
+    uri = g_file_get_child (subdir, "metacity-theme-1.xml");
+    if (g_file_query_exists (uri, NULL)) {
+      update_marco_index (uri, monitor_data->priority);
+    }
+  }
   g_object_unref (uri);
 
   monitor = g_file_monitor_directory (subdir, G_FILE_MONITOR_NONE, NULL, NULL);

capplets/common/wm-common.h

@@ -1,7 +1,7 @@
 #ifndef WM_COMMON_H
 #define WM_COMMON_H
 
-#define WM_COMMON_MARCO       "Marco"
+#define WM_COMMON_MARCO       "Metacity (Marco)"
 #define WM_COMMON_SAWFISH     "Sawfish"
 #define WM_COMMON_METACITY    "Metacity"
 #define WM_COMMON_COMPIZ      "Compiz"

capplets/default-applications/Makefile.am

@@ -24,6 +24,7 @@ pkgconfig_DATA = mate-default-applications.pc
 AM_CPPFLAGS = \
 	$(MATECC_CAPPLETS_CFLAGS) \
 	$(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \
+	-DAPPLICATIONSDIR=\""$(datadir)/applications"\"\
 	-DMATELOCALEDIR=\""$(datadir)/locale"\"\
 	-DMATECC_UI_DIR=\""$(uidir)"\"
 

capplets/default-applications/mate-da-capplet.c

@@ -124,9 +124,15 @@ set_changed(GtkComboBox* combo, MateDACapplet* capplet, GList* list, gint type)
 				break;
 
 			case DA_TYPE_TERMINAL:
-				settings = g_settings_new (TERMINAL_SCHEMA);
-				g_settings_set_string (settings, TERMINAL_KEY, g_app_info_get_executable (item));
-				g_object_unref (settings);
+				g_settings_set_string (capplet->terminal_settings, TERMINAL_KEY, g_app_info_get_executable (item));
+				break;
+
+			case DA_TYPE_VISUAL:
+				g_settings_set_string (capplet->visual_settings, VISUAL_KEY, g_app_info_get_executable (item));
+				break;
+
+			case DA_TYPE_MOBILITY:
+				g_settings_set_string (capplet->mobility_settings, MOBILITY_KEY, g_app_info_get_executable (item));
 				break;
 
 			default:
@@ -354,6 +360,36 @@ fill_combo_box(GtkIconTheme* theme, GtkComboBox* combo_box, GList* app_list, gch
 		g_free (default_terminal);
 		g_object_unref (terminal_settings);
 	}
+	else if (g_strcmp0(mime, "visual") == 0)
+	{
+		GSettings *visual_settings = g_settings_new (VISUAL_SCHEMA);
+		gchar *default_visual = g_settings_get_string (visual_settings, VISUAL_KEY);
+		for (entry = app_list; entry != NULL; entry = g_list_next(entry))
+		{
+			GAppInfo* item = (GAppInfo*) entry->data;
+			if (g_strcmp0 (g_app_info_get_executable (item), default_visual) == 0)
+			{
+				default_app = item;
+			}
+		}
+		g_free (default_visual);
+		g_object_unref (visual_settings);
+	}
+	else if (g_strcmp0(mime, "mobility") == 0)
+	{
+		GSettings *mobility_settings = g_settings_new (MOBILITY_SCHEMA);
+		gchar *default_mobility = g_settings_get_string (mobility_settings, MOBILITY_KEY);
+		for (entry = app_list; entry != NULL; entry = g_list_next(entry))
+		{
+			GAppInfo* item = (GAppInfo*) entry->data;
+			if (g_strcmp0 (g_app_info_get_executable (item), default_mobility) == 0)
+			{
+				default_app = item;
+			}
+		}
+		g_free (default_mobility);
+		g_object_unref (mobility_settings);
+	}
 	else
 	{
 		default_app = g_app_info_get_default_for_type (mime, FALSE);
@@ -424,6 +460,19 @@ fill_combo_box(GtkIconTheme* theme, GtkComboBox* combo_box, GList* app_list, gch
 	}
 }
 
+static GList*
+fill_list_from_desktop_file (GList* app_list, const gchar *desktop_id)
+{
+	GList* list = app_list;
+	GDesktopAppInfo* appinfo;
+
+	appinfo = g_desktop_app_info_new_from_filename (desktop_id);
+	if (appinfo != NULL) {
+		list = g_list_prepend (list, appinfo);
+	}
+	return list;
+}
+
 static void
 show_dialog(MateDACapplet* capplet, const gchar* start_page)
 {
@@ -470,6 +519,8 @@ show_dialog(MateDACapplet* capplet, const gchar* start_page)
 	capplet->file_combo_box = get_widget("filemanager_combobox");
 	capplet->image_combo_box = get_widget("image_combobox");
 
+	capplet->visual_startup_checkbutton = get_widget("visual_start_checkbutton");
+	capplet->mobility_startup_checkbutton = get_widget("mobility_start_checkbutton");
 
 	g_signal_connect(capplet->window, "screen-changed", G_CALLBACK(screen_changed_cb), capplet);
 	screen_changed_cb(capplet->window, gdk_screen_get_default(), capplet);
@@ -482,8 +533,16 @@ show_dialog(MateDACapplet* capplet, const gchar* start_page)
 	capplet->text_editors = g_app_info_get_all_for_type("text/plain");
 	capplet->image_viewers = g_app_info_get_all_for_type("image/png");
 	capplet->file_managers = g_app_info_get_all_for_type("inode/directory");
-	/* capplet->visual_ats = g_app_info_get_all_for_type("inode/directory"); */
-	/* capplet->mobility_ats = g_app_info_get_all_for_type("inode/directory"); */
+
+	capplet->visual_ats = NULL;
+	capplet->visual_ats = fill_list_from_desktop_file (capplet->visual_ats, APPLICATIONSDIR "/orca.desktop");
+	capplet->visual_ats = g_list_reverse (capplet->visual_ats);
+
+	capplet->mobility_ats = NULL;
+	capplet->mobility_ats = fill_list_from_desktop_file (capplet->mobility_ats, APPLICATIONSDIR "/dasher.desktop");
+	capplet->mobility_ats = fill_list_from_desktop_file (capplet->mobility_ats, APPLICATIONSDIR "/gok.desktop");
+	capplet->mobility_ats = fill_list_from_desktop_file (capplet->mobility_ats, APPLICATIONSDIR "/onboard.desktop");
+	capplet->mobility_ats = g_list_reverse (capplet->mobility_ats);
 
 	/* Terminal havent mime types, so check in .desktop files for
 	   Categories=TerminalEmulator */
@@ -510,8 +569,8 @@ show_dialog(MateDACapplet* capplet, const gchar* start_page)
 	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->image_combo_box), capplet->image_viewers, "image/png");
 	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->text_combo_box), capplet->text_editors, "text/plain");
 	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->file_combo_box), capplet->file_managers, "inode/directory");
-	/* fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->visual_combo_box), capplet->visual_ats, NULL); */
-	/* fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->mobility_combo_box), capplet->mobility_ats, NULL); */
+	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->visual_combo_box), capplet->visual_ats, "visual");
+	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->mobility_combo_box), capplet->mobility_ats, "mobility");
 
 	g_signal_connect(capplet->web_combo_box, "changed", G_CALLBACK(web_combo_changed_cb), capplet);
 	g_signal_connect(capplet->mail_combo_box, "changed", G_CALLBACK(mail_combo_changed_cb), capplet);
@@ -524,6 +583,8 @@ show_dialog(MateDACapplet* capplet, const gchar* start_page)
 	g_signal_connect(capplet->text_combo_box, "changed", G_CALLBACK(text_combo_changed_cb), capplet);
 	g_signal_connect(capplet->file_combo_box, "changed", G_CALLBACK(file_combo_changed_cb), capplet);
 
+	g_settings_bind (capplet->mobility_settings, MOBILITY_STARTUP_KEY, capplet->mobility_startup_checkbutton, "active", G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (capplet->visual_settings, VISUAL_STARTUP_KEY, capplet->visual_startup_checkbutton, "active", G_SETTINGS_BIND_DEFAULT);
 
 	gtk_window_set_icon_name(GTK_WINDOW (capplet->window), "preferences-desktop-default-applications");
 
@@ -584,10 +645,18 @@ main(int argc, char** argv)
 
 	MateDACapplet* capplet = g_new0(MateDACapplet, 1);
 
+	capplet->terminal_settings = g_settings_new (TERMINAL_SCHEMA);
+	capplet->mobility_settings = g_settings_new (MOBILITY_SCHEMA);
+	capplet->visual_settings = g_settings_new (VISUAL_SCHEMA);
+
 	show_dialog(capplet, start_page);
 	g_free(start_page);
 
 	gtk_main();
 
+	g_object_unref (capplet->terminal_settings);
+	g_object_unref (capplet->mobility_settings);
+	g_object_unref (capplet->visual_settings);
+
 	return 0;
 }

capplets/default-applications/mate-da-capplet.h

@@ -24,8 +24,16 @@
 
 #include <gtk/gtk.h>
 
-#define TERMINAL_SCHEMA "org.mate.applications-terminal"
-#define TERMINAL_KEY    "exec"
+#define TERMINAL_SCHEMA       "org.mate.applications-terminal"
+#define TERMINAL_KEY          "exec"
+
+#define VISUAL_SCHEMA         "org.mate.applications-at-visual"
+#define VISUAL_KEY            "exec"
+#define VISUAL_STARTUP_KEY    "startup"
+
+#define MOBILITY_SCHEMA       "org.mate.applications-at-mobility"
+#define MOBILITY_KEY          "exec"
+#define MOBILITY_STARTUP_KEY  "startup"
 
 typedef struct _MateDACapplet {
 	GtkBuilder* builder;
@@ -111,6 +119,11 @@ typedef struct _MateDACapplet {
 	GList* file_managers;
 	GList* text_editors;
 	GList* image_viewers;
+
+	/* Settings objects */
+	GSettings* terminal_settings;
+	GSettings* visual_settings;
+	GSettings* mobility_settings;
 } MateDACapplet;
 
 #endif

capplets/default-applications/mate-default-applications-properties.1

@@ -12,7 +12,7 @@ mate-default-applications-properties \(em is a control center applet.
 MATE Default Applications Properties is a control center applet to edit
 default applications.
 .PP
-It allows to set default file manager, email client, web browser, etc. 
+It allows one to set default file manager, email client, web browser, etc. 
 
 .SH "OPTIONS" 
 .PP 
@@ -21,4 +21,4 @@ Specify the name of the page to show (internet|multimedia|system|a11y)
 
 .SH "AUTHOR" 
 .PP 
-This manual page was written by Stefano Karapetsas <stefano@karapetsas.com>.
+This manual page was written by Stefano Karapetsas <stefano@karapetsas.com>.

capplets/default-applications/mate-default-applications-properties.desktop.in.in

@@ -7,4 +7,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;X-MATE-PersonalSettings;
+Keywords=mate-control-center;MATE;default;preferred;applications;
 OnlyShowIn=MATE;

capplets/display/mate-display-properties.desktop.in.in

@@ -7,4 +7,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;HardwareSettings;
+Keywords=mate-control-center;MATE;resolution;position;monitors;display;properties;
 OnlyShowIn=MATE;

capplets/keybindings/mate-keybinding-properties.c

@@ -1004,6 +1004,7 @@ append_keys_to_tree_from_gsettings (GtkBuilder *builder, const gchar *gsettings_
           key.name = g_strdup("binding");
           key.cmd_key = g_strdup("action");
           key.description_key = g_strdup("name");
+          key.schema = NULL;
           g_array_append_val (entries, key);
         }
     }

capplets/keybindings/mate-keybinding.desktop.in.in

@@ -7,4 +7,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;
+Keywords=mate-control-center;MATE;assign;keyboard;shortcuts;keybindings;
 OnlyShowIn=MATE;

capplets/keyboard/mate-keyboard-properties-a11y.c

@@ -145,7 +145,7 @@ notifications_button_clicked_cb (GtkWidget *button, GtkBuilder *dialog)
 	g_settings_bind (a11y_settings, "feature-state-change-beep", w, "active", G_SETTINGS_BIND_DEFAULT);
 
 	w = NWID ("togglekeys_enable");
-	g_settings_bind (a11y_settings, "togglekeys_-enable", w, "active", G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (a11y_settings, "togglekeys-enable", w, "active", G_SETTINGS_BIND_DEFAULT);
 
 	w = NWID ("stickykeys_modifier_beep");
 	g_settings_bind (a11y_settings, "stickykeys-modifier-beep", w, "active", G_SETTINGS_BIND_DEFAULT);

capplets/keyboard/mate-keyboard.desktop.in.in

@@ -7,4 +7,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;HardwareSettings;
+Keywords=mate-control-center;MATE;keyboard;preferences;
 OnlyShowIn=MATE;

capplets/mouse/mate-mouse-properties.ui

@@ -288,7 +288,6 @@
                                   <object class="GtkHScale" id="accel_scale">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="update_policy">discontinuous</property>
                                     <property name="adjustment">adjustment1</property>
                                     <property name="draw_value">False</property>
                                     <property name="value_pos">right</property>
@@ -344,7 +343,6 @@
                                   <object class="GtkHScale" id="sensitivity_scale">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="update_policy">discontinuous</property>
                                     <property name="adjustment">adjustment2</property>
                                     <property name="digits">0</property>
                                     <property name="draw_value">False</property>
@@ -465,7 +463,6 @@
                                       <object class="GtkHScale" id="drag_threshold_scale">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="update_policy">discontinuous</property>
                                         <property name="adjustment">adjustment3</property>
                                         <property name="digits">0</property>
                                         <property name="draw_value">False</property>
@@ -595,7 +592,6 @@
                                       <object class="GtkHScale" id="delay_scale">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="update_policy">discontinuous</property>
                                         <property name="adjustment">adjustment4</property>
                                         <property name="draw_value">False</property>
                                         <accessibility>

capplets/mouse/mate-settings-mouse.desktop.in.in

@@ -7,4 +7,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;HardwareSettings;
+Keywords=mate-control-center;MATE;mouse;preferences;
 OnlyShowIn=MATE;

capplets/network/mate-network-properties.desktop.in.in

@@ -7,4 +7,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;
+Keywords=mate-control-center;MATE;network;http;socks;proxy;
 OnlyShowIn=MATE;

capplets/windows/mate-window-properties.c

@@ -477,6 +477,8 @@ main (int argc, char **argv)
                       G_CALLBACK (mouse_focus_toggled_callback), NULL);
     g_signal_connect (marco_settings, "changed::" MARCO_FOCUS_KEY,
                       G_CALLBACK (mouse_focus_changed_callback), NULL);
+    /* Initialize the checkbox state appropriately */
+    mouse_focus_changed_callback(marco_settings, MARCO_FOCUS_KEY, NULL);
 
     g_settings_bind (marco_settings,
                      MARCO_AUTORAISE_KEY,

capplets/windows/mate-window-properties.desktop.in.in

@@ -7,4 +7,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;DesktopSettings;
+Keywords=mate-control-center;MATE;window;manager;properties;marco;preferences;
 OnlyShowIn=MATE;

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([mate-control-center], [1.8.0], [htts://www.mate-desktop.org/])
+AC_INIT([mate-control-center], [1.8.3], [htts://www.mate-desktop.org/])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([shell])
@@ -160,7 +160,7 @@ PKG_CHECK_MODULES(MATECC_SHELL, $COMMON_MODULES libmate-menu unique-$LIBUNIQUE_A
 PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
 PKG_CHECK_MODULES(MATE_DESKTOP, mate-desktop-2.0 >= MATE_DESKTOP_REQUIRED)
 PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
-PKG_CHECK_MODULES(MARCO, libmarco-private >= 1.5.0)
+PKG_CHECK_MODULES(MARCO, libmarco-private >= 1.8.2)
 PKG_CHECK_MODULES(TYPING, $GMODULE_ADD glib-2.0 > 2.11 gio-2.0 gtk+-$GTK_API_VERSION)
 PKG_CHECK_MODULES(GSD_DBUS, mate-settings-daemon >= 1.5.2)
 PKG_CHECK_MODULES(GIO, gio-2.0)

font-viewer/mate-font-viewer.desktop.in.in

@@ -8,3 +8,4 @@ Type=Application
 StartupNotify=true
 NoDisplay=true
 MimeType=application/x-font-ttf;application/x-font-pcf;application/x-font-type1;application/x-font-otf;
+Keywords=mate-control-center;MATE;font;viewer;preview;desktop;preferences;

libslab/slab-mate-util.c

@@ -127,7 +127,7 @@ open_desktop_item_exec (MateDesktopItem * desktop_item)
 	if (!desktop_item)
 		return FALSE;
 
-	mate_desktop_item_launch (desktop_item, NULL, MATE_DESKTOP_ITEM_LAUNCH_ONLY_ONE, &error);
+	mate_desktop_item_launch (desktop_item, NULL, MATE_DESKTOP_ITEM_LAUNCH_ONLY_ONE | MATE_DESKTOP_ITEM_LAUNCH_DO_NOT_REAP_CHILD, &error);
 
 	if (error)
 	{

libwindow-settings/marco-window-manager.c

@@ -121,18 +121,33 @@ add_themes_from_dir (GList *current_list, const char *path)
                 return current_list;
         
         for (entry = readdir (theme_dir); entry != NULL; entry = readdir (theme_dir)) {
-                theme_file_path = g_build_filename (path, entry->d_name, "metacity-1/metacity-theme-1.xml", NULL);
+                theme_file_path = g_build_filename (path, entry->d_name, "metacity-1/metacity-theme-2.xml", NULL);
 
                 if (g_file_test (theme_file_path, G_FILE_TEST_EXISTS)) {
 
                         for (node = current_list; (node != NULL) && (!found); node = node->next) {
                                 found = (strcmp (node->data, entry->d_name) == 0);
                         }
-      
+
                         if (!found) {
                                 current_list = g_list_prepend (current_list, g_strdup (entry->d_name));
                         }
                 }
+                else {
+                        g_free (theme_file_path);
+                        theme_file_path = g_build_filename (path, entry->d_name, "metacity-1/metacity-theme-1.xml", NULL);
+
+                        if (g_file_test (theme_file_path, G_FILE_TEST_EXISTS)) {
+
+                                for (node = current_list; (node != NULL) && (!found); node = node->next) {
+                                        found = (strcmp (node->data, entry->d_name) == 0);
+                                }
+
+                                if (!found) {
+                                        current_list = g_list_prepend (current_list, g_strdup (entry->d_name));
+                                }
+                        }
+                }
 
                 found = FALSE;
                 /*g_free (entry);*/

po/id.po

@@ -8,13 +8,14 @@
 # andjeng, 2013
 # Mohamad Hasan Al Banna, 2012
 # Mohammad DAMT <mdamt@bisnisweb.com>, 2003
+# willysr <willysr@slackware-id.org>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-23 16:27+0100\n"
-"PO-Revision-Date: 2014-02-23 15:29+0000\n"
-"Last-Translator: Stefano Karapetsas <stefano@karapetsas.com>\n"
+"PO-Revision-Date: 2014-03-10 14:09+0000\n"
+"Last-Translator: willysr <willysr@slackware-id.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/MATE/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +27,7 @@ msgstr ""
 msgid ""
 "[ 'Change Theme;mate-appearance-properties.desktop', 'Set Preferred "
 "Applications;mate-default-applications-properties.desktop' ]"
-msgstr ""
+msgstr "[ 'Ganti Tema;mate-appearance-properties.desktop', 'Tentukan Aplikasi Pilihan;mate-default-applications-properties.desktop' ]"
 
 #: ../org.mate.control-center.gschema.xml.in.in.h:2
 msgid "Task names and associated .desktop files"
@@ -992,7 +993,7 @@ msgstr "Tanpa Latar Belakang Desktop"
 
 #: ../capplets/appearance/mate-wp-item.c:288
 msgid "unknown"
-msgstr ""
+msgstr "tidak diketahui"
 
 #: ../capplets/appearance/mate-wp-item.c:295
 msgid "Slide Show"
@@ -1029,7 +1030,7 @@ msgid ""
 "%s, %s\n"
 "Folder: %s\n"
 "Artist: %s"
-msgstr ""
+msgstr "<b>%s</b>\n%s, %s\nFolder: %s\nArtis: %s"
 
 #. translators: <b>wallpaper name</b>
 #. * Image missing
@@ -1042,7 +1043,7 @@ msgid ""
 "%s\n"
 "Folder: %s\n"
 "Artist: %s"
-msgstr ""
+msgstr "<b>%s</b>\n%s\nFolder: %s\nArtis: %s"
 
 #: ../capplets/appearance/mate-wp-item.c:339
 msgid "Image missing"
@@ -2332,7 +2333,7 @@ msgstr "Alamat yang diabaikan"
 
 #: ../capplets/windows/mate-metacity-support.c:40
 msgid "Metacity Preferences"
-msgstr ""
+msgstr "Preferensi Metacity"
 
 #. Compositing manager
 #: ../capplets/windows/mate-metacity-support.c:51
@@ -2347,7 +2348,7 @@ msgstr "Sediakan perangkat lunak pengkomposisi pengelola jendela"
 
 #: ../capplets/windows/mate-window-properties.c:218
 msgid "The current window manager is unsupported"
-msgstr ""
+msgstr "Window manager saat ini tidak didukung"
 
 #. Window
 #: ../capplets/windows/mate-window-properties.c:304
@@ -2356,11 +2357,11 @@ msgstr "Preferensi Jendela"
 
 #: ../capplets/windows/mate-window-properties.c:323
 msgid "Behaviour"
-msgstr ""
+msgstr "Perilaku"
 
 #: ../capplets/windows/mate-window-properties.c:327
 msgid "Placement"
-msgstr ""
+msgstr "Penempatan"
 
 #: ../capplets/windows/mate-window-properties.c:340
 msgid "Disable _thumbnails in Alt-Tab"
@@ -2369,20 +2370,20 @@ msgstr "Non-Aktifkan _thumbnail pada Alt-Tab"
 #. New Windows
 #: ../capplets/windows/mate-window-properties.c:348
 msgid "New Windows"
-msgstr ""
+msgstr "Jendela Baru"
 
 #: ../capplets/windows/mate-window-properties.c:352
 msgid "Center _new windows"
-msgstr ""
+msgstr "_Jendela baru ditengah"
 
 #. Window Snapping
 #: ../capplets/windows/mate-window-properties.c:357
 msgid "Window Snapping"
-msgstr ""
+msgstr "Window Snapping"
 
 #: ../capplets/windows/mate-window-properties.c:361
 msgid "Enable side by side _tiling"
-msgstr ""
+msgstr "Aktifkan side by side _tiling"
 
 #. Window Selection
 #: ../capplets/windows/mate-window-properties.c:366
@@ -2746,87 +2747,87 @@ msgstr "Cari"
 #: ../libslab/directory-tile.c:176
 #, c-format
 msgid "<b>Open</b>"
-msgstr ""
+msgstr "<b>Buka</b>"
 
 #. make rename action
 #: ../libslab/directory-tile.c:195 ../libslab/document-tile.c:241
 msgid "Rename..."
-msgstr ""
+msgstr "Ganti Nama..."
 
 #: ../libslab/directory-tile.c:209 ../libslab/directory-tile.c:218
 #: ../libslab/document-tile.c:255 ../libslab/document-tile.c:264
 msgid "Send To..."
-msgstr ""
+msgstr "Kirim Ke..."
 
 #. make move to trash action
 #: ../libslab/directory-tile.c:233 ../libslab/document-tile.c:290
 msgid "Move to Trash"
-msgstr ""
+msgstr "Pindah ke Tong Sampah"
 
 #: ../libslab/directory-tile.c:243 ../libslab/directory-tile.c:453
 #: ../libslab/document-tile.c:300 ../libslab/document-tile.c:851
 msgid "Delete"
-msgstr ""
+msgstr "Hapus"
 
 #: ../libslab/directory-tile.c:530 ../libslab/document-tile.c:1014
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr ""
+msgstr "Apa Anda yakin ingin menghapus \"%s\" secara permanen?"
 
 #: ../libslab/directory-tile.c:531 ../libslab/document-tile.c:1015
 msgid "If you delete an item, it is permanently lost."
-msgstr ""
+msgstr "Jika Anda menghapus, maka akan dihapus permanen."
 
 #: ../libslab/document-tile.c:200
 #, c-format
 msgid "Open with \"%s\""
-msgstr ""
+msgstr "Buka dengan \"%s\""
 
 #: ../libslab/document-tile.c:214
 msgid "Open with Default Application"
-msgstr ""
+msgstr "Buka dengan Aplikasi Default"
 
 #: ../libslab/document-tile.c:225
 msgid "Open in File Manager"
-msgstr ""
+msgstr "Buka pada File Manager"
 
 #. clean item from menu
 #: ../libslab/document-tile.c:309
 msgid "Remove from recent menu"
-msgstr ""
+msgstr "Hapus dari menu terkini"
 
 #. clean all the items from menu
 #: ../libslab/document-tile.c:317
 msgid "Purge all the recent items"
-msgstr ""
+msgstr "Hapus semua entri terkini"
 
 #: ../libslab/document-tile.c:631
 msgid "?"
-msgstr ""
+msgstr "?"
 
 #: ../libslab/document-tile.c:638
 msgid "%l:%M %p"
-msgstr ""
+msgstr "%l:%M %p"
 
 #: ../libslab/document-tile.c:646
 msgid "Today %l:%M %p"
-msgstr ""
+msgstr "Hari ini %l:%M %p"
 
 #: ../libslab/document-tile.c:656
 msgid "Yesterday %l:%M %p"
-msgstr ""
+msgstr "Kemarin %l:%M %p"
 
 #: ../libslab/document-tile.c:668
 msgid "%a %l:%M %p"
-msgstr ""
+msgstr "%a %l:%M %p"
 
 #: ../libslab/document-tile.c:676
 msgid "%b %d %l:%M %p"
-msgstr ""
+msgstr "%b %d %l:%M %p"
 
 #: ../libslab/document-tile.c:678
 msgid "%b %d %Y"
-msgstr ""
+msgstr "%b %d %Y"
 
 #: ../libslab/search-bar.c:255
 msgid "Find Now"

shell/matecc.desktop.in.in

@@ -7,4 +7,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;
+Keywords=MATE;control;center;configuration;tool;destop;preferences;
 OnlyShowIn=MATE;

shell/matecc.menu

@@ -46,7 +46,7 @@
   <!-- Personal category -->
   <Menu>
     <Name>Personal</Name>
-    <Directory>Personal.directory</Directory>
+    <Directory>mate-personal.directory</Directory>
     <Include>
       <And>
         <Category>Settings</Category>
@@ -62,7 +62,7 @@
   <!-- Internet and Network category -->
   <Menu>
     <Name>Internet and Network</Name>
-    <Directory>InternetAndNetwork.directory</Directory>
+    <Directory>mate-internet-and-network.directory</Directory>
     <Include>
       <And>
         <Category>Settings</Category>
@@ -74,7 +74,7 @@
   <!-- Hardware category -->
   <Menu>
     <Name>Hardware</Name>
-    <Directory>Hardware.directory</Directory>
+    <Directory>mate-hardware.directory</Directory>
     <Include>
       <And>
         <Category>Settings</Category>
@@ -86,7 +86,7 @@
   <!-- System category -->
   <Menu>
     <Name>System</Name>
-    <Directory>System.directory</Directory>
+    <Directory>mate-system.directory</Directory>
     <Include>
       <And>
         <Category>Settings</Category>