diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-31 08:19:27 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-31 08:19:27 -0800 |
| commit | dfc74c8749852e4054d3c784f9adbec3de310a79 (patch) | |
| tree | 6d812f8cc448394352e1a509475d6f022e3d2919 /plugins | |
| parent | b7a57e21e92add2087d0b6ee5f4d93e2b3b468cd (diff) | |
| parent | 92b8ddf6a4b42d818b5ba2095e2d8f084f777170 (diff) | |
| download | pluma-dfc74c8749852e4054d3c784f9adbec3de310a79.tar.bz2 pluma-dfc74c8749852e4054d3c784f9adbec3de310a79.tar.xz | |
Merge pull request #51 from infirit/1.6
Cherrypick usefull commits from master
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/checkupdate/Makefile.am | 6 | ||||
| -rw-r--r-- | plugins/filebrowser/pluma-file-browser-plugin.c | 1 | ||||
| -rw-r--r-- | plugins/filebrowser/pluma-file-browser-store.c | 2 | ||||
| -rw-r--r-- | plugins/filebrowser/pluma-file-browser-widget.c | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/plugins/checkupdate/Makefile.am b/plugins/checkupdate/Makefile.am index fe565398..38fd5bbc 100644 --- a/plugins/checkupdate/Makefile.am +++ b/plugins/checkupdate/Makefile.am @@ -31,10 +31,10 @@ gsettings_SCHEMAS = org.mate.pluma.plugins.checkupdate.gschema.xml %.gschema.xml.in: %.gschema.xml.in.in Makefile $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ -EXTRA_DIST = $(plugin_in_files) $(gsettings_SCHEMAS_in_in) +EXTRA_DIST = $(plugin_in_files) $(gsettings_SCHEMAS).in.in -CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) +CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS).in $(gsettings_SCHEMAS) -DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) +DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS).in $(gsettings_SCHEMAS) -include $(top_srcdir)/git.mk diff --git a/plugins/filebrowser/pluma-file-browser-plugin.c b/plugins/filebrowser/pluma-file-browser-plugin.c index bce64c69..69b1e185 100644 --- a/plugins/filebrowser/pluma-file-browser-plugin.c +++ b/plugins/filebrowser/pluma-file-browser-plugin.c @@ -306,6 +306,7 @@ on_confirm_trash_changed (GSettings *settings, PlumaFileBrowserPluginData *data; gboolean enable = FALSE; + data = (PlumaFileBrowserPluginData *)(user_data); enable = g_settings_get_boolean (settings, key); data->confirm_trash = enable; diff --git a/plugins/filebrowser/pluma-file-browser-store.c b/plugins/filebrowser/pluma-file-browser-store.c index 6f611105..ba45feff 100644 --- a/plugins/filebrowser/pluma-file-browser-store.c +++ b/plugins/filebrowser/pluma-file-browser-store.c @@ -2480,6 +2480,8 @@ set_virtual_root_from_node (PlumaFileBrowserStore * model, GSList *copy; GtkTreePath *empty = NULL; + g_assert (node != NULL); + prev = node; next = prev->parent; diff --git a/plugins/filebrowser/pluma-file-browser-widget.c b/plugins/filebrowser/pluma-file-browser-widget.c index f2c54fe9..22c3c3b0 100644 --- a/plugins/filebrowser/pluma-file-browser-widget.c +++ b/plugins/filebrowser/pluma-file-browser-widget.c @@ -1640,6 +1640,8 @@ jump_to_location (PlumaFileBrowserWidget * obj, GList * item, obj->priv->changing_location = TRUE; + g_assert (obj->priv->current_location != NULL); + loc = (Location *) (obj->priv->current_location->data); /* Set the new root + virtual root */ |