Magellan Linux

Contents of /trunk/thunar-media-tags-plugin/patches/thunar-media-tags-plugin-0.1.2_git20111117-newtooltip-api-2.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1578 - (show annotations) (download)
Fri Nov 25 14:38:19 2011 UTC (12 years, 5 months ago) by niro
File size: 7934 byte(s)
-fixed thunar depends
1 diff -Naur thunar-media-tags-plugin-0.1.2_git20111117/configure.in.in thunar-media-tags-plugin-0.1.2_git20111117-magellan/configure.in.in
2 --- thunar-media-tags-plugin-0.1.2_git20111117/configure.in.in 2011-11-14 11:15:28.000000000 +0100
3 +++ thunar-media-tags-plugin-0.1.2_git20111117-magellan/configure.in.in 2011-11-25 16:21:11.282983350 +0100
4 @@ -64,9 +64,9 @@
5 dnl ***********************************
6 dnl *** Check for required packages ***
7 dnl ***********************************
8 -XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.3])
9 -XDT_CHECK_PACKAGE([THUNARX], [thunarx-1], [0.2.3svn-r20526])
10 -XDT_CHECK_PACKAGE([THUNARVFS], [thunar-vfs-1], [0.2.3svn-r20526])
11 +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
12 +XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
13 +XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [1.2.0])
14 XDT_CHECK_PACKAGE([TAGLIB], [taglib], [1.4])
15
16 dnl ***********************************
17 diff -Naur thunar-media-tags-plugin-0.1.2_git20111117/thunar-plugin/audio-tags-page.c thunar-media-tags-plugin-0.1.2_git20111117-magellan/thunar-plugin/audio-tags-page.c
18 --- thunar-media-tags-plugin-0.1.2_git20111117/thunar-plugin/audio-tags-page.c 2011-11-14 11:15:28.000000000 +0100
19 +++ thunar-media-tags-plugin-0.1.2_git20111117-magellan/thunar-plugin/audio-tags-page.c 2011-11-25 16:11:09.549983102 +0100
20 @@ -90,7 +90,6 @@
21 ThunarxPropertyPage __parent__;
22
23 /* Widgets */
24 - GtkTooltips *tooltips;
25 GtkWidget *table;
26 GtkWidget *save_button;
27 GtkWidget *info_button;
28 @@ -282,10 +281,6 @@
29
30 gtk_container_set_border_width (GTK_CONTAINER (page), 8);
31
32 - /* Allocate the shared tooltips */
33 - page->tooltips = gtk_tooltips_new ();
34 - exo_gtk_object_ref_sink (GTK_OBJECT (page->tooltips));
35 -
36 /* Main container */
37 vbox = gtk_vbox_new (FALSE, 8);
38 gtk_container_add (GTK_CONTAINER (page), vbox);
39 @@ -317,7 +312,7 @@
40 /* Track spin button */
41 spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 0.0, 0);
42 exo_mutual_binding_new (G_OBJECT (adjustment), "value", G_OBJECT (page), "track");
43 - gtk_tooltips_set_tip (page->tooltips, spin, _("Enter the track number here."), NULL);
44 + gtk_widget_set_tooltip_text (GTK_WIDGET (spin), _("Enter the track number here."));
45 gtk_container_add (GTK_CONTAINER (alignment), spin);
46 gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
47 gtk_widget_show (spin);
48 @@ -340,7 +335,7 @@
49 /* Year spin button */
50 spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0);
51 exo_mutual_binding_new (G_OBJECT (adjustment), "value", G_OBJECT (page), "year");
52 - gtk_tooltips_set_tip (page->tooltips, spin, _("Enter the release year here."), NULL);
53 + gtk_widget_set_tooltip_text (GTK_WIDGET (spin), _("Enter the release year here."));
54 gtk_container_add (GTK_CONTAINER (alignment), spin);
55 gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
56 gtk_widget_show (spin);
57 @@ -355,7 +350,7 @@
58 /* Artist entry */
59 entry = gtk_entry_new ();
60 exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "artist");
61 - gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the name of the artist or author of this file here."), NULL);
62 + gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the name of the artist or author of this file here."));
63 gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
64 gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
65 gtk_widget_show (entry);
66 @@ -370,7 +365,7 @@
67 /* Title entry */
68 entry = gtk_entry_new ();
69 exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "title");
70 - gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the song title here."), NULL);
71 + gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the song title here."));
72 gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);
73 gtk_widget_show (entry);
74
75 @@ -384,7 +379,7 @@
76 /* Album entry */
77 entry = gtk_entry_new ();
78 exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "album");
79 - gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the album/record title here."), NULL);
80 + gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the album/record title here."));
81 gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 3, 4, GTK_EXPAND | GTK_FILL, 0, 0, 0);
82 gtk_widget_show (entry);
83
84 @@ -398,7 +393,7 @@
85 /* Comment entry */
86 entry = gtk_entry_new ();
87 exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "comment");
88 - gtk_tooltips_set_tip (page->tooltips, entry, _("Enter your comments here."), NULL);
89 + gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter your comments here."));
90 gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 4, 5, GTK_EXPAND | GTK_FILL, 0, 0, 0);
91 gtk_widget_show (entry);
92
93 @@ -412,7 +407,7 @@
94 /* Genre combo box */
95 combo = gtk_combo_box_entry_new_text ();
96 exo_mutual_binding_new (G_OBJECT (GTK_BIN (combo)->child), "text", G_OBJECT (page), "genre");
97 - gtk_tooltips_set_tip (page->tooltips, combo, _("Select or enter the genre of this song here."), NULL);
98 + gtk_widget_set_tooltip_text (GTK_WIDGET (combo), _("Select or enter the genre of this song here."));
99 gtk_table_attach (GTK_TABLE (page->table), combo, 1, 4, 5, 6, GTK_FILL, 0, 0, 0);
100 gtk_widget_show (combo);
101
102 @@ -512,9 +507,6 @@
103 if (G_LIKELY (page->genre != NULL))
104 g_free (page->genre);
105
106 - /* Release the tooltips */
107 - g_object_unref (G_OBJECT (page->tooltips));
108 -
109 (*G_OBJECT_CLASS (audio_tags_page_parent_class)->finalize) (object);
110 }
111
112 diff -Naur thunar-media-tags-plugin-0.1.2_git20111117/thunar-plugin/tag-renamer.c thunar-media-tags-plugin-0.1.2_git20111117-magellan/thunar-plugin/tag-renamer.c
113 --- thunar-media-tags-plugin-0.1.2_git20111117/thunar-plugin/tag-renamer.c 2011-11-14 11:15:28.000000000 +0100
114 +++ thunar-media-tags-plugin-0.1.2_git20111117-magellan/thunar-plugin/tag-renamer.c 2011-11-25 16:13:12.343982936 +0100
115 @@ -132,9 +132,6 @@
116 {
117 ThunarxRenamer __parent__;
118
119 - /* Widgets */
120 - GtkTooltips *tooltips;
121 -
122 /* Properties */
123 TagRenamerFormat format;
124 gchar *text;
125 @@ -238,10 +235,6 @@
126 GtkTreeIter iter;
127 gint n;
128
129 - /* Allocate shared tooltips */
130 - tag_renamer->tooltips = gtk_tooltips_new ();
131 - exo_gtk_object_ref_sink (GTK_OBJECT (tag_renamer->tooltips));
132 -
133 table = gtk_table_new (2, 4, FALSE);
134 gtk_table_set_row_spacings (GTK_TABLE (table), 6);
135 gtk_table_set_col_spacings (GTK_TABLE (table), 12);
136 @@ -320,14 +313,14 @@
137
138 button = gtk_check_button_new_with_mnemonic (_("_Underscores"));
139 exo_mutual_binding_new (G_OBJECT (button), "active", G_OBJECT (tag_renamer), "replace-spaces");
140 - gtk_tooltips_set_tip (tag_renamer->tooltips, button, _("Activating this option will replace all spaces in the target filename "
141 - "with underscores."), NULL);
142 + gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("Activating this option will replace all spaces in the target filename "
143 + "with underscores."));
144 gtk_table_attach (GTK_TABLE (table), button, 3, 4, 0, 1, GTK_FILL, 0, 0, 0);
145 gtk_widget_show (button);
146
147 button = gtk_check_button_new_with_mnemonic (_("_Lowercase"));
148 exo_mutual_binding_new (G_OBJECT (button), "active", G_OBJECT (tag_renamer), "lowercase");
149 - gtk_tooltips_set_tip (tag_renamer->tooltips, button, _("If you activate this, the resulting filename will only contain lowercase letters."), NULL);
150 + gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("If you activate this, the resulting filename will only contain lowercase letters."));
151 gtk_table_attach (GTK_TABLE (table), button, 3, 4, 1, 2, GTK_FILL, 0, 0, 0);
152 gtk_widget_show (button);
153 }
154 @@ -341,9 +334,6 @@
155 {
156 TagRenamer *tag_renamer = TAG_RENAMER (object);
157
158 - /* release the tooltips */
159 - g_object_unref (G_OBJECT (tag_renamer->tooltips));
160 -
161 /* Free string */
162 g_free (tag_renamer->text);
163