DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Avoiding another warning

Browse Source
This commit is contained in:
Pierre Pronchery 2011-01-31 01:20:13 +00:00
parent 9e2be9211a
commit fb85fc1149
5 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
po/de.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Browser 0.1.4\n" "Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-31 02:17+0100\n" "POT-Creation-Date: 2011-01-31 02:20+0100\n"
"PO-Revision-Date: 2010-03-29 23:28+0200\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: English\n" "Language-Team: English\n"
@ -267,8 +267,8 @@ msgstr "Aktualisierung..."
msgid "New folder" msgid "New folder"
msgstr "Neu Ordner" msgstr "Neu Ordner"
#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1050 #: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1049
#: ../src/callbacks.c:1055 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/callbacks.c:1054 ../src/desktopicon.c:796 ../src/desktopicon.c:801
#: ../src/desktopicon.c:848 ../src/desktopicon.c:853 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853
msgid "Warning" msgid "Warning"
msgstr "Achtung" msgstr "Achtung"
@ -278,40 +278,40 @@ msgstr "Achtung"
msgid "Are you sure you want to delete %lu file(s)?" msgid "Are you sure you want to delete %lu file(s)?"
msgstr "" msgstr ""
#: ../src/callbacks.c:781 #: ../src/callbacks.c:780
msgid "New" msgid "New"
msgstr "Neu" msgstr "Neu"
#: ../src/callbacks.c:786 ../src/callbacks.c:790 ../src/desktop.c:334 #: ../src/callbacks.c:785 ../src/callbacks.c:789 ../src/desktop.c:334
msgid "Folder" msgid "Folder"
msgstr "Ordner" msgstr "Ordner"
#: ../src/callbacks.c:797 ../src/desktop.c:342 #: ../src/callbacks.c:796 ../src/desktop.c:342
msgid "Symbolic link..." msgid "Symbolic link..."
msgstr "" msgstr ""
#: ../src/callbacks.c:801 ../src/desktop.c:346 #: ../src/callbacks.c:800 ../src/desktop.c:346
msgid "Text file" msgid "Text file"
msgstr "" msgstr ""
#: ../src/callbacks.c:836 ../src/desktop.c:445 #: ../src/callbacks.c:835 ../src/desktop.c:445
msgid "New text file.txt" msgid "New text file.txt"
msgstr "" msgstr ""
#: ../src/callbacks.c:883 #: ../src/callbacks.c:882
msgid "Open in new _window" msgid "Open in new _window"
msgstr "Offnen in neue Fenster" msgstr "Offnen in neue Fenster"
#: ../src/callbacks.c:911 #: ../src/callbacks.c:910
msgid "_Unmount" msgid "_Unmount"
msgstr "" msgstr ""
#: ../src/callbacks.c:946 ../src/desktopicon.c:693 ../src/view.c:100 #: ../src/callbacks.c:945 ../src/desktopicon.c:693 ../src/view.c:100
#: ../src/view.c:111 #: ../src/view.c:111
msgid "Open _with..." msgid "Open _with..."
msgstr "Offnen _mit..." msgstr "Offnen _mit..."
#: ../src/callbacks.c:1054 ../src/desktopicon.c:800 #: ../src/callbacks.c:1053 ../src/desktopicon.c:800
msgid "Are you sure you want to execute this file?" msgid "Are you sure you want to execute this file?"
msgstr "" msgstr ""

