Magellan Linux

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

Parent Directory Parent Directory | Revision Log Revision Log


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