SliTaz Repositories

1 Set Freedesktop standard icon

2

3 --- a/src/lxterminal.c

4 +++ b/src/lxterminal.c

5 @@ -577,14 +577,7 @@

6 NULL, GTK_RESPONSE_OK,

7 NULL);

8 gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);

9 - if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), "lxterminal"))

10 - {

11 - gtk_window_set_icon_name(GTK_WINDOW(dialog), "lxterminal");

12 - }

13 - else

14 - {

15 - gtk_window_set_icon_from_file(GTK_WINDOW(dialog), PACKAGE_DATA_DIR "/icons/hicolor/128x128/apps/lxterminal.png", NULL);

16 - }

17 + gtk_window_set_icon_name(GTK_WINDOW(dialog), "utilities-terminal");

18 g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(terminal_name_tab_response_event), term);

19 GtkWidget * dialog_item = gtk_entry_new();

20 g_object_set_data(G_OBJECT(dialog), "entry", (gpointer) dialog_item);

21 @@ -746,7 +739,7 @@

22 gtk_container_set_border_width(GTK_CONTAINER(about_dlg), 2);

23 gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about_dlg), VERSION);

24 gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG(about_dlg), _("LXTerminal"));

25 - gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about_dlg), gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR "/icons/hicolor/128x128/apps/lxterminal.png", NULL));

26 + gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(about_dlg), "utilities-terminal");

27 gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(about_dlg), _("Copyright (C) 2008-2017"));

28 gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(about_dlg), _("Terminal emulator for LXDE project"));

29 gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(about_dlg), "This program is free software; you can redistribute it and/or\nmodify it under the terms of the GNU General Public License\nas published by the Free Software Foundation; either version 2\nof the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.");

30 @@ -1490,15 +1483,7 @@

31 #endif

32

33 /* Set window icon. */

34 - if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), "lxterminal"))

35 - {

36 - gtk_window_set_icon_name(GTK_WINDOW(terminal->window), "lxterminal");

37 - }

38 - else

39 - {

40 - gtk_window_set_icon_from_file(GTK_WINDOW(terminal->window),

41 - PACKAGE_DATA_DIR "/icons/hicolor/128x128/apps/lxterminal.png", NULL);

42 - }

43 + gtk_window_set_icon_name(GTK_WINDOW(terminal->window), "utilities-terminal");

44 g_object_weak_ref(G_OBJECT(terminal->window), (GWeakNotify) terminal_window_exit, terminal);

45

46 /* Create a vertical box as the child of the toplevel window. */

47 --- a/src/preferences.c

48 +++ b/src/preferences.c

49 @@ -272,7 +272,7 @@

50

51 GtkDialog * dialog = GTK_DIALOG(gtk_builder_get_object(builder, "lxterminal_preferences"));

52 gtk_window_set_title(GTK_WINDOW(dialog), _("LXTerminal"));

53 - gtk_window_set_icon_from_file(GTK_WINDOW(dialog), PACKAGE_DATA_DIR "/icons/hicolor/128x128/apps/lxterminal.png", NULL);

54 + gtk_window_set_icon_name(GTK_WINDOW(dialog), "utilities-terminal");

55

56 GtkWidget * w = GTK_WIDGET(gtk_builder_get_object(builder, "terminal_font"));

57 gtk_font_button_set_font_name(GTK_FONT_BUTTON(w), setting->font_name);

58 --- a/data/lxterminal.desktop.in

59 +++ b/data/lxterminal.desktop.in

60 @@ -4,7 +4,7 @@

61 _Comment=Use the command line

62 TryExec=lxterminal

63 Exec=lxterminal

64 -Icon=lxterminal

65 +Icon=utilities-terminal

66 Type=Application

67 Categories=GTK;System;TerminalEmulator;

68 _Keywords=console;command line;execute;