24
po/es.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Browser 0.1.4\n" "Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-31 02:17+0100\n" "POT-Creation-Date: 2011-01-31 02:20+0100\n"
"PO-Revision-Date: 2010-03-30 01:04+0200\n" "PO-Revision-Date: 2010-03-30 01:04+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Spanish\n" "Language-Team: Spanish\n"
@ -267,8 +267,8 @@ msgstr ""
msgid "New folder" msgid "New folder"
msgstr "" msgstr ""
#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1050 #: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1049
#: ../src/callbacks.c:1055 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/callbacks.c:1054 ../src/desktopicon.c:796 ../src/desktopicon.c:801
#: ../src/desktopicon.c:848 ../src/desktopicon.c:853 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853
msgid "Warning" msgid "Warning"
msgstr "" msgstr ""
@ -278,40 +278,40 @@ msgstr ""
msgid "Are you sure you want to delete %lu file(s)?" msgid "Are you sure you want to delete %lu file(s)?"
msgstr "" msgstr ""
#: ../src/callbacks.c:781 #: ../src/callbacks.c:780
msgid "New" msgid "New"
msgstr "" msgstr ""
#: ../src/callbacks.c:786 ../src/callbacks.c:790 ../src/desktop.c:334 #: ../src/callbacks.c:785 ../src/callbacks.c:789 ../src/desktop.c:334
msgid "Folder" msgid "Folder"
msgstr "" msgstr ""
#: ../src/callbacks.c:797 ../src/desktop.c:342 #: ../src/callbacks.c:796 ../src/desktop.c:342
msgid "Symbolic link..." msgid "Symbolic link..."
msgstr "" msgstr ""
#: ../src/callbacks.c:801 ../src/desktop.c:346 #: ../src/callbacks.c:800 ../src/desktop.c:346
msgid "Text file" msgid "Text file"
msgstr "" msgstr ""
#: ../src/callbacks.c:836 ../src/desktop.c:445 #: ../src/callbacks.c:835 ../src/desktop.c:445
msgid "New text file.txt" msgid "New text file.txt"
msgstr "" msgstr ""
#: ../src/callbacks.c:883 #: ../src/callbacks.c:882
msgid "Open in new _window" msgid "Open in new _window"
msgstr "" msgstr ""
#: ../src/callbacks.c:911 #: ../src/callbacks.c:910
msgid "_Unmount" msgid "_Unmount"
msgstr "" msgstr ""
#: ../src/callbacks.c:946 ../src/desktopicon.c:693 ../src/view.c:100 #: ../src/callbacks.c:945 ../src/desktopicon.c:693 ../src/view.c:100
#: ../src/view.c:111 #: ../src/view.c:111
msgid "Open _with..." msgid "Open _with..."
msgstr "" msgstr ""
#: ../src/callbacks.c:1054 ../src/desktopicon.c:800 #: ../src/callbacks.c:1053 ../src/desktopicon.c:800
msgid "Are you sure you want to execute this file?" msgid "Are you sure you want to execute this file?"
msgstr "" msgstr ""

24
po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Browser 0.1.4\n" "Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-31 02:17+0100\n" "POT-Creation-Date: 2011-01-31 02:20+0100\n"
"PO-Revision-Date: 2010-03-29 23:28+0200\n" "PO-Revision-Date: 2010-03-29 23:28+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: French\n" "Language-Team: French\n"
@ -267,8 +267,8 @@ msgstr "Actualisation du dossier..."
msgid "New folder" msgid "New folder"
msgstr "Nouveau dossier" msgstr "Nouveau dossier"
#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1050 #: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1049
#: ../src/callbacks.c:1055 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/callbacks.c:1054 ../src/desktopicon.c:796 ../src/desktopicon.c:801
#: ../src/desktopicon.c:848 ../src/desktopicon.c:853 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853
msgid "Warning" msgid "Warning"
msgstr "Avertissement" msgstr "Avertissement"
@ -278,40 +278,40 @@ msgstr "Avertissement"
msgid "Are you sure you want to delete %lu file(s)?" msgid "Are you sure you want to delete %lu file(s)?"
msgstr "Voulez-vous vraiment effacer %lu fichier(s)?" msgstr "Voulez-vous vraiment effacer %lu fichier(s)?"
#: ../src/callbacks.c:781 #: ../src/callbacks.c:780
msgid "New" msgid "New"
msgstr "Nouveau" msgstr "Nouveau"
#: ../src/callbacks.c:786 ../src/callbacks.c:790 ../src/desktop.c:334 #: ../src/callbacks.c:785 ../src/callbacks.c:789 ../src/desktop.c:334
msgid "Folder" msgid "Folder"
msgstr "Dossier" msgstr "Dossier"
#: ../src/callbacks.c:797 ../src/desktop.c:342 #: ../src/callbacks.c:796 ../src/desktop.c:342
msgid "Symbolic link..." msgid "Symbolic link..."
msgstr "Lien symbolique..." msgstr "Lien symbolique..."
#: ../src/callbacks.c:801 ../src/desktop.c:346 #: ../src/callbacks.c:800 ../src/desktop.c:346
msgid "Text file" msgid "Text file"
msgstr "Fichier texte" msgstr "Fichier texte"
#: ../src/callbacks.c:836 ../src/desktop.c:445 #: ../src/callbacks.c:835 ../src/desktop.c:445
msgid "New text file.txt" msgid "New text file.txt"
msgstr "Nouveau fichier texte.txt" msgstr "Nouveau fichier texte.txt"
#: ../src/callbacks.c:883 #: ../src/callbacks.c:882
msgid "Open in new _window" msgid "Open in new _window"
msgstr "Ouvrir dans une _nouvelle fenêtre" msgstr "Ouvrir dans une _nouvelle fenêtre"
#: ../src/callbacks.c:911 #: ../src/callbacks.c:910
msgid "_Unmount" msgid "_Unmount"
msgstr "Démonter" msgstr "Démonter"
#: ../src/callbacks.c:946 ../src/desktopicon.c:693 ../src/view.c:100 #: ../src/callbacks.c:945 ../src/desktopicon.c:693 ../src/view.c:100
#: ../src/view.c:111 #: ../src/view.c:111
msgid "Open _with..." msgid "Open _with..."
msgstr "Ouvrir _avec..." msgstr "Ouvrir _avec..."
#: ../src/callbacks.c:1054 ../src/desktopicon.c:800 #: ../src/callbacks.c:1053 ../src/desktopicon.c:800
msgid "Are you sure you want to execute this file?" msgid "Are you sure you want to execute this file?"
msgstr "Voulez-vous vraiment exécuter ce fichier ?" msgstr "Voulez-vous vraiment exécuter ce fichier ?"

