From 421415f7cb1ba9c8a97a1837d4f789242c2fb0e6 Mon Sep 17 00:00:00 2001 From: Perberos Date: Mon, 7 Nov 2011 21:10:16 -0300 Subject: using ./config/ instead of ./mate2/ --- README | 4 +- configure.ac | 4 +- data/Makefile.am | 2 +- data/pluma-bugreport.sh.in | 8 +- data/pluma.desktop.in.in | 2 +- data/pluma.schemas.in.in | 152 ++++---- distro/archlinux/PKGBUILD | 3 + help/C/pluma.xml | 128 +++---- help/ar/ar.po | 4 +- help/ca/ca.po | 4 +- help/cs/cs.po | 4 +- help/da/da.po | 4 +- help/de/de.po | 6 +- help/el/el.po | 4 +- help/es/es.po | 4 +- help/fi/fi.po | 4 +- help/fr/fr.po | 4 +- help/hu/hu.po | 4 +- help/it/it.po | 4 +- help/ja/ja.po | 4 +- help/ko/ko.po | 4 +- help/oc/oc.po | 2 +- help/pt_BR/pt_BR.po | 4 +- help/ru/ru.po | 4 +- help/sv/sv.po | 4 +- help/th/th.po | 2 +- help/uk/uk.po | 4 +- help/zh_CN/zh_CN.po | 4 +- pixmaps/Makefile.am | 4 +- plugin-loaders/c/Makefile.am | 2 +- plugin-loaders/python/Makefile.am | 2 +- plugins/checkupdate/pluma-check-update-plugin.c | 104 +++--- plugins/checkupdate/pluma-check-update.schemas.in | 4 +- plugins/externaltools/tools/library.py | 24 +- plugins/filebrowser/pluma-file-browser-plugin.c | 246 ++++++------- plugins/filebrowser/pluma-file-browser.schemas.in | 40 +- plugins/pythonconsole/pythonconsole/config.py | 14 +- plugins/snippets/snippets/__init__.py | 30 +- plugins/sort/pluma-sort-plugin.c | 22 +- plugins/taglist/pluma-taglist-plugin-parser.c | 166 ++++----- plugins/time/pluma-time-plugin.c | 6 +- pluma/Makefile.am | 8 +- pluma/dialogs/Makefile.am | 4 +- pluma/pluma-commands-help.c | 50 ++- pluma/pluma-dirs.c | 423 ++++++++++------------ pluma/pluma-plugin.c | 30 +- pluma/pluma-plugins-engine.c | 122 +++---- pluma/pluma-prefs-manager-app.c | 234 ++++++------ pluma/pluma-prefs-manager.h | 30 +- win32/build-installer.sh | 24 +- 50 files changed, 957 insertions(+), 1013 deletions(-) diff --git a/README b/README index 0794c516..2861ec37 100755 --- a/README +++ b/README @@ -72,8 +72,8 @@ enable python plugins support. Simple install procedure: - % gzip -cd pluma-2.30.4.tar.gz | tar xvf - # unpack the sources - % cd pluma-2.30.4 # change to the toplevel directory + % gzip -cd mate-file-manager.tar.gz | tar xvf - # unpack the sources + % cd mate-file-manager # change to the toplevel directory % ./configure # run the `configure' script % make # build pluma [ Become root if necessary ] diff --git a/configure.ac b/configure.ac index 3646d795..a37dc08f 100755 --- a/configure.ac +++ b/configure.ac @@ -500,10 +500,10 @@ AC_SUBST(PLUMA_IMPLIB) AC_SUBST(PLUGIN_LIBTOOL_FLAGS) AC_SUBST(LOADER_LIBTOOL_FLAGS) -PLUMA_PLUGINS_DATA_DIR="$datadir/pluma-2/plugins" +PLUMA_PLUGINS_DATA_DIR="$datadir/pluma/plugins" AC_SUBST(PLUMA_PLUGINS_DATA_DIR) -PLUMA_PLUGINS_LIBS_DIR="$libdir/pluma-2/plugins" +PLUMA_PLUGINS_LIBS_DIR="$libdir/pluma/plugins" AC_SUBST(PLUMA_PLUGINS_LIBS_DIR) MATE_DOC_INIT([0.9.0],, diff --git a/data/Makefile.am b/data/Makefile.am index a137334f..da8ec7d9 100755 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -16,7 +16,7 @@ pkgconfig_DATA = pluma-@PLUMA_API_VERSION@.pc pluma-@PLUMA_API_VERSION@.pc: pluma.pc cp pluma.pc pluma-@PLUMA_API_VERSION@.pc -bugreportdir = $(libexecdir)/pluma-2 +bugreportdir = $(libexecdir)/pluma bugreport_SCRIPTS = pluma-bugreport.sh if MATECONF_SCHEMAS_INSTALL diff --git a/data/pluma-bugreport.sh.in b/data/pluma-bugreport.sh.in index d59d7969..e62a35ec 100755 --- a/data/pluma-bugreport.sh.in +++ b/data/pluma-bugreport.sh.in @@ -20,21 +20,21 @@ echo_padded () #if (which mateconftool-2 >/dev/null) #then # echo "MateConf configuration dump:" -# mateconftool-2 --dump /apps/pluma-2 | grep -Ev " - /schemas/apps/pluma-2/preferences/editor/font/use_default_font - /apps/pluma-2/preferences/editor/font/use_default_font + /schemas/apps/pluma/preferences/editor/font/use_default_font + /apps/pluma/preferences/editor/font/use_default_font pluma bool TRUE @@ -16,8 +16,8 @@ - /schemas/apps/pluma-2/preferences/editor/font/editor_font - /apps/pluma-2/preferences/editor/font/editor_font + /schemas/apps/pluma/preferences/editor/font/editor_font + /apps/pluma/preferences/editor/font/editor_font pluma string @@ -31,8 +31,8 @@ - /schemas/apps/pluma-2/preferences/editor/colors/scheme - /apps/pluma-2/preferences/editor/colors/scheme + /schemas/apps/pluma/preferences/editor/colors/scheme + /apps/pluma/preferences/editor/colors/scheme pluma string classic @@ -44,8 +44,8 @@ - /schemas/apps/pluma-2/preferences/editor/save/create_backup_copy - /apps/pluma-2/preferences/editor/save/create_backup_copy + /schemas/apps/pluma/preferences/editor/save/create_backup_copy + /apps/pluma/preferences/editor/save/create_backup_copy pluma bool FALSE @@ -58,8 +58,8 @@ - /schemas/apps/pluma-2/preferences/editor/save/auto_save - /apps/pluma-2/preferences/editor/save/auto_save + /schemas/apps/pluma/preferences/editor/save/auto_save + /apps/pluma/preferences/editor/save/auto_save pluma bool FALSE @@ -72,8 +72,8 @@ - /schemas/apps/pluma-2/preferences/editor/save/auto_save_interval - /apps/pluma-2/preferences/editor/save/auto_save_interval + /schemas/apps/pluma/preferences/editor/save/auto_save_interval + /apps/pluma/preferences/editor/save/auto_save_interval pluma int 10 @@ -86,8 +86,8 @@ - /schemas/apps/pluma-2/preferences/editor/undo/undo_actions_limit - /apps/pluma-2/preferences/editor/undo/undo_actions_limit + /schemas/apps/pluma/preferences/editor/undo/undo_actions_limit + /apps/pluma/preferences/editor/undo/undo_actions_limit pluma int 25 @@ -100,8 +100,8 @@ - /schemas/apps/pluma-2/preferences/editor/undo/max_undo_actions - /apps/pluma-2/preferences/editor/undo/max_undo_actions + /schemas/apps/pluma/preferences/editor/undo/max_undo_actions + /apps/pluma/preferences/editor/undo/max_undo_actions pluma int 2000 @@ -113,8 +113,8 @@ - /schemas/apps/pluma-2/preferences/editor/wrap_mode/wrap_mode - /apps/pluma-2/preferences/editor/wrap_mode/wrap_mode + /schemas/apps/pluma/preferences/editor/wrap_mode/wrap_mode + /apps/pluma/preferences/editor/wrap_mode/wrap_mode pluma string GTK_WRAP_WORD @@ -130,8 +130,8 @@ - /schemas/apps/pluma-2/preferences/editor/tabs/tabs_size - /apps/pluma-2/preferences/editor/tabs/tabs_size + /schemas/apps/pluma/preferences/editor/tabs/tabs_size + /apps/pluma/preferences/editor/tabs/tabs_size pluma int 8 @@ -143,8 +143,8 @@ - /schemas/apps/pluma-2/preferences/editor/tabs/insert_spaces - /apps/pluma-2/preferences/editor/tabs/insert_spaces + /schemas/apps/pluma/preferences/editor/tabs/insert_spaces + /apps/pluma/preferences/editor/tabs/insert_spaces pluma bool FALSE @@ -155,8 +155,8 @@ - /schemas/apps/pluma-2/preferences/editor/auto_indent/auto_indent - /apps/pluma-2/preferences/editor/auto_indent/auto_indent + /schemas/apps/pluma/preferences/editor/auto_indent/auto_indent + /apps/pluma/preferences/editor/auto_indent/auto_indent pluma bool FALSE @@ -167,8 +167,8 @@ - /schemas/apps/pluma-2/preferences/editor/line_numbers/display_line_numbers - /apps/pluma-2/preferences/editor/line_numbers/display_line_numbers + /schemas/apps/pluma/preferences/editor/line_numbers/display_line_numbers + /apps/pluma/preferences/editor/line_numbers/display_line_numbers pluma bool FALSE @@ -180,8 +180,8 @@ - /schemas/apps/pluma-2/preferences/editor/current_line/highlight_current_line - /apps/pluma-2/preferences/editor/current_line/highlight_current_line + /schemas/apps/pluma/preferences/editor/current_line/highlight_current_line + /apps/pluma/preferences/editor/current_line/highlight_current_line pluma bool FALSE @@ -192,8 +192,8 @@ - /schemas/apps/pluma-2/preferences/editor/bracket_matching/bracket_matching - /apps/pluma-2/preferences/editor/bracket_matching/bracket_matching + /schemas/apps/pluma/preferences/editor/bracket_matching/bracket_matching + /apps/pluma/preferences/editor/bracket_matching/bracket_matching pluma bool FALSE @@ -204,8 +204,8 @@ - /schemas/apps/pluma-2/preferences/editor/right_margin/display_right_margin - /apps/pluma-2/preferences/editor/right_margin/display_right_margin + /schemas/apps/pluma/preferences/editor/right_margin/display_right_margin + /apps/pluma/preferences/editor/right_margin/display_right_margin pluma bool FALSE @@ -217,8 +217,8 @@ - /schemas/apps/pluma-2/preferences/editor/right_margin/right_margin_position - /apps/pluma-2/preferences/editor/right_margin/right_margin_position + /schemas/apps/pluma/preferences/editor/right_margin/right_margin_position + /apps/pluma/preferences/editor/right_margin/right_margin_position pluma int 80 @@ -229,8 +229,8 @@ - /schemas/apps/pluma-2/preferences/editor/smart_home_end/smart_home_end - /apps/pluma-2/preferences/editor/smart_home_end/smart_home_end + /schemas/apps/pluma/preferences/editor/smart_home_end/smart_home_end + /apps/pluma/preferences/editor/smart_home_end/smart_home_end pluma string after @@ -248,8 +248,8 @@ - /schemas/apps/pluma-2/preferences/ui/toolbar/toolbar_visible - /apps/pluma-2/preferences/ui/toolbar/toolbar_visible + /schemas/apps/pluma/preferences/ui/toolbar/toolbar_visible + /apps/pluma/preferences/ui/toolbar/toolbar_visible pluma bool TRUE @@ -260,8 +260,8 @@ - /schemas/apps/pluma-2/preferences/ui/toolbar/toolbar_buttons_style - /apps/pluma-2/preferences/ui/toolbar/toolbar_buttons_style + /schemas/apps/pluma/preferences/ui/toolbar/toolbar_buttons_style + /apps/pluma/preferences/ui/toolbar/toolbar_buttons_style pluma string @TOOLBAR_STYLE@ @@ -278,8 +278,8 @@ - /schemas/apps/pluma-2/preferences/ui/statusbar/statusbar_visible - /apps/pluma-2/preferences/ui/statusbar/statusbar_visible + /schemas/apps/pluma/preferences/ui/statusbar/statusbar_visible + /apps/pluma/preferences/ui/statusbar/statusbar_visible pluma bool TRUE @@ -291,8 +291,8 @@ - /schemas/apps/pluma-2/preferences/ui/side_pane/side_pane_visible - /apps/pluma-2/preferences/ui/side_pane/side_pane_visible + /schemas/apps/pluma/preferences/ui/side_pane/side_pane_visible + /apps/pluma/preferences/ui/side_pane/side_pane_visible pluma bool FALSE @@ -304,8 +304,8 @@ - /schemas/apps/pluma-2/preferences/ui/bottom_panel/bottom_panel_visible - /apps/pluma-2/preferences/ui/bottom_panel/bottom_panel_visible + /schemas/apps/pluma/preferences/ui/bottom_panel/bottom_panel_visible + /apps/pluma/preferences/ui/bottom_panel/bottom_panel_visible pluma bool FALSE @@ -317,8 +317,8 @@ - /schemas/apps/pluma-2/preferences/print/page/print_syntax_highlighting - /apps/pluma-2/preferences/print/page/print_syntax_highlighting + /schemas/apps/pluma/preferences/print/page/print_syntax_highlighting + /apps/pluma/preferences/print/page/print_syntax_highlighting pluma bool TRUE @@ -330,8 +330,8 @@ - /schemas/apps/pluma-2/preferences/print/page/print_header - /apps/pluma-2/preferences/print/page/print_header + /schemas/apps/pluma/preferences/print/page/print_header + /apps/pluma/preferences/print/page/print_header pluma bool TRUE @@ -343,8 +343,8 @@ - /schemas/apps/pluma-2/preferences/print/page/print_wrap_mode - /apps/pluma-2/preferences/print/page/print_wrap_mode + /schemas/apps/pluma/preferences/print/page/print_wrap_mode + /apps/pluma/preferences/print/page/print_wrap_mode pluma string GTK_WRAP_WORD @@ -360,8 +360,8 @@ - /schemas/apps/pluma-2/preferences/print/page/print_line_numbers - /apps/pluma-2/preferences/print/page/print_line_numbers + /schemas/apps/pluma/preferences/print/page/print_line_numbers + /apps/pluma/preferences/print/page/print_line_numbers pluma int 0 @@ -374,8 +374,8 @@ - /schemas/apps/pluma-2/preferences/print/fonts/print_font_body_pango - /apps/pluma-2/preferences/print/fonts/print_font_body_pango + /schemas/apps/pluma/preferences/print/fonts/print_font_body_pango + /apps/pluma/preferences/print/fonts/print_font_body_pango pluma string @@ -388,8 +388,8 @@ - /schemas/apps/pluma-2/preferences/print/fonts/print_font_header_pango - /apps/pluma-2/preferences/print/fonts/print_font_header_pango + /schemas/apps/pluma/preferences/print/fonts/print_font_header_pango + /apps/pluma/preferences/print/fonts/print_font_header_pango pluma string @@ -403,8 +403,8 @@ - /schemas/apps/pluma-2/preferences/print/fonts/print_font_numbers_pango - /apps/pluma-2/preferences/print/fonts/print_font_numbers_pango + /schemas/apps/pluma/preferences/print/fonts/print_font_numbers_pango + /apps/pluma/preferences/print/fonts/print_font_numbers_pango pluma string @@ -418,8 +418,8 @@ - /schemas/apps/pluma-2/preferences/ui/recents/max_recents - /apps/pluma-2/preferences/ui/recents/max_recents + /schemas/apps/pluma/preferences/ui/recents/max_recents + /apps/pluma/preferences/ui/recents/max_recents pluma int 5 @@ -431,8 +431,8 @@ - /schemas/apps/pluma-2/preferences/encodings/auto_detected - /apps/pluma-2/preferences/encodings/auto_detected + /schemas/apps/pluma/preferences/encodings/auto_detected + /apps/pluma/preferences/encodings/auto_detected pluma list string @@ -455,8 +455,8 @@ - /schemas/apps/pluma-2/preferences/encodings/shown_in_menu - /apps/pluma-2/preferences/encodings/shown_in_menu + /schemas/apps/pluma/preferences/encodings/shown_in_menu + /apps/pluma/preferences/encodings/shown_in_menu pluma list string @@ -470,8 +470,8 @@ - /schemas/apps/pluma-2/preferences/syntax_highlighting/enable - /apps/pluma-2/preferences/syntax_highlighting/enable + /schemas/apps/pluma/preferences/syntax_highlighting/enable + /apps/pluma/preferences/syntax_highlighting/enable pluma bool TRUE @@ -482,8 +482,8 @@ - /schemas/apps/pluma-2/plugins/active-plugins - /apps/pluma-2/plugins/active-plugins + /schemas/apps/pluma/plugins/active-plugins + /apps/pluma/plugins/active-plugins pluma list string @@ -496,8 +496,8 @@ - /schemas/apps/pluma-2/preferences/editor/save/writable_vfs_schemes - /apps/pluma-2/preferences/editor/save/writable_vfs_schemes + /schemas/apps/pluma/preferences/editor/save/writable_vfs_schemes + /apps/pluma/preferences/editor/save/writable_vfs_schemes pluma list string @@ -510,8 +510,8 @@ - /schemas/apps/pluma-2/preferences/editor/cursor_position/restore_cursor_position - /apps/pluma-2/preferences/editor/cursor_position/restore_cursor_position + /schemas/apps/pluma/preferences/editor/cursor_position/restore_cursor_position + /apps/pluma/preferences/editor/cursor_position/restore_cursor_position pluma bool TRUE @@ -522,8 +522,8 @@ - /schemas/apps/pluma-2/preferences/editor/search_highlighting/enable - /apps/pluma-2/preferences/editor/search_highlighting/enable + /schemas/apps/pluma/preferences/editor/search_highlighting/enable + /apps/pluma/preferences/editor/search_highlighting/enable pluma bool TRUE diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD index 404b5267..5a2c2ed6 100644 --- a/distro/archlinux/PKGBUILD +++ b/distro/archlinux/PKGBUILD @@ -32,6 +32,9 @@ package() { make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + # just for easy find + ln -s pluma /usr/bin/mate-text-editor + install -m755 -d "${pkgdir}/usr/share/mateconf/schemas" mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1 rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas diff --git a/help/C/pluma.xml b/help/C/pluma.xml index 54cc0407..be9e063b 100755 --- a/help/C/pluma.xml +++ b/help/C/pluma.xml @@ -23,7 +23,7 @@ Pluma Manual<!-- not using app entity because of lowercase ugliness --> 2007 - MATE Documentation Project + MATE Documentation Project 2002 2003 @@ -60,10 +60,10 @@ - Hal + Hal Canary Added the Shortcut Keys Table - + Sun Java Desktop System Documentation Team @@ -387,7 +387,7 @@ Valid types of URI include http:, ftp:, file:, and all of the methods supported by mate-vfs. Files from some types of URI are opened as read-only, and any changes you make must be saved to a different location. HTTP only allows files to be read. Files opened from FTP are read-only because because not all FTP servers may correctly work with saving remote files. - Saving to FTP servers can be enabled with Configuration Editor, setting the key /apps/pluma-2/preferences/editor/save/writable_vfs_schemes, but this may cause errors. + Saving to FTP servers can be enabled with Configuration Editor, setting the key /apps/pluma/preferences/editor/save/writable_vfs_schemes, but this may cause errors. @@ -526,7 +526,7 @@ The backslash character itself must be escaped if it is being searched for. For example, if you are looking for the "\n" literal, you will have to type "\\n" in the Search for field. Or if you are - looking for a sequence of backslashes, you will have to double the number of + looking for a sequence of backslashes, you will have to double the number of searched backslashes. @@ -850,7 +850,7 @@ - + Shortcut Keys Use shortcut keys to perform common tasks more quickly than with the mouse and menus. The following tables list all of &app;'s shortcut keys. For more on shortcut keys, see the Desktop User Guide. @@ -866,32 +866,32 @@ Shortcut Key - + Command - + Ctrl + Alt + PageUp Switches to the next tab to the left. - + Ctrl + Alt + PageDown Switches to the next tab to the right. - + Ctrl + W Close tab. - + Ctrl + Shift + L Save all tabs. - + Ctrl + Shift + W Close all tabs. - + Alt + n Jump to nth tab. @@ -910,44 +910,44 @@ Shortcut Key - + Command - + Ctrl + N Create a new document. - + Ctrl + O Open a document. - + Ctrl + L Open a location. - + Ctrl + S Save the current document to disk. - + Ctrl + Shift + S Save the current document with a new filename. - + Ctrl + P Print the current document. - + Ctrl + Shift + P Print preview. - + Ctrl + W Close the current document. - + Ctrl + Q Quit Pluma. @@ -957,7 +957,7 @@ Edit - Shortcuts for editing documents: + Shortcuts for editing documents: @@ -966,7 +966,7 @@ Shortcut Key - + Command @@ -1013,7 +1013,7 @@ Panes - Shortcuts for showing and hiding panes: + Shortcuts for showing and hiding panes: @@ -1022,16 +1022,16 @@ Shortcut Key - + Command - + F9 Show/hide the side pane. - + Ctrl + F9 Show/hide the bottom pane. @@ -1041,7 +1041,7 @@ Search - Shortcuts for searching: + Shortcuts for searching: @@ -1050,36 +1050,36 @@ Shortcut Key - + Command - + Ctrl + F Find a string. - + Ctrl + G Find the next instance of the string. - + Ctrl + Shift + G Find the previous instance of the string. - + Ctrl + K Interactive search. - + Ctrl + H Search and replace. - + Ctrl + Shift + K Clear highlight. - + Ctrl + I Goto line. @@ -1088,7 +1088,7 @@ Tools - Shortcuts for tools: + Shortcuts for tools: @@ -1097,32 +1097,32 @@ Shortcut Key - + Command - + Shift + F7 Check spelling (with plugin). - + Alt + F12 Remove trailing spaces (with plugin). - + Ctrl + T Indent (with plugin). - + Ctrl + Shift + T Remove Indent (with plugin). - + F8 Run "make" in current directory (with plugin). - + Ctrl + Shift + D Directory listing (with plugin). @@ -1140,12 +1140,12 @@ Shortcut Key - + Command - + F1 Open &app;'s user manual. @@ -1515,37 +1515,37 @@ Description This description is shown in the statusbar when the menu command is chosen. - + Accelerator Enter a keyboard shortcut for the command. - + Commands The actual commands to be run. Several &app; environment variables can be used to pass content to these commands: see . - + Input The content to give to the commands (as stdin): the entire text of the current document, the current selection, line, or word. - + Output What to do with the output of the commands: display in the bottom pane, put in a new document, or place in the current document, at the end, at the cursor position, or replacing the selection or the entire document. - + Applicability Determines which sort of documents can be affected by the command, for example whether saved or not, and local or remote. - + - + Editing and Removing Tools To edit a tool, select it in the list and make changes to its properties. @@ -1553,8 +1553,8 @@ To restore a built-in tool that you have changed, press Revert. To remove a tool, select it in the list and press Remove. You can not remove built-in tools, only those you have created yourself. - - + + Variables You can use the following variables in the Commands field of the command definition: @@ -1583,21 +1583,21 @@ - + File Browser Plugin The File Browser Plugin shows your files and folders in the side pane, allowing you to quickly open files. To view the File Browser, choose View Side Pane and then click on the tab showing the File Browser icon at the bottom of the side pane. - + Browsing your Files The File Browser tab initially shows your file manager bookmarks. To browse the contents of any item, double-click it. To show a parent folder, choose from the drop-down list, or press the up arrow on the File Browser's toolbar. To show the folder that contains the document you are currently working on, right-click in the file list and choose Set root to active document. - + Opening a File To open a file in &app;, double-click it in the file list. - + Creating Files and Folders To create a new, empty text file in the current folder shown in the browser, right-click in the file list and choose New File. To create a new folder in the current folder shown in the browser, right-click in the file list and choose New Folder. @@ -1716,7 +1716,7 @@ - + Python Console Plugin The Python Console Plugin allows you to run commands in the python programming language from &app;. Enabling the plugin adds a tab to the bottom pane. This shows recent output and a command prompt field. Commands entered into the python console are not checked before they are run. It is therefore possible to hang &app;, for example by entering an infinite loop. @@ -1845,14 +1845,14 @@ $(cmd) is replaced by the result of executing cmd in a shell. $(n:cmd) allows you to give this placeholder a reference, where n is any number from 1 upwards. Use $n to use the output from one shell placeholder as input in another. - + Python placeholders $<cmd> is replaced by the result of evaluating cmd in the python interpreter. $<a:cmd> specifies another python placeholder as a dependency, where a gives its order in the snippet. This allows you to use python functions defined in another snippet. To specify several dependencies, separate the numbers with commas thus: $<a,b:cmd> To use a variable in all other python snippets, declare it as global. - + diff --git a/help/ar/ar.po b/help/ar/ar.po index 3886027f..c67ff482 100755 --- a/help/ar/ar.po +++ b/help/ar/ar.po @@ -686,12 +686,12 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "الحفظ إلى خوادم إف​تي​بي يمكن أن يُفعل من محرر التشكيل، " -"ضبط المفتاح /apps/pluma-2/preferences/editor/save/" +"ضبط المفتاح /apps/pluma/preferences/editor/save/" "writable_vfs_schemes، لكن هذا قد يسبب أخطاءً." #: C/pluma.xml:395(title) diff --git a/help/ca/ca.po b/help/ca/ca.po index e4319fa3..a5a5f558 100755 --- a/help/ca/ca.po +++ b/help/ca/ca.po @@ -814,12 +814,12 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "Es pot habilitar el desament a servidors FTP amb l'editor de configuració, en establir la clau /apps/pluma-2/preferences/editor/" +"ulink>, en establir la clau /apps/pluma/preferences/editor/" "save/writable_vfs_schemes, però això pot causar errors." #: C/pluma.xml:395(title) diff --git a/help/cs/cs.po b/help/cs/cs.po index 09c45336..f32d9574 100755 --- a/help/cs/cs.po +++ b/help/cs/cs.po @@ -807,12 +807,12 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "Ukládání na FTP servery můžete povolit v Editoru nastavení " -"nastavením klíče /apps/pluma-2/preferences/editor/save/" +"nastavením klíče /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, ale může to způsobovat chyby." #: C/pluma.xml:395(title) diff --git a/help/da/da.po b/help/da/da.po index d6c4fed6..80b93be6 100755 --- a/help/da/da.po +++ b/help/da/da.po @@ -824,12 +824,12 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "At gemme til FTP-servere kan aktiveres med Konfigurationsredigering " -"ved at sætte nøglen /apps/pluma-2/preferences/editor/save/" +"ved at sætte nøglen /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, men dette kan give fejlmeddelelser." #: ../C/pluma.xml:395(title) diff --git a/help/de/de.po b/help/de/de.po index 3a719f24..63f35c66 100755 --- a/help/de/de.po +++ b/help/de/de.po @@ -1,4 +1,4 @@ -# German translation of the pluma documentation +# German translation of the pluma documentation # Jan Arne Petersen , 2007. # Mario Blättermann , 2008-2010. # Andre Klapper , 2009. @@ -817,13 +817,13 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "Das Speichern auf FTP-Servern kann mit Hilfe des Konfigurationsditors ermöglicht werden. Aktivieren Sie den Schlüssel /apps/" -"pluma-2/preferences/editor/save/writable_vfs_schemes, aber " +"pluma/preferences/editor/save/writable_vfs_schemes, aber " "bedenken Sie, dass dies Fehler zur Folge haben kann." #: C/pluma.xml:395(title) diff --git a/help/el/el.po b/help/el/el.po index a07b7175..2eb0ffcd 100755 --- a/help/el/el.po +++ b/help/el/el.po @@ -539,8 +539,8 @@ msgid "Files from some types of URI are opened as read-only, and any changes you msgstr "Αρχεία από μερικούς τύπους URI ανοίγονται μόνο για ανάγνωση, και ό,τι αλλαγές κάνετε θα πρέπει να αποθηκευτούν σε μια διαφορετική τοποθεσία. Το HTTP επιτρέπει μόνο την ανάγνωση αρχείων. Αρχεία που ανοίγονται από FTP είναι μόνο για ανάγνωση γιατί δεν υποστηρίζουν όλοι οι εξυπηρετητές FTP την αποθήκευση απομακρυσμένων αρχείων." #: C/pluma.xml:390(para) -msgid "Saving to FTP servers can be enabled with Configuration Editor, setting the key /apps/pluma-2/preferences/editor/save/writable_vfs_schemes, but this may cause errors." -msgstr "Η αποθήκευση σε εξυπηρετητές FTP μπορεί να ενεργοποιηθεί από τον Configuration Editor, με την επιλογή του κλειδιού /apps/pluma-2/preferences/editor/save/writable_vfs_schemes, αλλά αυτό μπορεί να προκαλέσει σφάλματα." +msgid "Saving to FTP servers can be enabled with Configuration Editor, setting the key /apps/pluma/preferences/editor/save/writable_vfs_schemes, but this may cause errors." +msgstr "Η αποθήκευση σε εξυπηρετητές FTP μπορεί να ενεργοποιηθεί από τον Configuration Editor, με την επιλογή του κλειδιού /apps/pluma/preferences/editor/save/writable_vfs_schemes, αλλά αυτό μπορεί να προκαλέσει σφάλματα." #: C/pluma.xml:395(title) msgid "Working With Tabs" diff --git a/help/es/es.po b/help/es/es.po index 328b96a1..e64bcbcf 100755 --- a/help/es/es.po +++ b/help/es/es.po @@ -823,12 +823,12 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "Guardar a servidores FTP puede activarse con el Editor de configuración, estableciendo la clave /apps/pluma-2/preferences/editor/" +"ulink>, estableciendo la clave /apps/pluma/preferences/editor/" "save/writable_vfs_schemes, pero puede causar errores." #: C/pluma.xml:395(title) diff --git a/help/fi/fi.po b/help/fi/fi.po index 77a3ed04..6c678038 100755 --- a/help/fi/fi.po +++ b/help/fi/fi.po @@ -779,12 +779,12 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "FTP-palvelimille tallentaminen voidaan kytkeä päälle Asetusten muokkaimella asettamalla avain /apps/pluma-2/preferences/" +"application> asettamalla avain /apps/pluma/preferences/" "editor/save/writable_vfs_schemes, mutta tämä voi tuottaa " "virheitä." diff --git a/help/fr/fr.po b/help/fr/fr.po index 078a027c..2dcac682 100755 --- a/help/fr/fr.po +++ b/help/fr/fr.po @@ -822,13 +822,13 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "L'enregistrement de fichiers sur les serveurs FTP peut être activé avec " "l'Éditeur de " "configuration, en paramétrant la clé /apps/" -"pluma-2/preferences/editor/save/writable_vfs_schemes, mais cela " +"pluma/preferences/editor/save/writable_vfs_schemes, mais cela " "peut provoquer des erreurs." #: C/pluma.xml:395(title) diff --git a/help/hu/hu.po b/help/hu/hu.po index 9c7fcc8d..7c7c4512 100755 --- a/help/hu/hu.po +++ b/help/hu/hu.po @@ -802,12 +802,12 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "Az FTP kiszolgálókra való mentés a Konfigurációszerkesztővel " -"kapcsolható be. A /apps/pluma-2/preferences/editor/save/" +"kapcsolható be. A /apps/pluma/preferences/editor/save/" "writable_vfs_schemes kulcsot kell beállítani, de ez hibákat " "okozhat." diff --git a/help/it/it.po b/help/it/it.po index ab4e8ba3..09dbe0a9 100755 --- a/help/it/it.po +++ b/help/it/it.po @@ -819,13 +819,13 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "Il salvataggio di file su server FTP può essere abilitato attraverso " "l'Editor della " "configurazione, impostando la chiave /apps/" -"pluma-2/preferences/editor/save/writable_vfs_schemes. Questo " +"pluma/preferences/editor/save/writable_vfs_schemes. Questo " "però, potrebbe causare degli errori." #: C/pluma.xml:395(title) diff --git a/help/ja/ja.po b/help/ja/ja.po index 7c2cb9b2..8409aad1 100755 --- a/help/ja/ja.po +++ b/help/ja/ja.po @@ -822,12 +822,12 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "設定エディタを利用すれば" -"FTP サーバへの保存も利用可能になります。/apps/pluma-2/preferences/" +"FTP サーバへの保存も利用可能になります。/apps/pluma/preferences/" "editor/save/writable_vfs_schemes キーを変更してください。" "ただしこれはエラーの原因にもなります。" diff --git a/help/ko/ko.po b/help/ko/ko.po index 79d1e87d..d1ee5a3b 100755 --- a/help/ko/ko.po +++ b/help/ko/ko.po @@ -800,12 +800,12 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "FTP 서버로 저장하는 기능은 설정 편집기로 저장할 수 있게 바꿀 수 있" -"습니다. /apps/pluma-2/preferences/editor/save/" +"습니다. /apps/pluma/preferences/editor/save/" "writable_vfs_schemes키를 설정하면 되지만, 이 기능때문에 오류가 " "발생할 수도 있습니다." diff --git a/help/oc/oc.po b/help/oc/oc.po index e8c02684..8e4d71e6 100755 --- a/help/oc/oc.po +++ b/help/oc/oc.po @@ -687,7 +687,7 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" diff --git a/help/pt_BR/pt_BR.po b/help/pt_BR/pt_BR.po index 20b7dd9a..8cd258dd 100755 --- a/help/pt_BR/pt_BR.po +++ b/help/pt_BR/pt_BR.po @@ -820,12 +820,12 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "Salvar em servidores FTP pode ser habilitado com o Editor de Configurações, ajustando a chave /apps/pluma-2/preferences/editor/save/" +"ulink>, ajustando a chave /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, mas isso pode causar erros." #: C/pluma.xml:395(title) diff --git a/help/ru/ru.po b/help/ru/ru.po index cd6b2561..f39879fd 100755 --- a/help/ru/ru.po +++ b/help/ru/ru.po @@ -806,12 +806,12 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "Запись на FTP-серверы может быть включена с помощью приложения Редактор конфигурации, установкой ключа /apps/pluma-2/preferences/" +"application>, установкой ключа /apps/pluma/preferences/" "editor/save/writable_vfs_schemes, но это может приводить к " "ошибкам." diff --git a/help/sv/sv.po b/help/sv/sv.po index 91488184..466a742d 100755 --- a/help/sv/sv.po +++ b/help/sv/sv.po @@ -534,8 +534,8 @@ msgid "Files from some types of URI are opened as read-only, and any changes you msgstr "Filer från vissa typer av uri:er öppnas skrivskyddade, och alla ändringar du gör måste sparas på en annan plats. HTTP tillåter endast filer att bli lästa. Filer öppnade från en FTP-server är skrivskyddade på grund av att inte alla FTP-servrar fungerar korrekt när man sparar fjärrfiler." #: C/pluma.xml:390(para) -msgid "Saving to FTP servers can be enabled with Configuration Editor, setting the key /apps/pluma-2/preferences/editor/save/writable_vfs_schemes, but this may cause errors." -msgstr "Skrivning till FTP-servrar kan aktiveras med Konfigurationsredigerare, ställ in nyckeln /apps/pluma-2/preferences/editor/save/writable_vfs_schemes, men det kan orsaka fel." +msgid "Saving to FTP servers can be enabled with Configuration Editor, setting the key /apps/pluma/preferences/editor/save/writable_vfs_schemes, but this may cause errors." +msgstr "Skrivning till FTP-servrar kan aktiveras med Konfigurationsredigerare, ställ in nyckeln /apps/pluma/preferences/editor/save/writable_vfs_schemes, men det kan orsaka fel." #: C/pluma.xml:395(title) msgid "Working With Tabs" diff --git a/help/th/th.po b/help/th/th.po index d33e0cc2..478670a7 100755 --- a/help/th/th.po +++ b/help/th/th.po @@ -778,7 +778,7 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" diff --git a/help/uk/uk.po b/help/uk/uk.po index 35706688..20b7bd2d 100755 --- a/help/uk/uk.po +++ b/help/uk/uk.po @@ -809,12 +809,12 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "Збереження файлів на сервер FTP можна увімкнути у Редакторі конфігурації, " -"встановивши ключ /apps/pluma-2/preferences/editor/save/" +"встановивши ключ /apps/pluma/preferences/editor/save/" "writable_vfs_schemes. Але подібний режим використання може призводити до помилок." #: ../C/pluma.xml:388(title) diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po index e1fb4993..a70ff748 100755 --- a/help/zh_CN/zh_CN.po +++ b/help/zh_CN/zh_CN.po @@ -760,12 +760,12 @@ msgstr "" msgid "" "Saving to FTP servers can be enabled with Configuration Editor, " -"setting the key /apps/pluma-2/preferences/editor/save/" +"setting the key /apps/pluma/preferences/editor/save/" "writable_vfs_schemes, but this may cause errors." msgstr "" "保存到远程服务器，可以通过 配置编辑器 来启用，设置 /" -"apps/pluma-2/preferences/editor/save/writable_vfs_schemes，但这" +"apps/pluma/preferences/editor/save/writable_vfs_schemes，但这" "可能导致错误发生。" #: C/pluma.xml:395(title) diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index 0e17c73b..0e4ac42a 100755 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -1,7 +1,7 @@ -icondir = $(datadir)/pluma-2/icons +icondir = $(datadir)/pluma/icons icon_DATA = pluma-plugin.png -logodir = $(datadir)/pluma-2/logo +logodir = $(datadir)/pluma/logo logo_DATA = pluma-logo.png EXTRA_DIST = \ diff --git a/plugin-loaders/c/Makefile.am b/plugin-loaders/c/Makefile.am index 37df5cd3..be5df5ef 100755 --- a/plugin-loaders/c/Makefile.am +++ b/plugin-loaders/c/Makefile.am @@ -1,6 +1,6 @@ # C plugin loader -loaderdir = $(libdir)/pluma-2/plugin-loaders +loaderdir = $(libdir)/pluma/plugin-loaders INCLUDES = \ -I$(top_srcdir) \ diff --git a/plugin-loaders/python/Makefile.am b/plugin-loaders/python/Makefile.am index 64667363..ffbe0cd7 100755 --- a/plugin-loaders/python/Makefile.am +++ b/plugin-loaders/python/Makefile.am @@ -1,7 +1,7 @@ # C plugin loader SUBDIRS = bindings -loaderdir = $(libdir)/pluma-2/plugin-loaders +loaderdir = $(libdir)/pluma/plugin-loaders INCLUDES = \ -I$(top_srcdir) \ diff --git a/plugins/checkupdate/pluma-check-update-plugin.c b/plugins/checkupdate/pluma-check-update-plugin.c index bf30181c..d00b2e70 100755 --- a/plugins/checkupdate/pluma-check-update-plugin.c +++ b/plugins/checkupdate/pluma-check-update-plugin.c @@ -5,7 +5,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2, or (at your option) * any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -35,7 +35,7 @@ #include #endif -#define MATECONF_KEY_BASE "/apps/pluma-2/plugins/checkupdate" +#define MATECONF_KEY_BASE "/apps/pluma/plugins/checkupdate" #define MATECONF_KEY_IGNORE_VERSION MATECONF_KEY_BASE "/ignore_version" #define WINDOW_DATA_KEY "PlumaCheckUpdatePluginWindowData" @@ -125,13 +125,13 @@ pluma_check_update_plugin_dispose (GObject *object) mateconf_client_suggest_sync (plugin->priv->mateconf_client, NULL); g_object_unref (G_OBJECT (plugin->priv->mateconf_client)); - + plugin->priv->mateconf_client = NULL; } pluma_debug_message (DEBUG_PLUGINS, "PlumaCheckUpdatePlugin disposing"); - + G_OBJECT_CLASS (pluma_check_update_plugin_parent_class)->dispose (object); } @@ -153,7 +153,7 @@ set_contents (GtkWidget *infobar, contents); #else GtkWidget *content_area; - + content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar)); gtk_container_add (GTK_CONTAINER (content_area), contents); #endif @@ -210,7 +210,7 @@ set_message_area_text_and_icon (GtkWidget *message_area, gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); gtk_misc_set_alignment (GTK_MISC (secondary_label), 0, 0.5); } - + set_contents (message_area, hbox_content); } @@ -223,7 +223,7 @@ on_response_cb (GtkWidget *infobar, { GError *error = NULL; WindowData *data; - + data = g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY); @@ -242,7 +242,7 @@ on_response_cb (GtkWidget *infobar, dialog = gtk_message_dialog_new (GTK_WINDOW (window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, + GTK_BUTTONS_CLOSE, _("There was an error displaying the URI.")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), @@ -263,7 +263,7 @@ on_response_cb (GtkWidget *infobar, else if (response_id == GTK_RESPONSE_NO) { WindowData *data; - + data = g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY); mateconf_client_set_string (data->plugin->priv->mateconf_client, @@ -288,7 +288,7 @@ create_infobar (PlumaWindow *window, #if !GTK_CHECK_VERSION (2, 17, 1) infobar = pluma_message_area_new (); - + pluma_message_area_add_stock_button_with_text (PLUMA_MESSAGE_AREA (infobar), _("_Download"), GTK_STOCK_SAVE, @@ -304,7 +304,7 @@ create_infobar (PlumaWindow *window, GtkWidget *button; infobar = gtk_info_bar_new (); - + button = pluma_gtk_button_new_with_stock_icon (_("_Download"), GTK_STOCK_SAVE); gtk_widget_show (button); @@ -324,7 +324,7 @@ create_infobar (PlumaWindow *window, gtk_info_bar_add_button (GTK_INFO_BAR (infobar), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - + gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar), GTK_MESSAGE_INFO); #endif @@ -342,7 +342,7 @@ create_infobar (PlumaWindow *window, g_signal_connect (infobar, "response", G_CALLBACK (on_response_cb), window); - + return infobar; } @@ -351,9 +351,9 @@ pack_infobar (GtkWidget *window, GtkWidget *infobar) { GtkWidget *vbox; - + vbox = gtk_bin_get_child (GTK_BIN (window)); - + gtk_box_pack_start (GTK_BOX (vbox), infobar, FALSE, FALSE, 0); gtk_box_reorder_child (GTK_BOX (vbox), infobar, 2); } @@ -365,20 +365,20 @@ get_file (const gchar *text, GRegex *regex; GMatchInfo *match_info; gchar *word = NULL; - + regex = g_regex_new (regex_place, 0, 0, NULL); g_regex_match (regex, text, 0, &match_info); while (g_match_info_matches (match_info)) { g_free (word); - + word = g_match_info_fetch (match_info, 0); - + g_match_info_next (match_info, NULL); } g_match_info_free (match_info); g_regex_unref (regex); - + return word; } @@ -390,16 +390,16 @@ get_numbers (const gchar *version, { gchar **split; gint num = 2; - + if (micro != NULL) num = 3; - + split = g_strsplit (version, ".", num); *major = atoi (split[0]); *minor = atoi (split[1]); if (micro != NULL) *micro = atoi (split[2]); - + g_strfreev (split); } @@ -411,7 +411,7 @@ newer_version (const gchar *v1, gboolean newer = FALSE; gint major1, minor1, micro1; gint major2, minor2, micro2; - + if (v1 == NULL || v2 == NULL) return FALSE; @@ -438,7 +438,7 @@ newer_version (const gchar *v1, { newer = TRUE; } - + return newer; } @@ -446,21 +446,21 @@ static gchar * parse_file_version (const gchar *file) { gchar *p, *aux; - + p = (gchar *)file; - + while (*p != '\0' && !g_ascii_isdigit (*p)) { p++; } - + if (*p == '\0') return NULL; - + aux = g_strrstr (p, "-"); if (aux == NULL) aux = g_strrstr (p, "."); - + return g_strndup (p, aux - p); } @@ -500,13 +500,13 @@ parse_page_file (SoupSession *session, data = g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY); - + file_url = g_strconcat (data->url, file, NULL); g_free (data->url); data->url = file_url; data->version = g_strdup (file_version); - + infobar = create_infobar (window, file_version); pack_infobar (GTK_WIDGET (window), infobar); gtk_widget_show (infobar); @@ -530,14 +530,14 @@ is_unstable (const gchar *version) gchar **split; gint minor; gboolean unstable = TRUE;; - + split = g_strsplit (version, ".", 2); minor = atoi (split[1]); g_strfreev (split); - + if ((minor % 2) == 0) unstable = FALSE; - + return unstable; } @@ -550,25 +550,25 @@ get_file_page_version (const gchar *text, GString *string = NULL; gchar *unstable = NULL; gchar *stable = NULL; - + regex = g_regex_new (regex_place, 0, 0, NULL); g_regex_match (regex, text, 0, &match_info); while (g_match_info_matches (match_info)) { gint end; gint i; - + g_match_info_fetch_pos (match_info, 0, NULL, &end); - + string = g_string_new (""); - + i = end; while (text[i] != '/') { string = g_string_append_c (string, text[i]); i++; } - + if (is_unstable (string->str)) { g_free (unstable); @@ -579,16 +579,16 @@ get_file_page_version (const gchar *text, g_free (stable); stable = g_string_free (string, FALSE); } - + g_match_info_next (match_info, NULL); } g_match_info_free (match_info); g_regex_unref (regex); - + if ((PLUMA_MINOR_VERSION % 2) == 0) { g_free (unstable); - + return stable; } else @@ -597,13 +597,13 @@ get_file_page_version (const gchar *text, if (newer_version (stable, unstable, FALSE)) { g_free (unstable); - + return stable; } else { g_free (stable); - + return unstable; } } @@ -621,14 +621,14 @@ parse_page_version (SoupSession *session, WindowData *data; data = g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY); - + version = get_file_page_version (msg->response_body->data, VERSION_PLACE); - + data->url = g_strconcat (PLUMA_URL, version, "/", NULL); g_free (version); msg2 = soup_message_new ("GET", data->url); - + soup_session_queue_message (session, msg2, (SoupSessionCallback)parse_page_file, window); @@ -647,7 +647,7 @@ impl_activate (PlumaPlugin *plugin, { SoupMessage *msg; WindowData *data; - + pluma_debug (DEBUG_PLUGINS); data = g_slice_new (WindowData); @@ -661,7 +661,7 @@ impl_activate (PlumaPlugin *plugin, free_window_data); msg = soup_message_new ("GET", PLUMA_URL); - + soup_session_queue_message (PLUMA_CHECK_UPDATE_PLUGIN (plugin)->priv->session, msg, (SoupSessionCallback)parse_page_version, window); @@ -673,9 +673,9 @@ impl_deactivate (PlumaPlugin *plugin, { pluma_debug (DEBUG_PLUGINS); - + soup_session_abort (PLUMA_CHECK_UPDATE_PLUGIN (plugin)->priv->session); - + g_object_set_data (G_OBJECT (window), WINDOW_DATA_KEY, NULL); @@ -686,7 +686,7 @@ pluma_check_update_plugin_class_init (PlumaCheckUpdatePluginClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); PlumaPluginClass *plugin_class = PLUMA_PLUGIN_CLASS (klass); - + g_type_class_add_private (object_class, sizeof (PlumaCheckUpdatePluginPrivate)); object_class->finalize = pluma_check_update_plugin_finalize; diff --git a/plugins/checkupdate/pluma-check-update.schemas.in b/plugins/checkupdate/pluma-check-update.schemas.in index 5d4d009a..2db4d56a 100755 --- a/plugins/checkupdate/pluma-check-update.schemas.in +++ b/plugins/checkupdate/pluma-check-update.schemas.in @@ -1,8 +1,8 @@ - /schemas/apps/pluma-2/plugins/checkupdate/ignore_version - /apps/pluma-2/plugins/checkupdate/ignore_version + /schemas/apps/pluma/plugins/checkupdate/ignore_version + /apps/pluma/plugins/checkupdate/ignore_version pluma string diff --git a/plugins/externaltools/tools/library.py b/plugins/externaltools/tools/library.py index e3dc624c..039e0a50 100755 --- a/plugins/externaltools/tools/library.py +++ b/plugins/externaltools/tools/library.py @@ -35,13 +35,13 @@ class Singleton(object): class ToolLibrary(Singleton): def __init_once__(self): self.locations = [] - + def set_locations(self, datadir): self.locations = [] if platform.platform() != 'Windows': for d in self.get_xdg_data_dirs(): - self.locations.append(os.path.join(d, 'pluma-2', 'plugins', 'externaltools', 'tools')) + self.locations.append(os.path.join(d, 'pluma', 'plugins', 'externaltools', 'tools')) self.locations.append(datadir) @@ -53,7 +53,7 @@ class ToolLibrary(Singleton): if userdir: toolsdir = os.path.join(userdir, 'pluma/tools') else: - toolsdir = os.path.expanduser('~/.mate2/pluma/tools') + toolsdir = os.path.expanduser('~/.config/pluma/tools') self.locations.insert(0, toolsdir); @@ -82,7 +82,7 @@ class ToolLibrary(Singleton): if userdir: filename = os.path.join(userdir, 'pluma/pluma-tools.xml') else: - filename = os.path.expanduser('~/.mate2/pluma/pluma-tools.xml') + filename = os.path.expanduser('~/.config/pluma/pluma-tools.xml') if not os.path.isfile(filename): return @@ -226,7 +226,7 @@ class Tool(object): return [] else: return map(lambda x: x.strip(), value.split(',')) - + def _from_list(self, value): return ','.join(value) @@ -266,7 +266,7 @@ class Tool(object): break fp.close() self.changed = False - + def _set_property_if_changed(self, key, value): if value != self._properties.get(key): self._properties[key] = value @@ -350,7 +350,7 @@ class Tool(object): def set_save_files(self, value): self._set_property_if_changed('Save-files', value) save_files = property(get_save_files, set_save_files) - + def get_languages(self): languages = self._properties.get('Languages') if languages: return languages @@ -371,7 +371,7 @@ class Tool(object): for line in fp: if line.strip() == '': continue - + return line.startswith('#!') # There is no property for this one because this function is quite @@ -417,7 +417,7 @@ class Tool(object): def save_with_script(self, script): filename = self.library.get_full_path(self.filename, 'w') - + fp = open(filename, 'w', 1) # Make sure to first print header (shebang, modeline), then @@ -429,7 +429,7 @@ class Tool(object): # Parse for line in script: line = line.rstrip("\n") - + if not inheader: content.append(line) elif line.startswith('#!'): @@ -444,10 +444,10 @@ class Tool(object): # Write out header for line in header: fp.write(line + "\n") - + fp.write(self._dump_properties()) fp.write("\n") - + for line in content: fp.write(line + "\n") diff --git a/plugins/filebrowser/pluma-file-browser-plugin.c b/plugins/filebrowser/pluma-file-browser-plugin.c index b9ac96d3..bb00133c 100755 --- a/plugins/filebrowser/pluma-file-browser-plugin.c +++ b/plugins/filebrowser/pluma-file-browser-plugin.c @@ -1,5 +1,5 @@ /* - * pluma-file-browser-plugin.c - Pluma plugin providing easy file access + * pluma-file-browser-plugin.c - Pluma plugin providing easy file access * from the sidepanel * * Copyright (C) 2006 - Jesse van den Kieboom @@ -40,7 +40,7 @@ #include "pluma-file-browser-messages.h" #define WINDOW_DATA_KEY "PlumaFileBrowserPluginWindowData" -#define FILE_BROWSER_BASE_KEY "/apps/pluma-2/plugins/filebrowser" +#define FILE_BROWSER_BASE_KEY "/apps/pluma/plugins/filebrowser" #define CAJA_CLICK_POLICY_BASE_KEY "/apps/caja/preferences" #define CAJA_CLICK_POLICY_KEY "click_policy" #define CAJA_ENABLE_DELETE_KEY "enable_delete" @@ -49,12 +49,12 @@ #define PLUMA_FILE_BROWSER_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), PLUMA_TYPE_FILE_BROWSER_PLUGIN, PlumaFileBrowserPluginPrivate)) -struct _PlumaFileBrowserPluginPrivate +struct _PlumaFileBrowserPluginPrivate { gpointer dummy; }; -typedef struct _PlumaFileBrowserPluginData +typedef struct _PlumaFileBrowserPluginData { PlumaFileBrowserWidget * tree_widget; gulong merge_id; @@ -70,11 +70,11 @@ typedef struct _PlumaFileBrowserPluginData } PlumaFileBrowserPluginData; static void on_uri_activated_cb (PlumaFileBrowserWidget * widget, - gchar const *uri, + gchar const *uri, PlumaWindow * window); static void on_error_cb (PlumaFileBrowserWidget * widget, guint code, - gchar const *message, + gchar const *message, PlumaWindow * window); static void on_model_set_cb (PlumaFileBrowserView * widget, GParamSpec *arg1, @@ -122,7 +122,7 @@ static void filetree_plugin_finalize (GObject * object) { //PlumaFileBrowserPlugin * plugin = PLUMA_FILE_BROWSER_PLUGIN (object); - + G_OBJECT_CLASS (filetree_plugin_parent_class)->finalize (object); } @@ -132,7 +132,7 @@ get_plugin_data (PlumaWindow * window) return (PlumaFileBrowserPluginData *) (g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY)); } -static void +static void on_end_loading_cb (PlumaFileBrowserStore * store, GtkTreeIter * iter, PlumaFileBrowserPluginData * data) @@ -157,13 +157,13 @@ prepare_auto_root (PlumaFileBrowserPluginData *data) data->end_loading_handle = 0; } - data->end_loading_handle = g_signal_connect (store, + data->end_loading_handle = g_signal_connect (store, "end-loading", G_CALLBACK (on_end_loading_cb), data); } -static void +static void restore_default_location (PlumaFileBrowserPluginData *data) { gchar * root; @@ -185,12 +185,12 @@ restore_default_location (PlumaFileBrowserPluginData *data) pluma_file_browser_widget_show_bookmarks (data->tree_widget); return; } - - root = mateconf_client_get_string (client, - FILE_BROWSER_BASE_KEY "/on_load/root", + + root = mateconf_client_get_string (client, + FILE_BROWSER_BASE_KEY "/on_load/root", NULL); - virtual_root = mateconf_client_get_string (client, - FILE_BROWSER_BASE_KEY "/on_load/virtual_root", + virtual_root = mateconf_client_get_string (client, + FILE_BROWSER_BASE_KEY "/on_load/virtual_root", NULL); remote = mateconf_client_get_bool (client, @@ -205,7 +205,7 @@ restore_default_location (PlumaFileBrowserPluginData *data) if (remote || g_file_is_native (file)) { if (virtual_root != NULL && *virtual_root != '\0') { prepare_auto_root (data); - pluma_file_browser_widget_set_root_and_virtual_root (data->tree_widget, + pluma_file_browser_widget_set_root_and_virtual_root (data->tree_widget, root, virtual_root); } else { @@ -225,7 +225,7 @@ restore_default_location (PlumaFileBrowserPluginData *data) } static void -restore_filter (PlumaFileBrowserPluginData * data) +restore_filter (PlumaFileBrowserPluginData * data) { MateConfClient * client; gchar *filter_mode; @@ -240,10 +240,10 @@ restore_filter (PlumaFileBrowserPluginData * data) filter_mode = mateconf_client_get_string (client, FILE_BROWSER_BASE_KEY "/filter_mode", NULL); - + /* Filter mode */ mode = pluma_file_browser_store_filter_mode_get_default (); - + if (filter_mode != NULL) { if (strcmp (filter_mode, "hidden") == 0) { mode = PLUMA_FILE_BROWSER_STORE_FILTER_MODE_HIDE_HIDDEN; @@ -253,12 +253,12 @@ restore_filter (PlumaFileBrowserPluginData * data) strcmp (filter_mode, "binary_and_hidden") == 0) { mode = PLUMA_FILE_BROWSER_STORE_FILTER_MODE_HIDE_HIDDEN | PLUMA_FILE_BROWSER_STORE_FILTER_MODE_HIDE_BINARY; - } else if (strcmp (filter_mode, "none") == 0 || + } else if (strcmp (filter_mode, "none") == 0 || *filter_mode == '\0') { mode = PLUMA_FILE_BROWSER_STORE_FILTER_MODE_NONE; } } - + /* Set the filter mode */ pluma_file_browser_store_set_filter_mode ( pluma_file_browser_widget_get_browser_store (data->tree_widget), @@ -268,7 +268,7 @@ restore_filter (PlumaFileBrowserPluginData * data) FILE_BROWSER_BASE_KEY "/filter_pattern", NULL); - pluma_file_browser_widget_set_filter_pattern (data->tree_widget, + pluma_file_browser_widget_set_filter_pattern (data->tree_widget, pattern); g_object_unref (client); @@ -297,17 +297,17 @@ on_click_policy_changed (MateConfClient *client, PlumaFileBrowserViewClickPolicy policy = PLUMA_FILE_BROWSER_VIEW_CLICK_POLICY_DOUBLE; PlumaFileBrowserView *view; - data = (PlumaFileBrowserPluginData *)(user_data); + data = (PlumaFileBrowserPluginData *)(user_data); value = mateconf_entry_get_value (entry); - + if (value && value->type == MATECONF_VALUE_STRING) { click_policy = mateconf_value_get_string (value); - + policy = click_policy_from_string (click_policy); } - + view = pluma_file_browser_widget_get_browser_view (data->tree_widget); - pluma_file_browser_view_set_click_policy (view, policy); + pluma_file_browser_view_set_click_policy (view, policy); } static void @@ -320,9 +320,9 @@ on_enable_delete_changed (MateConfClient *client, PlumaFileBrowserPluginData *data; gboolean enable = FALSE; - data = (PlumaFileBrowserPluginData *)(user_data); + data = (PlumaFileBrowserPluginData *)(user_data); value = mateconf_entry_get_value (entry); - + if (value && value->type == MATECONF_VALUE_BOOL) enable = mateconf_value_get_bool (value); @@ -339,9 +339,9 @@ on_confirm_trash_changed (MateConfClient *client, PlumaFileBrowserPluginData *data; gboolean enable = FALSE; - data = (PlumaFileBrowserPluginData *)(user_data); + data = (PlumaFileBrowserPluginData *)(user_data); value = mateconf_entry_get_value (entry); - + if (value && value->type == MATECONF_VALUE_BOOL) enable = mateconf_value_get_bool (value); @@ -361,7 +361,7 @@ install_caja_prefs (PlumaFileBrowserPluginData *data) if (!client) return; - mateconf_client_add_dir (client, + mateconf_client_add_dir (client, CAJA_CLICK_POLICY_BASE_KEY, MATECONF_CLIENT_PRELOAD_NONE, NULL); @@ -377,8 +377,8 @@ install_caja_prefs (PlumaFileBrowserPluginData *data) pluma_file_browser_view_set_click_policy (view, policy); if (pref) { - data->click_policy_handle = - mateconf_client_notify_add (client, + data->click_policy_handle = + mateconf_client_notify_add (client, CAJA_CLICK_POLICY_BASE_KEY "/" CAJA_CLICK_POLICY_KEY, on_click_policy_changed, data, @@ -386,16 +386,16 @@ install_caja_prefs (PlumaFileBrowserPluginData *data) NULL); g_free (pref); } - + /* Get enable_delete */ prefb = mateconf_client_get_bool (client, CAJA_CLICK_POLICY_BASE_KEY "/" CAJA_ENABLE_DELETE_KEY, NULL); - + g_object_set (G_OBJECT (data->tree_widget), "enable-delete", prefb, NULL); - data->enable_delete_handle = - mateconf_client_notify_add (client, + data->enable_delete_handle = + mateconf_client_notify_add (client, CAJA_CLICK_POLICY_BASE_KEY "/" CAJA_ENABLE_DELETE_KEY, on_enable_delete_changed, data, @@ -406,11 +406,11 @@ install_caja_prefs (PlumaFileBrowserPluginData *data) prefb = mateconf_client_get_bool (client, CAJA_CLICK_POLICY_BASE_KEY "/" CAJA_CONFIRM_TRASH_KEY, NULL); - + data->confirm_trash = prefb; - data->confirm_trash_handle = - mateconf_client_notify_add (client, + data->confirm_trash_handle = + mateconf_client_notify_add (client, CAJA_CLICK_POLICY_BASE_KEY "/" CAJA_CONFIRM_TRASH_KEY, on_confirm_trash_changed, data, @@ -458,7 +458,7 @@ on_action_set_active_root (GtkAction * action, PlumaFileBrowserPluginData *data; data = get_plugin_data (window); - set_root_from_doc (data, + set_root_from_doc (data, pluma_window_get_active_document (window)); } @@ -499,7 +499,7 @@ on_action_open_terminal (GtkAction * action, GtkTreeIter iter; PlumaFileBrowserStore * store; - + data = get_plugin_data (window); /* Get the current directory */ @@ -507,33 +507,33 @@ on_action_open_terminal (GtkAction * action, return; store = pluma_file_browser_widget_get_browser_store (data->tree_widget); - gtk_tree_model_get (GTK_TREE_MODEL (store), + gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, PLUMA_FILE_BROWSER_STORE_COLUMN_URI, &wd, -1); - + if (wd == NULL) return; terminal = get_terminal (); - + file = g_file_new_for_uri (wd); local = g_file_get_path (file); g_object_unref (file); argv[0] = terminal; argv[1] = NULL; - - g_spawn_async (local, - argv, - NULL, - G_SPAWN_SEARCH_PATH, + + g_spawn_async (local, + argv, + NULL, + G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); - + g_free (terminal); g_free (wd); g_free (local); @@ -551,18 +551,18 @@ on_selection_changed_cb (GtkTreeSelection *selection, gchar * uri; data = get_plugin_data (window); - + tree_view = GTK_TREE_VIEW (pluma_file_browser_widget_get_browser_view (data->tree_widget)); model = gtk_tree_view_get_model (tree_view); - + if (!PLUMA_IS_FILE_BROWSER_STORE (model)) return; - + sensitive = pluma_file_browser_widget_get_selected_directory (data->tree_widget, &iter); if (sensitive) { - gtk_tree_model_get (model, &iter, - PLUMA_FILE_BROWSER_STORE_COLUMN_URI, + gtk_tree_model_get (model, &iter, + PLUMA_FILE_BROWSER_STORE_COLUMN_URI, &uri, -1); sensitive = pluma_utils_uri_has_file_scheme (uri); @@ -570,7 +570,7 @@ on_selection_changed_cb (GtkTreeSelection *selection, } gtk_action_set_sensitive ( - gtk_action_group_get_action (data->single_selection_action_group, + gtk_action_group_get_action (data->single_selection_action_group, "OpenTerminal"), sensitive); } @@ -592,7 +592,7 @@ on_selection_changed_cb (GtkTreeSelection *selection, " " \ "" -static GtkActionEntry extra_actions[] = +static GtkActionEntry extra_actions[] = { {"SetActiveRoot", GTK_STOCK_JUMP_TO, N_("_Set root to active document"), NULL, @@ -636,9 +636,9 @@ add_popup_ui (PlumaWindow * window) gtk_ui_manager_insert_action_group (manager, action_group, 0); data->single_selection_action_group = action_group; - data->merge_id = gtk_ui_manager_add_ui_from_string (manager, - POPUP_UI, - -1, + data->merge_id = gtk_ui_manager_add_ui_from_string (manager, + POPUP_UI, + -1, &error); if (data->merge_id == 0) { @@ -652,11 +652,11 @@ remove_popup_ui (PlumaWindow * window) { PlumaFileBrowserPluginData * data; GtkUIManager * manager; - + data = get_plugin_data (window); manager = pluma_file_browser_widget_get_ui_manager (data->tree_widget); gtk_ui_manager_remove_ui (manager, data->merge_id); - + gtk_ui_manager_remove_action_group (manager, data->action_group); g_object_unref (data->action_group); @@ -665,18 +665,18 @@ remove_popup_ui (PlumaWindow * window) } static void -impl_updateui (PlumaPlugin * plugin, PlumaWindow * window) +impl_updateui (PlumaPlugin * plugin, PlumaWindow * window) { PlumaFileBrowserPluginData * data; PlumaDocument * doc; - + data = get_plugin_data (window); - + doc = pluma_window_get_active_document (window); - - gtk_action_set_sensitive (gtk_action_group_get_action (data->action_group, + + gtk_action_set_sensitive (gtk_action_group_get_action (data->action_group, "SetActiveRoot"), - doc != NULL && + doc != NULL && !pluma_document_is_untitled (doc)); } @@ -691,7 +691,7 @@ impl_activate (PlumaPlugin * plugin, PlumaWindow * window) gchar *data_dir; data = g_new0 (PlumaFileBrowserPluginData, 1); - + data_dir = pluma_plugin_get_data_dir (plugin); data->tree_widget = PLUMA_FILE_BROWSER_WIDGET (pluma_file_browser_widget_new (data_dir)); g_free (data_dir); @@ -718,17 +718,17 @@ impl_activate (PlumaPlugin * plugin, PlumaWindow * window) G_CALLBACK (on_confirm_no_trash_cb), window); - g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW - (pluma_file_browser_widget_get_browser_view + g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW + (pluma_file_browser_widget_get_browser_view (data->tree_widget))), "changed", G_CALLBACK (on_selection_changed_cb), - window); + window); panel = pluma_window_get_side_panel (window); - pixbuf = pluma_file_browser_utils_pixbuf_from_theme("system-file-manager", + pixbuf = pluma_file_browser_utils_pixbuf_from_theme("system-file-manager", GTK_ICON_SIZE_MENU); - + if (pixbuf) { image = gtk_image_new_from_pixbuf(pixbuf); g_object_unref(pixbuf); @@ -748,10 +748,10 @@ impl_activate (PlumaPlugin * plugin, PlumaWindow * window) /* Restore filter options */ restore_filter (data); - + /* Install caja preferences */ install_caja_prefs (data); - + /* Connect signals to store the last visited location */ g_signal_connect (pluma_file_browser_widget_get_browser_view (data->tree_widget), "notify::model", @@ -778,7 +778,7 @@ impl_activate (PlumaPlugin * plugin, PlumaWindow * window) "tab-added", G_CALLBACK (on_tab_added_cb), data); - + /* Register messages on the bus */ pluma_file_browser_messages_register (window, data->tree_widget); @@ -798,13 +798,13 @@ impl_deactivate (PlumaPlugin * plugin, PlumaWindow * window) pluma_file_browser_messages_unregister (window); /* Disconnect signals */ - g_signal_handlers_disconnect_by_func (window, + g_signal_handlers_disconnect_by_func (window, G_CALLBACK (on_tab_added_cb), data); client = mateconf_client_get_default (); mateconf_client_remove_dir (client, CAJA_CLICK_POLICY_BASE_KEY, NULL); - + if (data->click_policy_handle) mateconf_client_notify_remove (client, data->click_policy_handle); @@ -855,12 +855,12 @@ on_error_cb (PlumaFileBrowserWidget * tree_widget, gchar * title; GtkWidget * dlg; PlumaFileBrowserPluginData * data; - + data = get_plugin_data (window); - + /* Do not show the error when the root has been set automatically */ if (data->auto_root && (code == PLUMA_FILE_BROWSER_ERROR_SET_ROOT || - code == PLUMA_FILE_BROWSER_ERROR_LOAD_DIRECTORY)) + code == PLUMA_FILE_BROWSER_ERROR_LOAD_DIRECTORY)) { /* Show bookmarks */ pluma_file_browser_widget_show_bookmarks (data->tree_widget); @@ -895,7 +895,7 @@ on_error_cb (PlumaFileBrowserWidget * tree_widget, _("An error occurred while setting a root directory"); break; case PLUMA_FILE_BROWSER_ERROR_LOAD_DIRECTORY: - title = + title = _("An error occurred while loading a directory"); break; default: @@ -915,7 +915,7 @@ on_error_cb (PlumaFileBrowserWidget * tree_widget, gtk_widget_destroy (dlg); } -static void +static void on_model_set_cb (PlumaFileBrowserView * widget, GParamSpec *arg1, PlumaWindow * window) @@ -925,10 +925,10 @@ on_model_set_cb (PlumaFileBrowserView * widget, MateConfClient * client; model = gtk_tree_view_get_model (GTK_TREE_VIEW (pluma_file_browser_widget_get_browser_view (data->tree_widget))); - + if (model == NULL) return; - + client = mateconf_client_get_default (); mateconf_client_set_bool (client, FILE_BROWSER_BASE_KEY "/on_load/tree_view", @@ -937,7 +937,7 @@ on_model_set_cb (PlumaFileBrowserView * widget, g_object_unref (client); } -static void +static void on_filter_mode_changed_cb (PlumaFileBrowserStore * model, GParamSpec * param, PlumaWindow * window) @@ -946,12 +946,12 @@ on_filter_mode_changed_cb (PlumaFileBrowserStore * model, PlumaFileBrowserStoreFilterMode mode; client = mateconf_client_get_default (); - + if (!client) return; - + mode = pluma_file_browser_store_get_filter_mode (model); - + if ((mode & PLUMA_FILE_BROWSER_STORE_FILTER_MODE_HIDE_HIDDEN) && (mode & PLUMA_FILE_BROWSER_STORE_FILTER_MODE_HIDE_BINARY)) { mateconf_client_set_string (client, @@ -962,7 +962,7 @@ on_filter_mode_changed_cb (PlumaFileBrowserStore * model, mateconf_client_set_string (client, FILE_BROWSER_BASE_KEY "/filter_mode", "hidden", - NULL); + NULL); } else if (mode & PLUMA_FILE_BROWSER_STORE_FILTER_MODE_HIDE_BINARY) { mateconf_client_set_string (client, FILE_BROWSER_BASE_KEY "/filter_mode", @@ -974,9 +974,9 @@ on_filter_mode_changed_cb (PlumaFileBrowserStore * model, "none", NULL); } - + g_object_unref (client); - + } static void @@ -993,21 +993,21 @@ on_rename_cb (PlumaFileBrowserStore * store, GFile * oldfile; GFile * newfile; gchar * uri; - + /* Find all documents and set its uri to newuri where it matches olduri */ app = pluma_app_get_default (); documents = pluma_app_get_documents (app); - + oldfile = g_file_new_for_uri (olduri); newfile = g_file_new_for_uri (newuri); - + for (item = documents; item; item = item->next) { doc = PLUMA_DOCUMENT (item->data); uri = pluma_document_get_uri (doc); - + if (!uri) continue; - + docfile = g_file_new_for_uri (uri); if (g_file_equal (docfile, oldfile)) { @@ -1043,7 +1043,7 @@ on_rename_cb (PlumaFileBrowserStore * store, g_list_free (documents); } -static void +static void on_filter_pattern_changed_cb (PlumaFileBrowserWidget * widget, GParamSpec * param, PlumaWindow * window) @@ -1052,12 +1052,12 @@ on_filter_pattern_changed_cb (PlumaFileBrowserWidget * widget, gchar * pattern; client = mateconf_client_get_default (); - + if (!client) return; - + g_object_get (G_OBJECT (widget), "filter-pattern", &pattern, NULL); - + if (pattern == NULL) mateconf_client_set_string (client, FILE_BROWSER_BASE_KEY "/filter_pattern", @@ -1072,10 +1072,10 @@ on_filter_pattern_changed_cb (PlumaFileBrowserWidget * widget, g_free (pattern); } -static void +static void on_virtual_root_changed_cb (PlumaFileBrowserStore * store, GParamSpec * param, - PlumaWindow * window) + PlumaWindow * window) { PlumaFileBrowserPluginData * data = get_plugin_data (window); gchar * root; @@ -1083,12 +1083,12 @@ on_virtual_root_changed_cb (PlumaFileBrowserStore * store, MateConfClient * client; root = pluma_file_browser_store_get_root (store); - + if (!root) return; client = mateconf_client_get_default (); - + if (!client) return; @@ -1096,7 +1096,7 @@ on_virtual_root_changed_cb (PlumaFileBrowserStore * store, FILE_BROWSER_BASE_KEY "/on_load/root", root, NULL); - + virtual_root = pluma_file_browser_store_get_virtual_root (store); if (!virtual_root) { @@ -1105,14 +1105,14 @@ on_virtual_root_changed_cb (PlumaFileBrowserStore * store, FILE_BROWSER_BASE_KEY "/on_load/virtual_root", root, NULL); - } else { + } else { mateconf_client_set_string (client, FILE_BROWSER_BASE_KEY "/on_load/virtual_root", virtual_root, - NULL); + NULL); } - g_signal_handlers_disconnect_by_func (window, + g_signal_handlers_disconnect_by_func (window, G_CALLBACK (on_tab_added_cb), data); @@ -1121,7 +1121,7 @@ on_virtual_root_changed_cb (PlumaFileBrowserStore * store, g_free (virtual_root); } -static void +static void on_tab_added_cb (PlumaWindow * window, PlumaTab * tab, PlumaFileBrowserPluginData * data) @@ -1162,7 +1162,7 @@ on_tab_added_cb (PlumaWindow * window, g_object_unref (client); /* Disconnect this signal, it's only called once */ - g_signal_handlers_disconnect_by_func (window, + g_signal_handlers_disconnect_by_func (window, G_CALLBACK (on_tab_added_cb), data); } @@ -1177,7 +1177,7 @@ get_filename_from_path (GtkTreeModel *model, GtkTreePath *path) gtk_tree_model_get (model, &iter, PLUMA_FILE_BROWSER_STORE_COLUMN_URI, &uri, -1); - + return pluma_file_browser_utils_uri_basename (uri); } @@ -1202,10 +1202,10 @@ on_confirm_no_trash_cb (PlumaFileBrowserWidget * widget, } result = pluma_file_browser_utils_confirmation_dialog (window, - GTK_MESSAGE_QUESTION, - message, - secondary, - GTK_STOCK_DELETE, + GTK_MESSAGE_QUESTION, + message, + secondary, + GTK_STOCK_DELETE, NULL); g_free (secondary); @@ -1240,10 +1240,10 @@ on_confirm_delete_cb (PlumaFileBrowserWidget *widget, secondary = _("If you delete an item, it is permanently lost."); result = pluma_file_browser_utils_confirmation_dialog (window, - GTK_MESSAGE_QUESTION, - message, - secondary, - GTK_STOCK_DELETE, + GTK_MESSAGE_QUESTION, + message, + secondary, + GTK_STOCK_DELETE, NULL); g_free (message); diff --git a/plugins/filebrowser/pluma-file-browser.schemas.in b/plugins/filebrowser/pluma-file-browser.schemas.in index 0ae807d6..f27a75f4 100755 --- a/plugins/filebrowser/pluma-file-browser.schemas.in +++ b/plugins/filebrowser/pluma-file-browser.schemas.in @@ -1,8 +1,8 @@ - /schemas/apps/pluma-2/plugins/filebrowser/on_load/tree_view - /apps/pluma-2/plugins/filebrowser/on_load/tree_view + /schemas/apps/pluma/plugins/filebrowser/on_load/tree_view + /apps/pluma/plugins/filebrowser/on_load/tree_view pluma bool TRUE @@ -13,35 +13,35 @@ - /schemas/apps/pluma-2/plugins/filebrowser/on_load/root - /apps/pluma-2/plugins/filebrowser/on_load/root + /schemas/apps/pluma/plugins/filebrowser/on_load/root + /apps/pluma/plugins/filebrowser/on_load/root pluma string File Browser Root Directory - The file browser root directory to use when loading the file + The file browser root directory to use when loading the file browser plugin and onload/tree_view is TRUE. - /schemas/apps/pluma-2/plugins/filebrowser/on_load/virtual_root - /apps/pluma-2/plugins/filebrowser/on_load/virtual_root + /schemas/apps/pluma/plugins/filebrowser/on_load/virtual_root + /apps/pluma/plugins/filebrowser/on_load/virtual_root pluma string File Browser Virtual Root Directory - The file browser virtual root directory to use when loading the + The file browser virtual root directory to use when loading the file browser plugin when onload/tree_view is TRUE. The virtual root must always be below the actual root. - + - /schemas/apps/pluma-2/plugins/filebrowser/on_load/enable_remote - /apps/pluma-2/plugins/filebrowser/on_load/enable_remote + /schemas/apps/pluma/plugins/filebrowser/on_load/enable_remote + /apps/pluma/plugins/filebrowser/on_load/enable_remote pluma bool FALSE @@ -52,14 +52,14 @@ - /schemas/apps/pluma-2/plugins/filebrowser/open_at_first_doc - /apps/pluma-2/plugins/filebrowser/open_at_first_doc + /schemas/apps/pluma/plugins/filebrowser/open_at_first_doc + /apps/pluma/plugins/filebrowser/open_at_first_doc pluma bool TRUE Set Location to First Document - If TRUE the file browser plugin will view the directory of + If TRUE the file browser plugin will view the directory of the first opened document given that the file browser hasn't been used yet. (Thus this generally applies to opening a document from the command line or opening it with Caja, etc.) @@ -67,23 +67,23 @@ - /schemas/apps/pluma-2/plugins/filebrowser/filter_mode - /apps/pluma-2/plugins/filebrowser/filter_mode + /schemas/apps/pluma/plugins/filebrowser/filter_mode + /apps/pluma/plugins/filebrowser/filter_mode pluma string hidden_and_binary File Browser Filter Mode This value determines what files get filtered from the file - browser. Valid values are: none (filter nothing), - hidden (filter hidden files), binary (filter binary files) and + browser. Valid values are: none (filter nothing), + hidden (filter hidden files), binary (filter binary files) and hidden_and_binary (filter both hidden and binary files). - /schemas/apps/pluma-2/plugins/filebrowser/filter_pattern - /apps/pluma-2/plugins/filebrowser/filter_pattern + /schemas/apps/pluma/plugins/filebrowser/filter_pattern + /apps/pluma/plugins/filebrowser/filter_pattern pluma string diff --git a/plugins/pythonconsole/pythonconsole/config.py b/plugins/pythonconsole/pythonconsole/config.py index ac0e599c..d3f42158 100755 --- a/plugins/pythonconsole/pythonconsole/config.py +++ b/plugins/pythonconsole/pythonconsole/config.py @@ -8,7 +8,7 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -29,7 +29,7 @@ import gtk __all__ = ('PythonConsoleConfig', 'PythonConsoleConfigDialog') -MATECONF_KEY_BASE = '/apps/pluma-2/plugins/pythonconsole' +MATECONF_KEY_BASE = '/apps/pluma/plugins/pythonconsole' MATECONF_KEY_COMMAND_COLOR = MATECONF_KEY_BASE + '/command-color' MATECONF_KEY_ERROR_COLOR = MATECONF_KEY_BASE + '/error-color' @@ -99,16 +99,16 @@ class PythonConsoleConfigDialog(object): self.config.color_command) self.set_colorbutton_color(self._ui.get_object('colorbutton-error'), self.config.color_error) - + self._ui.connect_signals(self) - + self._dialog = self._ui.get_object('dialog-config') self._dialog.show_all() else: self._dialog.present() - + return self._dialog - + @staticmethod def set_colorbutton_color(colorbutton, value): try: @@ -124,7 +124,7 @@ class PythonConsoleConfigDialog(object): def on_dialog_config_destroy(self, dialog): self._dialog = None self._ui = None - + def on_colorbutton_command_color_set(self, colorbutton): self.config.color_command = colorbutton.get_color().to_string() diff --git a/plugins/snippets/snippets/__init__.py b/plugins/snippets/snippets/__init__.py index 609e3c0c..e74ecd28 100755 --- a/plugins/snippets/snippets/__init__.py +++ b/plugins/snippets/snippets/__init__.py @@ -20,7 +20,7 @@ import os import shutil import gtk -from gtk import gdk +from gtk import gdk import pluma import platform @@ -34,7 +34,7 @@ class SnippetsPlugin(pluma.Plugin): pluma.Plugin.__init__(self) self.dlg = None - + library = Library() library.set_accelerator_callback(self.accelerator_activated) @@ -45,7 +45,7 @@ class SnippetsPlugin(pluma.Plugin): if userdir: snippetsdir = os.path.join(userdir, 'pluma/snippets') else: - snippetsdir = os.path.expanduser('~/.mate2/pluma/snippets') + snippetsdir = os.path.expanduser('~/.config/pluma/snippets') library.set_dirs(snippetsdir, self.system_dirs()) @@ -55,18 +55,18 @@ class SnippetsPlugin(pluma.Plugin): datadirs = os.environ['XDG_DATA_DIRS'] else: datadirs = '/usr/local/share' + os.pathsep + '/usr/share' - + dirs = [] - + for d in datadirs.split(os.pathsep): - d = os.path.join(d, 'pluma-2', 'plugins', 'snippets') - + d = os.path.join(d, 'pluma', 'plugins', 'snippets') + if os.path.isdir(d): dirs.append(d) - + dirs.append(self.get_data_dir()) return dirs - + def activate(self, window): data = WindowHelper(self) window._snippets_plugin_data = data @@ -75,23 +75,23 @@ class SnippetsPlugin(pluma.Plugin): def deactivate(self, window): window._snippets_plugin_data.stop() window._snippets_plugin_data = None - + def update_ui(self, window): window._snippets_plugin_data.update() - + def create_configure_dialog(self): if not self.dlg: self.dlg = Manager(self.get_data_dir()) else: self.dlg.run() - + window = pluma.app_get_default().get_active_window() - + if window: self.dlg.dlg.set_transient_for(window) - + return self.dlg.dlg - + def accelerator_activated(self, group, obj, keyval, mod): ret = False diff --git a/plugins/sort/pluma-sort-plugin.c b/plugins/sort/pluma-sort-plugin.c index e1e5cf5e..0e21674a 100755 --- a/plugins/sort/pluma-sort-plugin.c +++ b/plugins/sort/pluma-sort-plugin.c @@ -1,6 +1,6 @@ /* * pluma-sort-plugin.c - * + * * Original author: Carlo Borreo * Ported to Pluma2 by Lee Mallabone * @@ -8,7 +8,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2, or (at your option) * any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -38,7 +38,7 @@ #define PLUMA_SORT_PLUGIN_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), PLUMA_TYPE_SORT_PLUGIN, PlumaSortPluginPrivate)) /* Key in case the plugin ever needs any settings. */ -#define SORT_BASE_KEY "/apps/pluma-2/plugins/sort" +#define SORT_BASE_KEY "/apps/pluma/plugins/sort" #define WINDOW_DATA_KEY "PlumaSortPluginWindowData" #define MENU_PATH "/MenuBar/EditMenu/EditOps_6" @@ -232,7 +232,7 @@ sort_cb (GtkAction *action, gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog), GTK_WINDOW (action_data->window)); - + gtk_window_set_modal (GTK_WINDOW (dialog->dialog), TRUE); @@ -488,7 +488,7 @@ impl_activate (PlumaPlugin *plugin, manager = pluma_window_get_ui_manager (window); data->ui_action_group = gtk_action_group_new ("PlumaSortPluginActions"); - gtk_action_group_set_translation_domain (data->ui_action_group, + gtk_action_group_set_translation_domain (data->ui_action_group, GETTEXT_PACKAGE); gtk_action_group_add_actions_full (data->ui_action_group, action_entries, @@ -502,17 +502,17 @@ impl_activate (PlumaPlugin *plugin, data->ui_id = gtk_ui_manager_new_merge_id (manager); - g_object_set_data_full (G_OBJECT (window), - WINDOW_DATA_KEY, + g_object_set_data_full (G_OBJECT (window), + WINDOW_DATA_KEY, data, (GDestroyNotify) free_window_data); - gtk_ui_manager_add_ui (manager, - data->ui_id, + gtk_ui_manager_add_ui (manager, + data->ui_id, MENU_PATH, - "Sort", "Sort", - GTK_UI_MANAGER_MENUITEM, + "Sort", + GTK_UI_MANAGER_MENUITEM, FALSE); update_ui_real (window, diff --git a/plugins/taglist/pluma-taglist-plugin-parser.c b/plugins/taglist/pluma-taglist-plugin-parser.c index bc7767d0..6f50da7b 100755 --- a/plugins/taglist/pluma-taglist-plugin-parser.c +++ b/plugins/taglist/pluma-taglist-plugin-parser.c @@ -2,7 +2,7 @@ * pluma-taglist-plugin-parser.c * This file is part of pluma * - * Copyright (C) 2002-2005 - Paolo Maggi + * Copyright (C) 2002-2005 - Paolo Maggi * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,14 +16,14 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. */ - + /* - * Modified by the pluma Team, 2002-2005. See the AUTHORS file for a - * list of people on the pluma Team. - * See the ChangeLog files for a list of changes. + * Modified by the pluma Team, 2002-2005. See the AUTHORS file for a + * list of people on the pluma Team. + * See the ChangeLog files for a list of changes. * * $Id$ */ @@ -44,19 +44,19 @@ #include "pluma-taglist-plugin-parser.h" /* we screwed up so we still look here for compatibility */ -#define USER_PLUMA_TAGLIST_PLUGIN_LOCATION_LEGACY ".pluma-2/plugins/taglist/" +#define USER_PLUMA_TAGLIST_PLUGIN_LOCATION_LEGACY ".pluma/plugins/taglist/" #define USER_PLUMA_TAGLIST_PLUGIN_LOCATION "pluma/taglist/" TagList *taglist = NULL; static gint taglist_ref_count = 0; static gboolean parse_tag (Tag *tag, xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur); -static gboolean parse_tag_group (TagGroup *tg, const gchar *fn, +static gboolean parse_tag_group (TagGroup *tg, const gchar *fn, xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, gboolean sort); -static TagGroup* get_tag_group (const gchar* filename, xmlDocPtr doc, +static TagGroup* get_tag_group (const gchar* filename, xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur); -static TagList* lookup_best_lang (TagList *taglist, const gchar *filename, +static TagList* lookup_best_lang (TagList *taglist, const gchar *filename, xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur); static TagList *parse_taglist_file (const gchar* filename); static TagList *parse_taglist_dir (const gchar *dir); @@ -65,19 +65,19 @@ static void free_tag (Tag *tag); static void free_tag_group (TagGroup *tag_group); static gboolean -parse_tag (Tag *tag, xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur) +parse_tag (Tag *tag, xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur) { /* pluma_debug_message (DEBUG_PLUGINS, " Tag name: %s", tag->name); */ /* We don't care what the top level element name is */ cur = cur->xmlChildrenNode; - - while (cur != NULL) + + while (cur != NULL) { if ((!xmlStrcmp (cur->name, (const xmlChar *)"Begin")) && (cur->ns == ns)) - { + { tag->begin = xmlNodeListGetString (doc, cur->xmlChildrenNode, 1); /* pluma_debug_message (DEBUG_PLUGINS, " - Begin: %s", tag->begin); @@ -85,7 +85,7 @@ parse_tag (Tag *tag, xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur) } if ((!xmlStrcmp (cur->name, (const xmlChar *)"End")) && - (cur->ns == ns)) + (cur->ns == ns)) { tag->end = xmlNodeListGetString (doc, cur->xmlChildrenNode, 1); /* @@ -107,26 +107,26 @@ tags_cmp (gconstpointer a, gconstpointer b) { gchar *tag_a = (gchar*)((Tag *)a)->name; gchar *tag_b = (gchar*)((Tag *)b)->name; - + return g_utf8_collate (tag_a, tag_b); } static gboolean -parse_tag_group (TagGroup *tg, const gchar* fn, xmlDocPtr doc, - xmlNsPtr ns, xmlNodePtr cur, gboolean sort) +parse_tag_group (TagGroup *tg, const gchar* fn, xmlDocPtr doc, + xmlNsPtr ns, xmlNodePtr cur, gboolean sort) { pluma_debug_message (DEBUG_PLUGINS, "Parse TagGroup: %s", tg->name); /* We don't care what the top level element name is */ cur = cur->xmlChildrenNode; - - while (cur != NULL) + + while (cur != NULL) { - if ((xmlStrcmp (cur->name, (const xmlChar *) "Tag")) || (cur->ns != ns)) + if ((xmlStrcmp (cur->name, (const xmlChar *) "Tag")) || (cur->ns != ns)) { g_warning ("The tag list file '%s' is of the wrong type, " "was '%s', 'Tag' expected.", fn, cur->name); - + return FALSE; } else @@ -160,30 +160,30 @@ parse_tag_group (TagGroup *tg, const gchar* fn, xmlDocPtr doc, { /* Error parsing Tag */ g_warning ("The tag list file '%s' is of the wrong type, " - "error parsing Tag '%s' in TagGroup '%s'.", + "error parsing Tag '%s' in TagGroup '%s'.", fn, tag->name, tg->name); - + free_tag (tag); - + return FALSE; } } } - cur = cur->next; + cur = cur->next; } if (sort) tg->tags = g_list_sort (tg->tags, tags_cmp); else - tg->tags = g_list_reverse (tg->tags); - + tg->tags = g_list_reverse (tg->tags); + return TRUE; } static TagGroup* -get_tag_group (const gchar* filename, xmlDocPtr doc, - xmlNsPtr ns, xmlNodePtr cur) +get_tag_group (const gchar* filename, xmlDocPtr doc, + xmlNsPtr ns, xmlNodePtr cur) { TagGroup *tag_group; xmlChar *sort_str; @@ -219,27 +219,27 @@ get_tag_group (const gchar* filename, xmlDocPtr doc, /* Name found */ gboolean exists = FALSE; GList *t = taglist->tag_groups; - + /* Check if the tag group already exists */ while (t && !exists) { gchar *tgn = (gchar*)((TagGroup*)(t->data))->name; - + if (strcmp (tgn, (gchar*)tag_group->name) == 0) { - pluma_debug_message (DEBUG_PLUGINS, + pluma_debug_message (DEBUG_PLUGINS, "Tag group '%s' already exists.", tgn); - + exists = TRUE; free_tag_group (tag_group); } - - t = g_list_next (t); + + t = g_list_next (t); } if (!exists) - { + { /* Parse tag group */ if (parse_tag_group (tag_group, filename, doc, ns, cur, sort)) { @@ -249,7 +249,7 @@ get_tag_group (const gchar* filename, xmlDocPtr doc, { /* Error parsing TagGroup */ g_warning ("The tag list file '%s' is of the wrong type, " - "error parsing TagGroup '%s'.", + "error parsing TagGroup '%s'.", filename, tag_group->name); free_tag_group (tag_group); @@ -264,11 +264,11 @@ groups_cmp (gconstpointer a, gconstpointer b) { gchar *g_a = (gchar *)((TagGroup *)a)->name; gchar *g_b = (gchar *)((TagGroup *)b)->name; - + return g_utf8_collate (g_a, g_b); } -/* +/* * tags file is localized by intltool-merge below. * * @@ -284,8 +284,8 @@ groups_cmp (gconstpointer a, gconstpointer b) * Therefore need to pick up the best lang on the current locale. */ static TagList* -lookup_best_lang (TagList *taglist, const gchar *filename, - xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur) +lookup_best_lang (TagList *taglist, const gchar *filename, + xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur) { TagGroup *best_tag_group = NULL; @@ -295,13 +295,13 @@ lookup_best_lang (TagList *taglist, const gchar *filename, /* * Walk the tree. * - * First level we expect a list TagGroup + * First level we expect a list TagGroup */ cur = cur->xmlChildrenNode; - + while (cur != NULL) - { - if ((xmlStrcmp (cur->name, (const xmlChar *) "TagGroup")) || (cur->ns != ns)) + { + if ((xmlStrcmp (cur->name, (const xmlChar *) "TagGroup")) || (cur->ns != ns)) { g_warning ("The tag list file '%s' is of the wrong type, " "was '%s', 'TagGroup' expected.", filename, cur->name); @@ -321,14 +321,14 @@ lookup_best_lang (TagList *taglist, const gchar *filename, lang = (gchar*) xmlGetProp (cur, (const xmlChar*) "lang"); cur_lanking = 1; - /* - * When found a new TagGroup, prepend the best - * tag_group to taglist. In the current intltool-merge, + /* + * When found a new TagGroup, prepend the best + * tag_group to taglist. In the current intltool-merge, * the first section is the default lang NULL. */ if (lang == NULL) { if (best_tag_group != NULL) { - taglist->tag_groups = + taglist->tag_groups = g_list_prepend (taglist->tag_groups, best_tag_group); } @@ -336,8 +336,8 @@ lookup_best_lang (TagList *taglist, const gchar *filename, best_lanking = -1; } - /* - * If already find the best TagGroup on the current + /* + * If already find the best TagGroup on the current * locale, ignore the logic. */ if (best_lanking != -1 && best_lanking <= cur_lanking) { @@ -351,20 +351,20 @@ lookup_best_lang (TagList *taglist, const gchar *filename, const gchar *best_lang = langs_pointer[i]; /* - * if launch on C, POSIX locale or does + * if launch on C, POSIX locale or does * not find the best lang on the current locale, * this is called. - * g_get_language_names returns lang + * g_get_language_names returns lang * lists with C locale. */ if (lang == NULL && - (!g_ascii_strcasecmp (best_lang, "C") || + (!g_ascii_strcasecmp (best_lang, "C") || !g_ascii_strcasecmp (best_lang, "POSIX"))) { tag_group = get_tag_group (filename, doc, ns, cur); if (tag_group != NULL) { - if (best_tag_group !=NULL) + if (best_tag_group !=NULL) free_tag_group (best_tag_group); best_lanking = cur_lanking; best_tag_group = tag_group; @@ -384,7 +384,7 @@ lookup_best_lang (TagList *taglist, const gchar *filename, tag_group = get_tag_group (filename, doc, ns, cur); if (tag_group != NULL) { - if (best_tag_group !=NULL) + if (best_tag_group !=NULL) free_tag_group (best_tag_group); best_lanking = cur_lanking; best_tag_group = tag_group; @@ -396,18 +396,18 @@ lookup_best_lang (TagList *taglist, const gchar *filename, if (lang) g_free (lang); } /* End of else */ - + cur = cur->next; } /* End of while (cur != NULL) */ /* Prepend TagGroup to TagList */ if (best_tag_group != NULL) { - taglist->tag_groups = + taglist->tag_groups = g_list_prepend (taglist->tag_groups, best_tag_group); } taglist->tag_groups = g_list_sort (taglist->tag_groups, groups_cmp); - + return taglist; } @@ -415,7 +415,7 @@ static TagList * parse_taglist_file (const gchar* filename) { xmlDocPtr doc; - + xmlNsPtr ns; xmlNodePtr cur; @@ -427,54 +427,54 @@ parse_taglist_file (const gchar* filename) * build an XML tree from a the file; */ doc = xmlParseFile (filename); - if (doc == NULL) - { - g_warning ("The tag list file '%s' is empty.", filename); - + if (doc == NULL) + { + g_warning ("The tag list file '%s' is empty.", filename); + return taglist; } /* * Check the document is of the right kind */ - + cur = xmlDocGetRootElement (doc); - if (cur == NULL) + if (cur == NULL) { - g_warning ("The tag list file '%s' is empty.", filename); - xmlFreeDoc(doc); + g_warning ("The tag list file '%s' is empty.", filename); + xmlFreeDoc(doc); return taglist; } ns = xmlSearchNsByHref (doc, cur, (const xmlChar *) "http://pluma.sourceforge.net/some-location"); - if (ns == NULL) + if (ns == NULL) { g_warning ("The tag list file '%s' is of the wrong type, " "pluma namespace not found.", filename); xmlFreeDoc (doc); - + return taglist; } - if (xmlStrcmp(cur->name, (const xmlChar *) "TagList")) + if (xmlStrcmp(cur->name, (const xmlChar *) "TagList")) { g_warning ("The tag list file '%s' is of the wrong type, " "root node != TagList.", filename); xmlFreeDoc (doc); - + return taglist; } - /* + /* * If needed, allocate taglist */ if (taglist == NULL) taglist = g_new0 (TagList, 1); - + taglist = lookup_best_lang (taglist, filename, doc, ns, cur); xmlFreeDoc (doc); @@ -553,7 +553,7 @@ free_taglist (void) pluma_debug_message (DEBUG_PLUGINS, "Really freed"); } -static TagList * +static TagList * parse_taglist_dir (const gchar *dir) { GError *error = NULL; @@ -593,9 +593,9 @@ TagList* create_taglist (const gchar *data_dir) pluma_debug_message (DEBUG_PLUGINS, "ref_count: %d", taglist_ref_count); if (taglist_ref_count > 0) - { + { ++taglist_ref_count; - + return taglist; } @@ -629,14 +629,14 @@ TagList* create_taglist (const gchar *data_dir) else if (home != NULL) { pdir = g_build_filename (home, - ".mate2", + ".config", USER_PLUMA_TAGLIST_PLUGIN_LOCATION, NULL); parse_taglist_dir (pdir); g_free (pdir); } -#else +#else pdir = g_build_filename (g_get_user_config_dir (), "pluma", "taglist", @@ -644,12 +644,12 @@ TagList* create_taglist (const gchar *data_dir) parse_taglist_dir (pdir); g_free (pdir); #endif - + /* load system's taglists */ parse_taglist_dir (data_dir); ++taglist_ref_count; g_return_val_if_fail (taglist_ref_count == 1, taglist); - + return taglist; } diff --git a/plugins/time/pluma-time-plugin.c b/plugins/time/pluma-time-plugin.c index d504bdf4..5709e713 100755 --- a/plugins/time/pluma-time-plugin.c +++ b/plugins/time/pluma-time-plugin.c @@ -53,7 +53,7 @@ #define MENU_PATH "/MenuBar/EditMenu/EditOps_4" /* mateconf keys */ -#define TIME_BASE_KEY "/apps/pluma-2/plugins/time" +#define TIME_BASE_KEY "/apps/pluma/plugins/time" #define PROMPT_TYPE_KEY TIME_BASE_KEY "/prompt_type" #define SELECTED_FORMAT_KEY TIME_BASE_KEY "/selected_format" #define CUSTOM_FORMAT_KEY TIME_BASE_KEY "/custom_format" @@ -758,7 +758,7 @@ get_configure_dialog (PlumaTimePlugin *plugin) "time_dialog_content", NULL }; - + pluma_debug (DEBUG_PLUGINS); dialog = g_new0 (TimeConfigureDialog, 1); @@ -938,7 +938,7 @@ get_choose_format_dialog (GtkWindow *parent, gboolean ret; gchar *sf, *cf; GtkWindowGroup *wg = NULL; - + if (parent != NULL) wg = gtk_window_get_group (parent); diff --git a/pluma/Makefile.am b/pluma/Makefile.am index 746a0100..1d98ac85 100755 --- a/pluma/Makefile.am +++ b/pluma/Makefile.am @@ -18,13 +18,13 @@ INCLUDES = \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ - -DLIBDIR=\""$(libdir)"\" + -DLIBDIR=\""$(libdir)"\" pluma_SOURCES = \ pluma.c pluma_LDADD = libpluma.la $(PLUMA_LIBS) $(IGE_MAC_LIBS) $(EGG_SMCLIENT_LIBS) - + if PLATFORM_WIN32 pluma_LDFLAGS = -Wl,--export-all-symbols -Wl,--out-implib,libpluma-$(PLUMA_API_VERSION).a if OS_WIN32 @@ -189,7 +189,7 @@ libpluma_la_SOURCES = \ $(INST_H_FILES) if !ENABLE_GVFS_METADATA -libpluma_la_SOURCES += pluma-metadata-manager.c +libpluma_la_SOURCES += pluma-metadata-manager.c endif pluma-enum-types.h: pluma-enum-types.h.template $(INST_H_FILES) $(GLIB_MKENUMS) @@ -205,7 +205,7 @@ pluma-marshal.c: pluma-marshal.list $(GLIB_GENMARSHAL) $(AM_V_GEN) echo "#include \"pluma-marshal.h\"" > $@ && \ $(GLIB_GENMARSHAL) $< --body --prefix=pluma_marshal >> $@ -uidir = $(datadir)/pluma-2/ui/ +uidir = $(datadir)/pluma/ui/ ui_DATA = \ pluma-ui.xml \ pluma-print-preferences.ui diff --git a/pluma/dialogs/Makefile.am b/pluma/dialogs/Makefile.am index c8a822cc..c8033e9b 100755 --- a/pluma/dialogs/Makefile.am +++ b/pluma/dialogs/Makefile.am @@ -1,4 +1,4 @@ -uidir = $(datadir)/pluma-2/ui/ +uidir = $(datadir)/pluma/ui/ INCLUDES = \ -I$(top_srcdir) \ @@ -26,6 +26,6 @@ ui_DATA = \ pluma-preferences-dialog.ui \ pluma-search-dialog.ui -EXTRA_DIST = $(ui_DATA) +EXTRA_DIST = $(ui_DATA) -include $(top_srcdir)/git.mk diff --git a/pluma/pluma-commands-help.c b/pluma/pluma-commands-help.c index 66835bd2..5af95159 100755 --- a/pluma/pluma-commands-help.c +++ b/pluma/pluma-commands-help.c @@ -5,6 +5,7 @@ * Copyright (C) 1998, 1999 Alex Roberts, Evan Lawrence * Copyright (C) 2000, 2001 Chema Celorio, Paolo Maggi * Copyright (C) 2002-2005 Paolo Maggi + * Copyright (C) 2011 Perberos * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,7 +24,7 @@ */ /* - * Modified by the pluma Team, 1998-2005. See the AUTHORS file for a + * Modified by the gedit Team, 1998-2005. See the AUTHORS file for a * list of people on the pluma Team. * See the ChangeLog files for a list of changes. * @@ -31,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include + #include #endif #include @@ -42,20 +43,16 @@ #include "pluma-help.h" #include "pluma-dirs.h" -void -_pluma_cmd_help_contents (GtkAction *action, - PlumaWindow *window) +void _pluma_cmd_help_contents(GtkAction* action, PlumaWindow* window) { - pluma_debug (DEBUG_COMMANDS); + pluma_debug(DEBUG_COMMANDS); - pluma_help_display (GTK_WINDOW (window), NULL, NULL); + pluma_help_display(GTK_WINDOW(window), NULL, NULL); } -void -_pluma_cmd_help_about (GtkAction *action, - PlumaWindow *window) +void _pluma_cmd_help_about(GtkAction* action, PlumaWindow* window) { - static const gchar * const authors[] = { + static const gchar* const authors[] = { "Paolo Maggi ", "Paolo Borelli ", "Steve Fr\303\251cinaux ", @@ -64,11 +61,12 @@ _pluma_cmd_help_about (GtkAction *action, "James Willcox ", "Chema Celorio", "Federico Mena Quintero ", + "Perberos ", NULL }; - static const gchar * const documenters[] = { - "Sun MATE Documentation Team ", + static const gchar* const documenters[] = { + "Sun GNOME Documentation Team ", "Eric Baudais ", NULL }; @@ -81,23 +79,17 @@ _pluma_cmd_help_about (GtkAction *action, "Copyright \xc2\xa9 2011 Perberos"; static const gchar comments[] = \ - N_("pluma is a small and lightweight text editor for the " - "MATE Desktop"); - - GdkPixbuf *logo; - gchar *data_dir; - gchar *logo_file; + N_("pluma is a small and lightweight text editor for the MATE Desktop"); pluma_debug (DEBUG_COMMANDS); - data_dir = pluma_dirs_get_pluma_data_dir (); - logo_file = g_build_filename (data_dir, - "logo", - "pluma.png", - NULL); - g_free (data_dir); - logo = gdk_pixbuf_new_from_file (logo_file, NULL); - g_free (logo_file); + GdkPixbuf* logo = NULL; + GtkIconTheme* icon_theme = gtk_icon_theme_get_default(); + + if (gtk_icon_theme_has_icon(icon_theme, "accessories-text-editor")) + { + logo = gtk_icon_theme_load_icon(icon_theme, "accessories-text-editor", 64, 0, NULL); + } gtk_show_about_dialog (GTK_WINDOW (window), "program-name", "Pluma", @@ -112,5 +104,7 @@ _pluma_cmd_help_about (GtkAction *action, NULL); if (logo) - g_object_unref (logo); + { + g_object_unref(logo); + } } diff --git a/pluma/pluma-dirs.c b/pluma/pluma-dirs.c index 643b26dc..d3fafdd4 100755 --- a/pluma/pluma-dirs.c +++ b/pluma/pluma-dirs.c @@ -3,6 +3,7 @@ * This file is part of pluma * * Copyright (C) 2008 Ignacio Casal Quinteiro + * Copyright (C) 2011 Perberos * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,305 +17,251 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H -#include + #include #endif #include "pluma-dirs.h" #ifdef OS_OSX -#include + #include #endif -gchar * -pluma_dirs_get_user_config_dir (void) +gchar* pluma_dirs_get_user_config_dir(void) { - gchar *config_dir = NULL; - -#ifndef G_OS_WIN32 - const gchar *envvar; - const gchar *home; - - /* Support old libmate env var */ - envvar = g_getenv ("MATE22_USER_DIR"); - if (envvar != NULL) - { - config_dir = g_build_filename (envvar, - "pluma", - NULL); - - } - else - { - home = g_get_home_dir (); - - if (home != NULL) + gchar* config_dir = NULL; + + #ifndef G_OS_WIN32 + const gchar* envvar; + const gchar* home; + + /* Support old libmate env var */ + envvar = g_getenv("MATE22_USER_DIR"); + + if (envvar != NULL) { - config_dir = g_build_filename (home, - ".mate2", - "pluma", - NULL); + config_dir = g_build_filename(envvar, "pluma", NULL); } - } -#else - config_dir = g_build_filename (g_get_user_config_dir (), - "pluma", - NULL); -#endif + else + { + home = g_get_home_dir(); + + if (home != NULL) + { + config_dir = g_build_filename(home, ".config", "pluma", NULL); + } + } + #else + config_dir = g_build_filename(g_get_user_config_dir(), "pluma", NULL); + #endif return config_dir; } -gchar * -pluma_dirs_get_user_cache_dir (void) +gchar* pluma_dirs_get_user_cache_dir(void) { - const gchar *cache_dir; + const gchar* cache_dir; - cache_dir = g_get_user_cache_dir (); + cache_dir = g_get_user_cache_dir(); - return g_build_filename (cache_dir, - "pluma", - NULL); + return g_build_filename(cache_dir, "pluma", NULL); } -gchar * -pluma_dirs_get_user_plugins_dir (void) +gchar* pluma_dirs_get_user_plugins_dir(void) { - gchar *config_dir; - gchar *plugin_dir; + gchar* config_dir; + gchar* plugin_dir; - config_dir = pluma_dirs_get_user_config_dir (); + config_dir = pluma_dirs_get_user_config_dir(); + + plugin_dir = g_build_filename(config_dir, "plugins", NULL); + g_free(config_dir); - plugin_dir = g_build_filename (config_dir, - "plugins", - NULL); - g_free (config_dir); - return plugin_dir; } -gchar * -pluma_dirs_get_user_accels_file (void) +gchar* pluma_dirs_get_user_accels_file(void) { - gchar *accels = NULL; - -#ifndef G_OS_WIN32 - const gchar *envvar; - const gchar *home; - - /* on linux accels are stored in .mate2/accels - * for historic reasons (backward compat with the - * old libmate that took care of saving them */ - - /* Support old libmate env var */ - envvar = g_getenv ("MATE22_USER_DIR"); - if (envvar != NULL) - { - accels = g_build_filename (envvar, - "accels", - "pluma", - NULL); - } - else - { - home = g_get_home_dir (); - - if (home != NULL) + gchar* accels = NULL; + + #ifndef G_OS_WIN32 + const gchar* envvar; + const gchar* home; + + /* on linux accels are stored in .config/accels + * for historic reasons (backward compat with the + * old libmate that took care of saving them */ + + /* Support old libmate env var */ + envvar = g_getenv("MATE22_USER_DIR"); + + if (envvar != NULL) + { + accels = g_build_filename(envvar, "accels", "pluma", NULL); + } + else { - accels = g_build_filename (home, - ".mate2", - "accels", - "pluma", - NULL); + home = g_get_home_dir(); + + if (home != NULL) + { + accels = g_build_filename(home, ".config", "accels", "pluma", NULL); + } } - } -#else - { + #else + gchar *config_dir = NULL; - config_dir = pluma_dirs_get_user_config_dir (); - accels = g_build_filename (config_dir, - "accels", - "pluma", - NULL); + config_dir = pluma_dirs_get_user_config_dir(); + accels = g_build_filename(config_dir, "accels", "pluma", NULL); - g_free (config_dir); - } -#endif + g_free(config_dir); + + #endif return accels; } -gchar * -pluma_dirs_get_pluma_data_dir (void) +gchar* pluma_dirs_get_pluma_data_dir(void) { - gchar *data_dir; - -#ifdef G_OS_WIN32 - gchar *win32_dir; - - win32_dir = g_win32_get_package_installation_directory_of_module (NULL); - - data_dir = g_build_filename (win32_dir, - "share", - "pluma-2", - NULL); - - g_free (win32_dir); -#elif defined (OS_OSX) - IgeMacBundle *bundle = ige_mac_bundle_get_default (); - - if (ige_mac_bundle_get_is_app_bundle (bundle)) - { - const gchar *bundle_data_dir = ige_mac_bundle_get_datadir (bundle); - - data_dir = g_build_filename (bundle_data_dir, - "pluma-2", - NULL); - } - else - { - data_dir = g_build_filename (DATADIR, "pluma-2", NULL); - } -#else - data_dir = g_build_filename (DATADIR, - "pluma-2", - NULL); -#endif + gchar* data_dir; + + #ifdef G_OS_WIN32 + gchar* win32_dir; + + win32_dir = g_win32_get_package_installation_directory_of_module(NULL); + + data_dir = g_build_filename(win32_dir, "share", "pluma", NULL); + + g_free(win32_dir); + + #elif defined(OS_OSX) + + IgeMacBundle* bundle = ige_mac_bundle_get_default(); + + if (ige_mac_bundle_get_is_app_bundle(bundle)) + { + const gchar* bundle_data_dir = ige_mac_bundle_get_datadir(bundle); + + data_dir = g_build_filename(bundle_data_dir, "pluma", NULL); + } + else + { + data_dir = g_build_filename(DATADIR, "pluma", NULL); + } + #else + data_dir = g_build_filename(DATADIR, "pluma", NULL); + #endif return data_dir; } -gchar * -pluma_dirs_get_pluma_locale_dir (void) +gchar* pluma_dirs_get_pluma_locale_dir(void) { - gchar *locale_dir; - -#ifdef G_OS_WIN32 - gchar *win32_dir; - - win32_dir = g_win32_get_package_installation_directory_of_module (NULL); - - locale_dir = g_build_filename (win32_dir, - "share", - "locale", - NULL); - - g_free (win32_dir); -#elif defined (OS_OSX) - IgeMacBundle *bundle = ige_mac_bundle_get_default (); - - if (ige_mac_bundle_get_is_app_bundle (bundle)) - { - locale_dir = g_strdup (ige_mac_bundle_get_localedir (bundle)); - } - else - { - locale_dir = g_build_filename (DATADIR, - "locale", - NULL); - } -#else - locale_dir = g_build_filename (DATADIR, - "locale", - NULL); -#endif + gchar* locale_dir; + + #ifdef G_OS_WIN32 + + gchar* win32_dir; + + win32_dir = g_win32_get_package_installation_directory_of_module(NULL); + + locale_dir = g_build_filename(win32_dir, "share", "locale", NULL); + + g_free(win32_dir); + + #elif defined(OS_OSX) + + IgeMacBundle *bundle = ige_mac_bundle_get_default(); + + if (ige_mac_bundle_get_is_app_bundle(bundle)) + { + locale_dir = g_strdup(ige_mac_bundle_get_localedir(bundle)); + } + else + { + locale_dir = g_build_filename(DATADIR, "locale", NULL); + } + #else + locale_dir = g_build_filename(DATADIR, "locale", NULL); + #endif return locale_dir; } -gchar * -pluma_dirs_get_pluma_lib_dir (void) +gchar* pluma_dirs_get_pluma_lib_dir(void) { - gchar *lib_dir; - -#ifdef G_OS_WIN32 - gchar *win32_dir; - - win32_dir = g_win32_get_package_installation_directory_of_module (NULL); - - lib_dir = g_build_filename (win32_dir, - "lib", - "pluma-2", - NULL); - - g_free (win32_dir); -#elif defined (OS_OSX) - IgeMacBundle *bundle = ige_mac_bundle_get_default (); - - if (ige_mac_bundle_get_is_app_bundle (bundle)) - { - const gchar *path = ige_mac_bundle_get_resourcesdir (bundle); - lib_dir = g_build_filename (path, - "lib", - "pluma-2", - NULL); - } - else - { - lib_dir = g_build_filename (LIBDIR, - "pluma-2", - NULL); - } -#else - lib_dir = g_build_filename (LIBDIR, - "pluma-2", - NULL); -#endif + gchar* lib_dir; + + #ifdef G_OS_WIN32 + + gchar* win32_dir; + + win32_dir = g_win32_get_package_installation_directory_of_module(NULL); + + lib_dir = g_build_filename(win32_dir, "lib", "pluma", NULL); + + g_free(win32_dir); + + #elif defined(OS_OSX) + IgeMacBundle* bundle = ige_mac_bundle_get_default(); + + if (ige_mac_bundle_get_is_app_bundle(bundle)) + { + const gchar* path = ige_mac_bundle_get_resourcesdir(bundle); + lib_dir = g_build_filename(path, "lib", "pluma", NULL); + } + else + { + lib_dir = g_build_filename(LIBDIR, "pluma", NULL); + } + #else + lib_dir = g_build_filename(LIBDIR, "pluma", NULL); + #endif return lib_dir; } -gchar * -pluma_dirs_get_pluma_plugins_dir (void) +gchar* pluma_dirs_get_pluma_plugins_dir(void) { - gchar *lib_dir; - gchar *plugin_dir; - - lib_dir = pluma_dirs_get_pluma_lib_dir (); - - plugin_dir = g_build_filename (lib_dir, - "plugins", - NULL); - g_free (lib_dir); - + gchar* lib_dir; + gchar* plugin_dir; + + lib_dir = pluma_dirs_get_pluma_lib_dir(); + + plugin_dir = g_build_filename(lib_dir, "plugins", NULL); + g_free(lib_dir); + return plugin_dir; } -gchar * -pluma_dirs_get_pluma_plugin_loaders_dir (void) +gchar* pluma_dirs_get_pluma_plugin_loaders_dir(void) { - gchar *lib_dir; - gchar *loader_dir; - - lib_dir = pluma_dirs_get_pluma_lib_dir (); - - loader_dir = g_build_filename (lib_dir, - "plugin-loaders", - NULL); - g_free (lib_dir); - + gchar* lib_dir; + gchar* loader_dir; + + lib_dir = pluma_dirs_get_pluma_lib_dir(); + + loader_dir = g_build_filename(lib_dir, "plugin-loaders", NULL); + g_free(lib_dir); + return loader_dir; } -gchar * -pluma_dirs_get_ui_file (const gchar *file) +gchar* pluma_dirs_get_ui_file(const gchar* file) { - gchar *datadir; - gchar *ui_file; - - g_return_val_if_fail (file != NULL, NULL); - - datadir = pluma_dirs_get_pluma_data_dir (); - ui_file = g_build_filename (datadir, - "ui", - file, - NULL); - g_free (datadir); - + gchar* datadir; + gchar* ui_file; + + g_return_val_if_fail(file != NULL, NULL); + + datadir = pluma_dirs_get_pluma_data_dir(); + ui_file = g_build_filename(datadir, "ui", file, NULL); + g_free(datadir); + return ui_file; } diff --git a/pluma/pluma-plugin.c b/pluma/pluma-plugin.c index b89ea11d..68bbaf77 100755 --- a/pluma/pluma-plugin.c +++ b/pluma/pluma-plugin.c @@ -2,7 +2,7 @@ * pluma-plugin.h * This file is part of pluma * - * Copyright (C) 2002-2005 Paolo Maggi + * Copyright (C) 2002-2005 Paolo Maggi * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,14 +16,14 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. */ - + /* - * Modified by the pluma Team, 2002-2005. See the AUTHORS file for a - * list of people on the pluma Team. - * See the ChangeLog files for a list of changes. + * Modified by the pluma Team, 2002-2005. See the AUTHORS file for a + * list of people on the pluma Team. + * See the ChangeLog files for a list of changes. * * $Id$ */ @@ -125,7 +125,7 @@ pluma_plugin_finalize (GObject *object) G_OBJECT_CLASS (pluma_plugin_parent_class)->finalize (object); } -static void +static void pluma_plugin_class_init (PlumaPluginClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); @@ -133,7 +133,7 @@ pluma_plugin_class_init (PlumaPluginClass *klass) klass->activate = dummy; klass->deactivate = dummy; klass->update_ui = dummy; - + klass->create_configure_dialog = create_configure_dialog; klass->is_configurable = is_configurable; @@ -217,7 +217,7 @@ pluma_plugin_get_data_dir (PlumaPlugin *plugin) /* If it's a "user" plugin the data dir is * install_dir/data_dir_name if instead it's a * "system" plugin the data dir is under pluma_data_dir, - * so it's under $prefix/share/pluma-2/plugins/data_dir_name + * so it's under $prefix/share/pluma/plugins/data_dir_name * where data_dir_name usually it's the name of the plugin */ pluma_lib_dir = pluma_dirs_get_pluma_lib_dir (); @@ -253,7 +253,7 @@ pluma_plugin_get_data_dir (PlumaPlugin *plugin) * pluma_plugin_activate: * @plugin: a #PlumaPlugin * @window: a #PlumaWindow - * + * * Activates the plugin. */ void @@ -262,7 +262,7 @@ pluma_plugin_activate (PlumaPlugin *plugin, { g_return_if_fail (PLUMA_IS_PLUGIN (plugin)); g_return_if_fail (PLUMA_IS_WINDOW (window)); - + PLUMA_PLUGIN_GET_CLASS (plugin)->activate (plugin, window); } @@ -270,7 +270,7 @@ pluma_plugin_activate (PlumaPlugin *plugin, * pluma_plugin_deactivate: * @plugin: a #PlumaPlugin * @window: a #PlumaWindow - * + * * Deactivates the plugin. */ void @@ -290,7 +290,7 @@ pluma_plugin_deactivate (PlumaPlugin *plugin, * * Triggers an update of the user interface to take into account state changes * caused by the plugin. - */ + */ void pluma_plugin_update_ui (PlumaPlugin *plugin, PlumaWindow *window) @@ -329,6 +329,6 @@ GtkWidget * pluma_plugin_create_configure_dialog (PlumaPlugin *plugin) { g_return_val_if_fail (PLUMA_IS_PLUGIN (plugin), NULL); - + return PLUMA_PLUGIN_GET_CLASS (plugin)->create_configure_dialog (plugin); } diff --git a/pluma/pluma-plugins-engine.c b/pluma/pluma-plugins-engine.c index 4e27d718..284b0921 100755 --- a/pluma/pluma-plugins-engine.c +++ b/pluma/pluma-plugins-engine.c @@ -2,7 +2,7 @@ * pluma-plugins-engine.c * This file is part of pluma * - * Copyright (C) 2002-2005 Paolo Maggi + * Copyright (C) 2002-2005 Paolo Maggi * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,14 +16,14 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. */ /* - * Modified by the pluma Team, 2002-2005. See the AUTHORS file for a - * list of people on the pluma Team. - * See the ChangeLog files for a list of changes. + * Modified by the pluma Team, 2002-2005. See the AUTHORS file for a + * list of people on the pluma Team. + * See the ChangeLog files for a list of changes. * * $Id$ */ @@ -46,7 +46,7 @@ #include "pluma-object-module.h" #include "pluma-dirs.h" -#define PLUMA_PLUGINS_ENGINE_BASE_KEY "/apps/pluma-2/plugins" +#define PLUMA_PLUGINS_ENGINE_BASE_KEY "/apps/pluma/plugins" #define PLUMA_PLUGINS_ENGINE_KEY PLUMA_PLUGINS_ENGINE_BASE_KEY "/active-plugins" #define PLUGIN_EXT ".pluma-plugin" @@ -110,7 +110,7 @@ load_dir_real (PlumaPluginsEngine *engine, g_error_free (error); return TRUE; } - + while ((dirent = g_dir_read_name (d))) { gchar *filename; @@ -138,7 +138,7 @@ load_plugin_info (PlumaPluginsEngine *engine, gpointer userdata) { PlumaPluginInfo *info; - + info = _pluma_plugin_info_new (filename); if (info == NULL) @@ -227,11 +227,11 @@ hash_lowercase (gconstpointer data) { gchar *lowercase; guint ret; - + lowercase = g_ascii_strdown ((const gchar *)data, -1); ret = g_str_hash (lowercase); g_free (lowercase); - + return ret; } @@ -246,10 +246,10 @@ loader_destroy (LoaderInfo *info) { if (!info) return; - + if (info->loader) g_object_unref (info->loader); - + g_free (info); } @@ -315,19 +315,19 @@ pluma_plugins_engine_finalize (GObject *object) { PlumaPluginsEngine *engine = PLUMA_PLUGINS_ENGINE (object); GList *item; - + pluma_debug (DEBUG_PLUGINS); /* Firs deactivate all plugins */ for (item = engine->priv->plugin_list; item; item = item->next) { PlumaPluginInfo *info = PLUMA_PLUGIN_INFO (item->data); - + if (pluma_plugin_info_is_active (info)) pluma_plugins_engine_deactivate_plugin_real (engine, info); } - - /* unref the loaders */ + + /* unref the loaders */ g_hash_table_destroy (engine->priv->loaders); /* and finally free the infos */ @@ -388,7 +388,7 @@ load_loader (PlumaPluginsEngine *engine, gchar *path; const gchar *id; GType type; - + /* try to load in the module */ path = g_path_get_dirname (filename); base = g_path_get_basename (filename); @@ -411,12 +411,12 @@ load_loader (PlumaPluginsEngine *engine, return TRUE; } - /* get the exported type and check the name as exported by the + /* get the exported type and check the name as exported by the * loader interface */ type = pluma_object_module_get_object_type (module); id = pluma_plugin_loader_type_get_id (type); - - add_loader (engine, id, module); + + add_loader (engine, id, module); g_type_module_unuse (G_TYPE_MODULE (module)); return TRUE; @@ -430,11 +430,11 @@ ensure_loader (LoaderInfo *info) /* create a new loader object */ PlumaPluginLoader *loader; loader = (PlumaPluginLoader *)pluma_object_module_new_object (info->module, NULL); - + if (loader == NULL || !PLUMA_IS_PLUGIN_LOADER (loader)) { g_warning ("Loader object is not a valid PlumaPluginLoader instance"); - + if (loader != NULL && G_IS_OBJECT (loader)) g_object_unref (loader); } @@ -454,7 +454,7 @@ get_plugin_loader (PlumaPluginsEngine *engine, PlumaPluginInfo *info) loader_id = info->loader; loader_info = (LoaderInfo *)g_hash_table_lookup ( - engine->priv->loaders, + engine->priv->loaders, loader_id); if (loader_info == NULL) @@ -463,17 +463,17 @@ get_plugin_loader (PlumaPluginsEngine *engine, PlumaPluginInfo *info) loader_dir = pluma_dirs_get_pluma_plugin_loaders_dir (); - /* loader could not be found in the hash, try to find it by + /* loader could not be found in the hash, try to find it by scanning */ - load_dir_real (engine, + load_dir_real (engine, loader_dir, LOADER_EXT, (LoadDirCallback)load_loader, NULL); g_free (loader_dir); - + loader_info = (LoaderInfo *)g_hash_table_lookup ( - engine->priv->loaders, + engine->priv->loaders, loader_id); } @@ -483,7 +483,7 @@ get_plugin_loader (PlumaPluginsEngine *engine, PlumaPluginInfo *info) add_loader (engine, loader_id, NULL); return NULL; } - + ensure_loader (loader_info); return loader_info->loader; } @@ -557,33 +557,33 @@ load_plugin (PlumaPluginsEngine *engine, if (pluma_plugin_info_is_active (info)) return TRUE; - + if (!pluma_plugin_info_is_available (info)) return FALSE; loader = get_plugin_loader (engine, info); - + if (loader == NULL) { g_warning ("Could not find loader `%s' for plugin `%s'", info->loader, info->name); info->available = FALSE; return FALSE; } - + path = g_path_get_dirname (info->file); g_return_val_if_fail (path != NULL, FALSE); info->plugin = pluma_plugin_loader_load (loader, info, path); - + g_free (path); - + if (info->plugin == NULL) { g_warning ("Error loading plugin '%s'", info->name); info->available = FALSE; return FALSE; } - + return TRUE; } @@ -614,7 +614,7 @@ pluma_plugins_engine_activate_plugin (PlumaPluginsEngine *engine, if (!pluma_plugin_info_is_available (info)) return FALSE; - + if (pluma_plugin_info_is_active (info)) return TRUE; @@ -627,7 +627,7 @@ pluma_plugins_engine_activate_plugin (PlumaPluginsEngine *engine, } static void -call_plugin_deactivate (PlumaPlugin *plugin, +call_plugin_deactivate (PlumaPlugin *plugin, PlumaWindow *window) { pluma_plugin_deactivate (plugin, window); @@ -646,7 +646,7 @@ pluma_plugins_engine_deactivate_plugin_real (PlumaPluginsEngine *engine, const GList *wins; PlumaPluginLoader *loader; - if (!pluma_plugin_info_is_active (info) || + if (!pluma_plugin_info_is_active (info) || !pluma_plugin_info_is_available (info)) return; @@ -659,13 +659,13 @@ pluma_plugins_engine_deactivate_plugin_real (PlumaPluginsEngine *engine, /* first unref the plugin (the loader still has one) */ g_object_unref (info->plugin); - + /* find the loader and tell it to gc and unload the plugin */ loader = get_plugin_loader (engine, info); - + pluma_plugin_loader_garbage_collect (loader); pluma_plugin_loader_unload (loader, info); - + info->plugin = NULL; } @@ -708,15 +708,15 @@ pluma_plugins_engine_activate_plugins (PlumaPluginsEngine *engine, for (pl = engine->priv->plugin_list; pl; pl = pl->next) { PlumaPluginInfo *info = (PlumaPluginInfo*)pl->data; - - if (engine->priv->activate_from_prefs && + + if (engine->priv->activate_from_prefs && g_slist_find_custom (active_plugins, pluma_plugin_info_get_module_name (info), (GCompareFunc)strcmp) == NULL) continue; - + /* If plugin is not active, don't try to activate/load it */ - if (!engine->priv->activate_from_prefs && + if (!engine->priv->activate_from_prefs && !pluma_plugin_info_is_active (info)) continue; @@ -724,14 +724,14 @@ pluma_plugins_engine_activate_plugins (PlumaPluginsEngine *engine, pluma_plugin_activate (info->plugin, window); } - + if (engine->priv->activate_from_prefs) { g_slist_foreach (active_plugins, (GFunc) g_free, NULL); g_slist_free (active_plugins); engine->priv->activate_from_prefs = FALSE; } - + pluma_debug_message (DEBUG_PLUGINS, "End"); /* also call update_ui after activation */ @@ -743,24 +743,24 @@ pluma_plugins_engine_deactivate_plugins (PlumaPluginsEngine *engine, PlumaWindow *window) { GList *pl; - + pluma_debug (DEBUG_PLUGINS); g_return_if_fail (PLUMA_IS_PLUGINS_ENGINE (engine)); g_return_if_fail (PLUMA_IS_WINDOW (window)); - + for (pl = engine->priv->plugin_list; pl; pl = pl->next) { PlumaPluginInfo *info = (PlumaPluginInfo*)pl->data; - + /* check if the plugin is actually active */ if (!pluma_plugin_info_is_active (info)) continue; - + /* call deactivate for the plugin for this window */ pluma_plugin_deactivate (info->plugin, window); } - + pluma_debug_message (DEBUG_PLUGINS, "End"); } @@ -782,21 +782,21 @@ pluma_plugins_engine_update_plugins_ui (PlumaPluginsEngine *engine, if (!pluma_plugin_info_is_active (info)) continue; - + pluma_debug_message (DEBUG_PLUGINS, "Updating UI of %s", info->name); pluma_plugin_update_ui (info->plugin, window); } } -void +void pluma_plugins_engine_configure_plugin (PlumaPluginsEngine *engine, PlumaPluginInfo *info, GtkWindow *parent) { GtkWidget *conf_dlg; - + GtkWindowGroup *wg; - + pluma_debug (DEBUG_PLUGINS); g_return_if_fail (info != NULL); @@ -812,15 +812,15 @@ pluma_plugins_engine_configure_plugin (PlumaPluginsEngine *engine, wg = gtk_window_group_new (); gtk_window_group_add_window (wg, parent); } - + gtk_window_group_add_window (wg, GTK_WINDOW (conf_dlg)); - - gtk_window_set_modal (GTK_WINDOW (conf_dlg), TRUE); + + gtk_window_set_modal (GTK_WINDOW (conf_dlg), TRUE); gtk_widget_show (conf_dlg); } -void +void pluma_plugins_engine_active_plugins_changed (PlumaPluginsEngine *engine) { gboolean to_activate; @@ -856,6 +856,6 @@ void pluma_plugins_engine_rescan_plugins (PlumaPluginsEngine *engine) { pluma_debug (DEBUG_PLUGINS); - + load_all_plugins (engine); } diff --git a/pluma/pluma-prefs-manager-app.c b/pluma/pluma-prefs-manager-app.c index 091bc9de..88a511d0 100755 --- a/pluma/pluma-prefs-manager-app.c +++ b/pluma/pluma-prefs-manager-app.c @@ -3,7 +3,7 @@ * pluma-prefs-manager.c * This file is part of pluma * - * Copyright (C) 2002-2005 Paolo Maggi + * Copyright (C) 2002-2005 Paolo Maggi * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,13 +17,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. */ - + /* - * Modified by the pluma Team, 2002-2003. See the AUTHORS file for a - * list of people on the pluma Team. + * Modified by the pluma Team, 2002-2003. See the AUTHORS file for a + * list of people on the pluma Team. * See the ChangeLog files for a list of changes. * * $Id$ @@ -58,69 +58,69 @@ static void pluma_prefs_manager_system_font_changed (MateConfClient *client, gpointer user_data); static void pluma_prefs_manager_tabs_size_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data); static void pluma_prefs_manager_wrap_mode_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data); static void pluma_prefs_manager_line_numbers_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data); static void pluma_prefs_manager_auto_indent_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data); static void pluma_prefs_manager_undo_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data); static void pluma_prefs_manager_right_margin_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data); static void pluma_prefs_manager_smart_home_end_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data); static void pluma_prefs_manager_hl_current_line_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data); - + static void pluma_prefs_manager_bracket_matching_changed(MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data); static void pluma_prefs_manager_syntax_hl_enable_changed(MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data); static void pluma_prefs_manager_search_hl_enable_changed(MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data); static void pluma_prefs_manager_source_style_scheme_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data); static void pluma_prefs_manager_max_recents_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data); static void pluma_prefs_manager_auto_save_changed (MateConfClient *client, @@ -129,8 +129,8 @@ static void pluma_prefs_manager_auto_save_changed (MateConfClient *client, gpointer user_data); static void pluma_prefs_manager_active_plugins_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data); static void pluma_prefs_manager_lockdown_changed (MateConfClient *client, @@ -146,7 +146,7 @@ static void pluma_prefs_manager_lockdown_changed (MateConfClient *client, #define PLUMA_STATE_DEFAULT_SIDE_PANEL_SIZE 200 #define PLUMA_STATE_DEFAULT_BOTTOM_PANEL_SIZE 140 -#define PLUMA_STATE_FILE_LOCATION "pluma-2" +#define PLUMA_STATE_FILE_LOCATION "pluma.ini" #define PLUMA_STATE_WINDOW_GROUP "window" #define PLUMA_STATE_WINDOW_STATE "state" @@ -356,12 +356,12 @@ pluma_prefs_manager_get_window_state (void) return window_state; } - + void pluma_prefs_manager_set_window_state (gint ws) { g_return_if_fail (ws > -1); - + window_state = ws; pluma_state_set_int (PLUMA_STATE_WINDOW_GROUP, @@ -426,7 +426,7 @@ pluma_prefs_manager_set_window_size (gint width, gint height) height); } -gboolean +gboolean pluma_prefs_manager_window_size_can_set (void) { return TRUE; @@ -447,27 +447,27 @@ pluma_prefs_manager_get_side_panel_size (void) return side_panel_size; } -gint +gint pluma_prefs_manager_get_default_side_panel_size (void) { return PLUMA_STATE_DEFAULT_SIDE_PANEL_SIZE; } -void +void pluma_prefs_manager_set_side_panel_size (gint ps) { g_return_if_fail (ps > -1); - + if (side_panel_size == ps) return; - + side_panel_size = ps; pluma_state_set_int (PLUMA_STATE_WINDOW_GROUP, PLUMA_STATE_SIDE_PANEL_SIZE, ps); } -gboolean +gboolean pluma_prefs_manager_side_panel_size_can_set (void) { return TRUE; @@ -499,7 +499,7 @@ pluma_prefs_manager_set_side_panel_active_page (gint id) id); } -gboolean +gboolean pluma_prefs_manager_side_panel_active_page_can_set (void) { return TRUE; @@ -520,27 +520,27 @@ pluma_prefs_manager_get_bottom_panel_size (void) return bottom_panel_size; } -gint +gint pluma_prefs_manager_get_default_bottom_panel_size (void) { return PLUMA_STATE_DEFAULT_BOTTOM_PANEL_SIZE; } -void +void pluma_prefs_manager_set_bottom_panel_size (gint ps) { g_return_if_fail (ps > -1); if (bottom_panel_size == ps) return; - + bottom_panel_size = ps; pluma_state_set_int (PLUMA_STATE_WINDOW_GROUP, PLUMA_STATE_BOTTOM_PANEL_SIZE, ps); } -gboolean +gboolean pluma_prefs_manager_bottom_panel_size_can_set (void) { return TRUE; @@ -572,7 +572,7 @@ pluma_prefs_manager_set_bottom_panel_active_page (gint id) id); } -gboolean +gboolean pluma_prefs_manager_bottom_panel_active_page_can_set (void) { return TRUE; @@ -597,7 +597,7 @@ void pluma_prefs_manager_set_active_file_filter (gint id) { g_return_if_fail (id >= 0); - + if (active_file_filter == id) return; @@ -607,7 +607,7 @@ pluma_prefs_manager_set_active_file_filter (gint id) id); } -gboolean +gboolean pluma_prefs_manager_active_file_filter_can_set (void) { return TRUE; @@ -636,12 +636,12 @@ pluma_prefs_manager_app_init (void) GPM_PLUGINS_DIR, MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL); - + mateconf_client_add_dir (pluma_prefs_manager->mateconf_client, GPM_LOCKDOWN_DIR, MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL); - + mateconf_client_notify_add (pluma_prefs_manager->mateconf_client, GPM_FONT_DIR, pluma_prefs_manager_editor_font_changed, @@ -661,7 +661,7 @@ pluma_prefs_manager_app_init (void) GPM_WRAP_MODE_DIR, pluma_prefs_manager_wrap_mode_changed, NULL, NULL, NULL); - + mateconf_client_notify_add (pluma_prefs_manager->mateconf_client, GPM_LINE_NUMBERS_DIR, pluma_prefs_manager_line_numbers_changed, @@ -733,7 +733,7 @@ pluma_prefs_manager_app_init (void) NULL, NULL, NULL); } - return pluma_prefs_manager != NULL; + return pluma_prefs_manager != NULL; } /* This function must be called before exiting pluma */ @@ -748,10 +748,10 @@ pluma_prefs_manager_app_shutdown (void) } -static void +static void pluma_prefs_manager_editor_font_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data) { GList *views; @@ -771,7 +771,7 @@ pluma_prefs_manager_editor_font_changed (MateConfClient *client, def = mateconf_value_get_bool (entry->value); else def = GPM_DEFAULT_USE_DEFAULT_FONT; - + if (def) font = pluma_prefs_manager_get_system_font (); else @@ -783,14 +783,14 @@ pluma_prefs_manager_editor_font_changed (MateConfClient *client, font = g_strdup (mateconf_value_get_string (entry->value)); else font = g_strdup (GPM_DEFAULT_EDITOR_FONT); - + def = pluma_prefs_manager_get_use_default_font (); } else return; g_return_if_fail (font != NULL); - + ts = pluma_prefs_manager_get_tabs_size (); views = pluma_app_get_views (pluma_app_get_default ()); @@ -809,10 +809,10 @@ pluma_prefs_manager_editor_font_changed (MateConfClient *client, g_free (font); } -static void +static void pluma_prefs_manager_system_font_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data) { GList *views; @@ -854,10 +854,10 @@ pluma_prefs_manager_system_font_changed (MateConfClient *client, g_free (font); } -static void +static void pluma_prefs_manager_tabs_size_changed (MateConfClient *client, guint cnxn_id, - MateConfEntry *entry, + MateConfEntry *entry, gpointer user_data) { pluma_debug (DEBUG_PREFS); @@ -875,7 +875,7 @@ pluma_prefs_manager_tabs_size_changed (MateConfClient *client, tab_width = mateconf_value_get_int (entry->value); else tab_width = GPM_DEFAULT_TABS_SIZE; - + tab_width = CLAMP (tab_width, 1, 24); views = pluma_app_get_views (pluma_app_get_default ()); @@ -883,7 +883,7 @@ pluma_prefs_manager_tabs_size_changed (MateConfClient *client, while (l != NULL) { - gtk_source_view_set_tab_width (GTK_SOURCE_VIEW (l->data), + gtk_source_view_set_tab_width (GTK_SOURCE_VIEW (l->data), tab_width); l = l->next; @@ -898,7 +898,7 @@ pluma_prefs_manager_tabs_size_changed (MateConfClient *client, GList *l; if (entry->value->type == MATECONF_VALUE_BOOL) - enable = mateconf_value_get_bool (entry->value); + enable = mateconf_value_get_bool (entry->value); else enable = GPM_DEFAULT_INSERT_SPACES; @@ -908,7 +908,7 @@ pluma_prefs_manager_tabs_size_changed (MateConfClient *client, while (l != NULL) { gtk_source_view_set_insert_spaces_instead_of_tabs ( - GTK_SOURCE_VIEW (l->data), + GTK_SOURCE_VIEW (l->data), enable); l = l->next; @@ -918,13 +918,13 @@ pluma_prefs_manager_tabs_size_changed (MateConfClient *client, } } -static GtkWrapMode +static GtkWrapMode get_wrap_mode_from_string (const gchar* str) { GtkWrapMode res; g_return_val_if_fail (str != NULL, GTK_WRAP_WORD); - + if (strcmp (str, "GTK_WRAP_NONE") == 0) res = GTK_WRAP_NONE; else @@ -938,10 +938,10 @@ get_wrap_mode_from_string (const gchar* str) return res; } -static void +static void pluma_prefs_manager_wrap_mode_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data) { pluma_debug (DEBUG_PREFS); @@ -956,8 +956,8 @@ pluma_prefs_manager_wrap_mode_changed (MateConfClient *client, GList *l; if (entry->value->type == MATECONF_VALUE_STRING) - wrap_mode = - get_wrap_mode_from_string (mateconf_value_get_string (entry->value)); + wrap_mode = + get_wrap_mode_from_string (mateconf_value_get_string (entry->value)); else wrap_mode = get_wrap_mode_from_string (GPM_DEFAULT_WRAP_MODE); @@ -976,10 +976,10 @@ pluma_prefs_manager_wrap_mode_changed (MateConfClient *client, } } -static void +static void pluma_prefs_manager_line_numbers_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data) { pluma_debug (DEBUG_PREFS); @@ -994,7 +994,7 @@ pluma_prefs_manager_line_numbers_changed (MateConfClient *client, GList *l; if (entry->value->type == MATECONF_VALUE_BOOL) - dln = mateconf_value_get_bool (entry->value); + dln = mateconf_value_get_bool (entry->value); else dln = GPM_DEFAULT_DISPLAY_LINE_NUMBERS; @@ -1003,7 +1003,7 @@ pluma_prefs_manager_line_numbers_changed (MateConfClient *client, while (l != NULL) { - gtk_source_view_set_show_line_numbers (GTK_SOURCE_VIEW (l->data), + gtk_source_view_set_show_line_numbers (GTK_SOURCE_VIEW (l->data), dln); l = l->next; @@ -1013,10 +1013,10 @@ pluma_prefs_manager_line_numbers_changed (MateConfClient *client, } } -static void +static void pluma_prefs_manager_hl_current_line_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data) { pluma_debug (DEBUG_PREFS); @@ -1031,7 +1031,7 @@ pluma_prefs_manager_hl_current_line_changed (MateConfClient *client, GList *l; if (entry->value->type == MATECONF_VALUE_BOOL) - hl = mateconf_value_get_bool (entry->value); + hl = mateconf_value_get_bool (entry->value); else hl = GPM_DEFAULT_HIGHLIGHT_CURRENT_LINE; @@ -1040,7 +1040,7 @@ pluma_prefs_manager_hl_current_line_changed (MateConfClient *client, while (l != NULL) { - gtk_source_view_set_highlight_current_line (GTK_SOURCE_VIEW (l->data), + gtk_source_view_set_highlight_current_line (GTK_SOURCE_VIEW (l->data), hl); l = l->next; @@ -1050,10 +1050,10 @@ pluma_prefs_manager_hl_current_line_changed (MateConfClient *client, } } -static void +static void pluma_prefs_manager_bracket_matching_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data) { pluma_debug (DEBUG_PREFS); @@ -1087,10 +1087,10 @@ pluma_prefs_manager_bracket_matching_changed (MateConfClient *client, } } -static void +static void pluma_prefs_manager_auto_indent_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data) { pluma_debug (DEBUG_PREFS); @@ -1105,18 +1105,18 @@ pluma_prefs_manager_auto_indent_changed (MateConfClient *client, GList *l; if (entry->value->type == MATECONF_VALUE_BOOL) - enable = mateconf_value_get_bool (entry->value); + enable = mateconf_value_get_bool (entry->value); else enable = GPM_DEFAULT_AUTO_INDENT; - + views = pluma_app_get_views (pluma_app_get_default ()); l = views; while (l != NULL) - { - gtk_source_view_set_auto_indent (GTK_SOURCE_VIEW (l->data), + { + gtk_source_view_set_auto_indent (GTK_SOURCE_VIEW (l->data), enable); - + l = l->next; } @@ -1124,10 +1124,10 @@ pluma_prefs_manager_auto_indent_changed (MateConfClient *client, } } -static void +static void pluma_prefs_manager_undo_changed (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, + guint cnxn_id, + MateConfEntry *entry, gpointer user_data) { pluma_debug (DEBUG_PREFS); @@ -1145,15 +1145,15 @@ pluma_prefs_manager_undo_changed (MateConfClient *client, ul = mateconf_value_get_int (entry->value); else ul = GPM_DEFAULT_UNDO_ACTIONS_LIMIT; - + ul = CLAMP (ul, -1, 250); docs = pluma_app_get_documents (pluma_app_get_default ()); l = docs; - + while (l != NULL) { - gtk_source_buffer_set_max_undo_levels (GTK_SOURCE_BUFFER (l->data), + gtk_source_buffer_set_max_undo_levels (GTK_SOURCE_BUFFER (l->data), ul); l = l->next; @@ -1163,7 +1163,7 @@ pluma_prefs_manager_undo_changed (MateConfClient *client, } } -static void +static void pluma_prefs_manager_right_margin_changed (MateConfClient *client, guint cnxn_id, MateConfEntry *entry, @@ -1207,7 +1207,7 @@ pluma_prefs_manager_right_margin_changed (MateConfClient *client, GList *l; if (entry->value->type == MATECONF_VALUE_BOOL) - display = mateconf_value_get_bool (entry->value); + display = mateconf_value_get_bool (entry->value); else display = GPM_DEFAULT_DISPLAY_RIGHT_MARGIN; @@ -1263,8 +1263,8 @@ pluma_prefs_manager_smart_home_end_changed (MateConfClient *client, GList *l; if (entry->value->type == MATECONF_VALUE_STRING) - smart_he = - get_smart_home_end_from_string (mateconf_value_get_string (entry->value)); + smart_he = + get_smart_home_end_from_string (mateconf_value_get_string (entry->value)); else smart_he = get_smart_home_end_from_string (GPM_DEFAULT_SMART_HOME_END); @@ -1416,12 +1416,12 @@ pluma_prefs_manager_source_style_scheme_changed (MateConfClient *client, if (style == NULL) { g_warning ("Default style scheme '%s' not found, falling back to 'classic'", scheme); - + style = gtk_source_style_scheme_manager_get_scheme ( pluma_get_style_scheme_manager (), "classic"); - if (style == NULL) + if (style == NULL) { g_warning ("Style scheme 'classic' cannot be found, check your GtkSourceView installation."); return; @@ -1552,7 +1552,7 @@ pluma_prefs_manager_auto_save_changed (MateConfClient *client, } } -static void +static void pluma_prefs_manager_active_plugins_changed (MateConfClient *client, guint cnxn_id, MateConfEntry *entry, @@ -1565,7 +1565,7 @@ pluma_prefs_manager_active_plugins_changed (MateConfClient *client, if (strcmp (entry->key, GPM_ACTIVE_PLUGINS) == 0) { - if ((entry->value->type == MATECONF_VALUE_LIST) && + if ((entry->value->type == MATECONF_VALUE_LIST) && (mateconf_value_get_list_type (entry->value) == MATECONF_VALUE_STRING)) { PlumaPluginsEngine *engine; @@ -1599,22 +1599,22 @@ pluma_prefs_manager_lockdown_changed (MateConfClient *client, app = pluma_app_get_default (); if (strcmp (entry->key, GPM_LOCKDOWN_COMMAND_LINE) == 0) - _pluma_app_set_lockdown_bit (app, + _pluma_app_set_lockdown_bit (app, PLUMA_LOCKDOWN_COMMAND_LINE, locked); else if (strcmp (entry->key, GPM_LOCKDOWN_PRINTING) == 0) - _pluma_app_set_lockdown_bit (app, + _pluma_app_set_lockdown_bit (app, PLUMA_LOCKDOWN_PRINTING, locked); else if (strcmp (entry->key, GPM_LOCKDOWN_PRINT_SETUP) == 0) - _pluma_app_set_lockdown_bit (app, + _pluma_app_set_lockdown_bit (app, PLUMA_LOCKDOWN_PRINT_SETUP, locked); else if (strcmp (entry->key, GPM_LOCKDOWN_SAVE_TO_DISK) == 0) - _pluma_app_set_lockdown_bit (app, + _pluma_app_set_lockdown_bit (app, PLUMA_LOCKDOWN_SAVE_TO_DISK, locked); } diff --git a/pluma/pluma-prefs-manager.h b/pluma/pluma-prefs-manager.h index f14fa431..7786a701 100755 --- a/pluma/pluma-prefs-manager.h +++ b/pluma/pluma-prefs-manager.h @@ -3,7 +3,7 @@ * pluma-prefs-manager.h * This file is part of pluma * - * Copyright (C) 2002 Paolo Maggi + * Copyright (C) 2002 Paolo Maggi * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,14 +17,14 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. */ - + /* - * Modified by the pluma Team, 2002. See the AUTHORS file for a - * list of people on the pluma Team. - * See the ChangeLog files for a list of changes. + * Modified by the pluma Team, 2002. See the AUTHORS file for a + * list of people on the pluma Team. + * See the ChangeLog files for a list of changes. */ #ifndef __PLUMA_PREFS_MANAGER_H__ @@ -35,7 +35,7 @@ #include #include "pluma-app.h" -#define PLUMA_BASE_KEY "/apps/pluma-2" +#define PLUMA_BASE_KEY "/apps/pluma" #define GPM_PREFS_DIR PLUMA_BASE_KEY "/preferences" @@ -170,7 +170,7 @@ #define GPM_DEFAULT_DISPLAY_LINE_NUMBERS 0 /* FALSE */ #define GPM_DEFAULT_AUTO_DETECTED_ENCODINGS {"UTF-8", "CURRENT", "ISO-8859-15", NULL} - + #define GPM_DEFAULT_TOOLBAR_VISIBLE 1 /* TRUE */ #define GPM_DEFAULT_TOOLBAR_BUTTONS_STYLE "PLUMA_TOOLBAR_SYSTEM" #define GPM_DEFAULT_TOOLBAR_SHOW_TOOLTIPS 1 /* TRUE */ @@ -295,8 +295,8 @@ void pluma_prefs_manager_set_toolbar_visible (gboolean tv); gboolean pluma_prefs_manager_toolbar_visible_can_set (void); /* Toolbar buttons style */ -PlumaToolbarSetting pluma_prefs_manager_get_toolbar_buttons_style (void); -void pluma_prefs_manager_set_toolbar_buttons_style (PlumaToolbarSetting tbs); +PlumaToolbarSetting pluma_prefs_manager_get_toolbar_buttons_style (void); +void pluma_prefs_manager_set_toolbar_buttons_style (PlumaToolbarSetting tbs); gboolean pluma_prefs_manager_toolbar_buttons_style_can_set (void); /* Statusbar visible */ @@ -322,13 +322,13 @@ gboolean pluma_prefs_manager_print_syntax_hl_can_set (void); gboolean pluma_prefs_manager_get_print_header (void); void pluma_prefs_manager_set_print_header (gboolean ph); gboolean pluma_prefs_manager_print_header_can_set (void); - + /* Wrap mode while printing */ GtkWrapMode pluma_prefs_manager_get_print_wrap_mode (void); void pluma_prefs_manager_set_print_wrap_mode (GtkWrapMode pwm); gboolean pluma_prefs_manager_print_wrap_mode_can_set (void); -/* Print line numbers */ +/* Print line numbers */ gint pluma_prefs_manager_get_print_line_numbers (void); void pluma_prefs_manager_set_print_line_numbers (gint pln); gboolean pluma_prefs_manager_print_line_numbers_can_set (void); @@ -351,8 +351,8 @@ void pluma_prefs_manager_set_print_font_numbers (const gchar *font); gboolean pluma_prefs_manager_print_font_numbers_can_set (void); const gchar *pluma_prefs_manager_get_default_print_font_numbers (void); -/* Max number of files in "Recent Files" menu. - * This is configurable only using mateconftool or mateconf-editor +/* Max number of files in "Recent Files" menu. + * This is configurable only using mateconftool or mateconf-editor */ gint pluma_prefs_manager_get_max_recents (void); diff --git a/win32/build-installer.sh b/win32/build-installer.sh index 63cc3d27..fd3d07d5 100755 --- a/win32/build-installer.sh +++ b/win32/build-installer.sh @@ -219,22 +219,22 @@ cp -R "${_gtksourceview_prefix}/share/gtksourceview-2.0/language-specs" installe cp -R "${_gtksourceview_prefix}/share/gtksourceview-2.0/styles" installer/pluma/share/gtksourceview-2.0 || exit #GtkBuilder files and xml files -mkdir -p installer/pluma/share/pluma-2/ui || exit -cp "${_pluma_prefix}/share/pluma-2/ui/"* installer/pluma/share/pluma-2/ui || exit +mkdir -p installer/pluma/share/pluma/ui || exit +cp "${_pluma_prefix}/share/pluma/ui/"* installer/pluma/share/pluma/ui || exit #Icons & logo -mkdir -p installer/pluma/share/pluma-2/icons || exit -cp "${_pluma_prefix}/share/pluma-2/icons/pluma-plugin.png" installer/pluma/share/pluma-2/icons || exit -mkdir -p installer/pluma/share/pluma-2/logo || exit -cp "${_pluma_prefix}/share/pluma-2/logo/pluma-logo.png" installer/pluma/share/pluma-2/logo || exit +mkdir -p installer/pluma/share/pluma/icons || exit +cp "${_pluma_prefix}/share/pluma/icons/pluma-plugin.png" installer/pluma/share/pluma/icons || exit +mkdir -p installer/pluma/share/pluma/logo || exit +cp "${_pluma_prefix}/share/pluma/logo/pluma-logo.png" installer/pluma/share/pluma/logo || exit #Plugins -mkdir -p installer/pluma/share/pluma-2/plugins || exit -cp -R "${_pluma_prefix}/share/pluma-2/plugins/"* installer/pluma/share/pluma-2/plugins || exit -mkdir -p installer/pluma/lib/pluma-2/plugins || exit -cp -R "${_pluma_prefix}/lib/pluma-2/plugins/"* installer/pluma/lib/pluma-2/plugins || exit -mkdir -p installer/pluma/lib/pluma-2/plugin-loaders || exit -cp -R "${_pluma_prefix}/lib/pluma-2/plugin-loaders/"* installer/pluma/lib/pluma-2/plugin-loaders || exit +mkdir -p installer/pluma/share/pluma/plugins || exit +cp -R "${_pluma_prefix}/share/pluma/plugins/"* installer/pluma/share/pluma/plugins || exit +mkdir -p installer/pluma/lib/pluma/plugins || exit +cp -R "${_pluma_prefix}/lib/pluma/plugins/"* installer/pluma/lib/pluma/plugins || exit +mkdir -p installer/pluma/lib/pluma/plugin-loaders || exit +cp -R "${_pluma_prefix}/lib/pluma/plugin-loaders/"* installer/pluma/lib/pluma/plugin-loaders || exit #MateConf mkdir -p installer/pluma/etc/mateconf/schemas || exit -- cgit v1.2.1