24
po/it.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Browser 0.1.4\n" "Project-Id-Version: Browser 0.1.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-31 02:17+0100\n" "POT-Creation-Date: 2011-01-31 02:20+0100\n"
"PO-Revision-Date: 2010-04-07 23:18+0200\n" "PO-Revision-Date: 2010-04-07 23:18+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Italian\n" "Language-Team: Italian\n"
@ -267,8 +267,8 @@ msgstr ""
msgid "New folder" msgid "New folder"
msgstr "" msgstr ""
#: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1050 #: ../src/callbacks.c:195 ../src/callbacks.c:201 ../src/callbacks.c:1049
#: ../src/callbacks.c:1055 ../src/desktopicon.c:796 ../src/desktopicon.c:801 #: ../src/callbacks.c:1054 ../src/desktopicon.c:796 ../src/desktopicon.c:801
#: ../src/desktopicon.c:848 ../src/desktopicon.c:853 #: ../src/desktopicon.c:848 ../src/desktopicon.c:853
msgid "Warning" msgid "Warning"
msgstr "" msgstr ""
@ -278,40 +278,40 @@ msgstr ""
msgid "Are you sure you want to delete %lu file(s)?" msgid "Are you sure you want to delete %lu file(s)?"
msgstr "" msgstr ""
#: ../src/callbacks.c:781 #: ../src/callbacks.c:780
msgid "New" msgid "New"
msgstr "" msgstr ""
#: ../src/callbacks.c:786 ../src/callbacks.c:790 ../src/desktop.c:334 #: ../src/callbacks.c:785 ../src/callbacks.c:789 ../src/desktop.c:334
msgid "Folder" msgid "Folder"
msgstr "" msgstr ""
#: ../src/callbacks.c:797 ../src/desktop.c:342 #: ../src/callbacks.c:796 ../src/desktop.c:342
msgid "Symbolic link..." msgid "Symbolic link..."
msgstr "" msgstr ""
#: ../src/callbacks.c:801 ../src/desktop.c:346 #: ../src/callbacks.c:800 ../src/desktop.c:346
msgid "Text file" msgid "Text file"
msgstr "" msgstr ""
#: ../src/callbacks.c:836 ../src/desktop.c:445 #: ../src/callbacks.c:835 ../src/desktop.c:445
msgid "New text file.txt" msgid "New text file.txt"
msgstr "" msgstr ""
#: ../src/callbacks.c:883 #: ../src/callbacks.c:882
msgid "Open in new _window" msgid "Open in new _window"
msgstr "" msgstr ""
#: ../src/callbacks.c:911 #: ../src/callbacks.c:910
msgid "_Unmount" msgid "_Unmount"
msgstr "" msgstr ""
#: ../src/callbacks.c:946 ../src/desktopicon.c:693 ../src/view.c:100 #: ../src/callbacks.c:945 ../src/desktopicon.c:693 ../src/view.c:100
#: ../src/view.c:111 #: ../src/view.c:111
msgid "Open _with..." msgid "Open _with..."
msgstr "" msgstr ""
#: ../src/callbacks.c:1054 ../src/desktopicon.c:800 #: ../src/callbacks.c:1053 ../src/desktopicon.c:800
msgid "Are you sure you want to execute this file?" msgid "Are you sure you want to execute this file?"
msgstr "" msgstr ""

17
src/callbacks.c
View File

@ -686,7 +686,6 @@ gboolean on_view_press(GtkWidget * widget, GdkEventButton * event,
{ {
static IconCallback ic; static IconCallback ic;
Browser * browser = data; Browser * browser = data;
GtkWidget * menu;
GtkTreePath * path = NULL; GtkTreePath * path = NULL;
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeSelection * sel; GtkTreeSelection * sel;
@ -696,9 +695,9 @@ gboolean on_view_press(GtkWidget * widget, GdkEventButton * event,
if(event->type != GDK_BUTTON_PRESS if(event->type != GDK_BUTTON_PRESS
|| (event->button != 3 && event->button != 0)) || (event->button != 3 && event->button != 0))
return FALSE; return FALSE;
menu = gtk_menu_new(); widget = gtk_menu_new();
/* FIXME prevents actions to be called but probably leaks memory /* FIXME prevents actions to be called but probably leaks memory
g_signal_connect(G_OBJECT(menu), "deactivate", G_CALLBACK( g_signal_connect(G_OBJECT(widget), "deactivate", G_CALLBACK(
gtk_widget_destroy), NULL); */ gtk_widget_destroy), NULL); */
#if GTK_CHECK_VERSION(2, 6, 0) #if GTK_CHECK_VERSION(2, 6, 0)
if(browser->iconview != NULL) if(browser->iconview != NULL)
@ -715,7 +714,7 @@ gboolean on_view_press(GtkWidget * widget, GdkEventButton * event,
ic.isexec = 0; ic.isexec = 0;
ic.path = NULL; ic.path = NULL;
if(path == NULL) if(path == NULL)
return _press_context(browser, event, menu, &ic); return _press_context(browser, event, widget, &ic);
/* FIXME error checking + sub-functions */ /* FIXME error checking + sub-functions */
gtk_tree_model_get_iter(GTK_TREE_MODEL(browser->store), &iter, path); gtk_tree_model_get_iter(GTK_TREE_MODEL(browser->store), &iter, path);
#if GTK_CHECK_VERSION(2, 6, 0) #if GTK_CHECK_VERSION(2, 6, 0)
@ -747,21 +746,21 @@ gboolean on_view_press(GtkWidget * widget, GdkEventButton * event,
BR_COL_IS_MOUNT_POINT, &ic.ismnt, BR_COL_MIME_TYPE, BR_COL_IS_MOUNT_POINT, &ic.ismnt, BR_COL_MIME_TYPE,
&mimetype, -1); &mimetype, -1);
if(ic.isdir == TRUE) if(ic.isdir == TRUE)
_press_directory(menu, &ic); _press_directory(widget, &ic);
else else
_press_file(browser, menu, mimetype, &ic); _press_file(browser, widget, mimetype, &ic);
g_free(mimetype); g_free(mimetype);
menuitem = gtk_separator_menu_item_new(); menuitem = gtk_separator_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(widget), menuitem);
menuitem = gtk_image_menu_item_new_from_stock( menuitem = gtk_image_menu_item_new_from_stock(
GTK_STOCK_PROPERTIES, NULL); GTK_STOCK_PROPERTIES, NULL);
g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK( g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK(
on_properties), browser); on_properties), browser);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(widget), menuitem);
#if !GTK_CHECK_VERSION(2, 6, 0) #if !GTK_CHECK_VERSION(2, 6, 0)
gtk_tree_path_free(path); gtk_tree_path_free(path);
#endif #endif
return _press_show(browser, event, menu); return _press_show(browser, event, widget);
} }
static void _on_popup_new_text_file(gpointer data); static void _on_popup_new_text_file(gpointer data);