]> git.pld-linux.org Git - packages/xfce4-places-plugin.git/blame - xfce4-places-plugin-ui.patch
projects / packages / xfce4-places-plugin.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- rel 5
[packages/xfce4-places-plugin.git] / xfce4-places-plugin-ui.patch
CommitLineData
5392fcf7
JR		 1diff -ur xfce4-places-plugin-1.2.0/configure.in xfce4-places-plugin-1.2.0-ui/configure.in
2--- xfce4-places-plugin-1.2.0/configure.in 2011-02-19 19:56:33.307345133 +0100
3+++ xfce4-places-plugin-1.2.0-ui/configure.in 2011-02-19 18:48:59.894090914 +0100
4@@ -22,8 +22,8 @@
5 dnl check for required packages
6 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
7 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
8-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
9-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90.2])
10+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
11+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
12 XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.3.2])
13 XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
14
15diff -ur xfce4-places-plugin-1.2.0/panel-plugin/button.c xfce4-places-plugin-1.2.0-ui/panel-plugin/button.c
16--- xfce4-places-plugin-1.2.0/panel-plugin/button.c 2009-07-31 07:10:48.000000000 +0200
17+++ xfce4-places-plugin-1.2.0-ui/panel-plugin/button.c 2011-02-19 18:45:53.391090938 +0100
18@@ -50,8 +50,7 @@
19 #endif
20
21 #include <gtk/gtk.h>
22-#include <libxfce4panel/xfce-panel-plugin.h>
23-#include <libxfce4panel/xfce-hvbox.h>
24+#include <libxfce4panel/libxfce4panel.h>
25 #include <string.h>
26
27 #define EXO_API_SUBJECT_TO_CHANGE
28diff -ur xfce4-places-plugin-1.2.0/panel-plugin/cfg.c xfce4-places-plugin-1.2.0-ui/panel-plugin/cfg.c
29--- xfce4-places-plugin-1.2.0/panel-plugin/cfg.c 2009-05-28 05:05:53.000000000 +0200
30+++ xfce4-places-plugin-1.2.0-ui/panel-plugin/cfg.c 2011-02-19 19:02:27.147992840 +0100
31@@ -28,9 +28,8 @@
32 #include <gtk/gtk.h>
33
34 #include <libxfce4util/libxfce4util.h>
35-#include <libxfce4panel/xfce-panel-plugin.h>
36-#include <libxfce4panel/xfce-panel-convenience.h>
37-#include <libxfcegui4/libxfcegui4.h>
38+#include <libxfce4panel/libxfce4panel.h>
39+#include <libxfce4ui/libxfce4ui.h>
40
41 #include "cfg.h"
42 #include "view.h"
43@@ -344,7 +343,7 @@
44 vbox_button = gtk_vbox_new(FALSE, 4);
45 gtk_widget_show(vbox_button);
46
47- frame_button = xfce_create_framebox_with_content(_("Button"), vbox_button);
48+ frame_button = xfce_gtk_frame_box_new_with_content(_("Button"), vbox_button);
49 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame_button, FALSE, FALSE, 0);
50
51
52@@ -401,7 +400,7 @@
53 vbox_menu = gtk_vbox_new(FALSE, 4);
54 gtk_widget_show(vbox_menu);
55
56- frame_menu = xfce_create_framebox_with_content(_("Menu"), vbox_menu);
57+ frame_menu = xfce_gtk_frame_box_new_with_content(_("Menu"), vbox_menu);
58 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame_menu, FALSE, FALSE, 0);
59
60 /* MENU: Show Icons */
61@@ -483,7 +482,7 @@
62 gtk_widget_set_sensitive(vbox_recent, cfg->show_recent);
63 g_object_set_data(G_OBJECT(tmp_widget), "cfg_transient", vbox_recent);
64
65- frame_recent = xfce_create_framebox_with_content(_("Recent Documents"), vbox_recent);
66+ frame_recent = xfce_gtk_frame_box_new_with_content(_("Recent Documents"), vbox_recent);
67 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame_recent, FALSE, FALSE, 0);
68
69 /* RECENT DOCUMENTS: Show clear option */
70@@ -522,7 +521,7 @@
71 vbox_search = gtk_vbox_new(FALSE, 4);
72 gtk_widget_show(vbox_search);
73
74- frame_search = xfce_create_framebox_with_content(_("Search"), vbox_search);
75+ frame_search = xfce_gtk_frame_box_new_with_content(_("Search"), vbox_search);
76 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame_search, FALSE, FALSE, 0);
77
78 /* Search: command */
79@@ -543,7 +543,7 @@
80 gtk_widget_show(tmp_widget);
81 gtk_box_pack_start(GTK_BOX(tmp_box), tmp_widget, FALSE, FALSE, 0);
82
83- gtk_widget_show(dlg);
84+ gtk_widget_show_all(dlg);
85 }
86
87 /********** Initialization & Finalization **********/
88diff -ur xfce4-places-plugin-1.2.0/panel-plugin/cfg.h xfce4-places-plugin-1.2.0-ui/panel-plugin/cfg.h
89--- xfce4-places-plugin-1.2.0/panel-plugin/cfg.h 2008-01-09 02:20:42.000000000 +0100
90+++ xfce4-places-plugin-1.2.0-ui/panel-plugin/cfg.h 2011-02-19 18:46:21.145090935 +0100
91@@ -23,7 +23,7 @@
92 #define _XFCE_PANEL_PLACES_CFG_H
93
94 #include <glib.h>
95-#include <libxfce4panel/xfce-panel-plugin.h>
96+#include <libxfce4panel/libxfce4panel.h>
97 #include "view.h"
98
99 typedef struct
100diff -ur xfce4-places-plugin-1.2.0/panel-plugin/Makefile.am xfce4-places-plugin-1.2.0-ui/panel-plugin/Makefile.am
101--- xfce4-places-plugin-1.2.0/panel-plugin/Makefile.am 2008-11-23 12:07:43.000000000 +0100
102+++ xfce4-places-plugin-1.2.0-ui/panel-plugin/Makefile.am 2011-02-19 18:50:18.926090915 +0100
103@@ -50,14 +50,14 @@
104 -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
105 $(GTK_CFLAGS) \
106 $(LIBXFCE4UTIL_CFLAGS) \
107- $(LIBXFCEGUI4_CFLAGS) \
108+ $(LIBXFCE4UI_CFLAGS) \
109 $(LIBXFCE4PANEL_CFLAGS) \
110 $(THUNAR_VFS_CFLAGS) \
111 $(PLATFORM_CFLAGS)
112
113 xfce4_places_plugin_LDADD = \
114 $(LIBXFCE4UTIL_LIBS) \
115- $(LIBXFCEGUI4_LIBS) \
116+ $(LIBXFCE4UI_LIBS) \
117 $(LIBXFCE4PANEL_LIBS) \
118 @THUNAR_VFS_LIBS@
119
120diff -ur xfce4-places-plugin-1.2.0/panel-plugin/places.c xfce4-places-plugin-1.2.0-ui/panel-plugin/places.c
121--- xfce4-places-plugin-1.2.0/panel-plugin/places.c 2008-01-09 02:20:42.000000000 +0100
122+++ xfce4-places-plugin-1.2.0-ui/panel-plugin/places.c 2011-02-19 18:46:45.605090908 +0100
123@@ -26,7 +26,7 @@
124 #include <glib.h>
125
126 #include <libxfce4util/libxfce4util.h>
127-#include <libxfce4panel/xfce-panel-plugin.h>
128+#include <libxfce4panel/libxfce4panel.h>
129
130 #include "places.h"
131 #include "view.h"
132diff -ur xfce4-places-plugin-1.2.0/panel-plugin/support.c xfce4-places-plugin-1.2.0-ui/panel-plugin/support.c
133--- xfce4-places-plugin-1.2.0/panel-plugin/support.c 2011-02-19 19:56:33.295345133 +0100
134+++ xfce4-places-plugin-1.2.0-ui/panel-plugin/support.c 2011-02-19 18:55:40.248090913 +0100
135@@ -29,7 +29,7 @@
136 #include <glib.h>
137
138 #include <libxfce4util/libxfce4util.h>
139-#include <libxfcegui4/libxfcegui4.h>
140+#include <libxfce4ui/libxfce4ui.h>
141
142 #define EXO_API_SUBJECT_TO_CHANGE
143 #include <exo/exo.h>
144@@ -125,7 +125,8 @@
145 places_gui_exec(const gchar *cmd)
146 {
147 if(cmd != NULL && *cmd != '\0')
148- xfce_exec(cmd, FALSE, TRUE, NULL);
149+ xfce_spawn_command_line_on_screen(gdk_screen_get_default(),
150+ cmd, FALSE, TRUE, NULL);
151 }
152
153 static void
154diff -ur xfce4-places-plugin-1.2.0/panel-plugin/view.c xfce4-places-plugin-1.2.0-ui/panel-plugin/view.c
155--- xfce4-places-plugin-1.2.0/panel-plugin/view.c 2009-07-31 07:10:48.000000000 +0200
156+++ xfce4-places-plugin-1.2.0-ui/panel-plugin/view.c 2011-02-19 19:55:56.765345098 +0100
157@@ -49,10 +49,8 @@
158 #define USE_GTK_TOOLTIP_API GTK_CHECK_VERSION(2,12,0)
159
160 #include <libxfce4util/libxfce4util.h>
161-#include <libxfce4panel/xfce-panel-plugin.h>
162-#include <libxfce4panel/xfce-panel-convenience.h>
163-#include <libxfce4panel/xfce-hvbox.h>
164-#include <libxfcegui4/libxfcegui4.h>
165+#include <libxfce4panel/libxfce4panel.h>
166+#include <libxfce4ui/libxfce4ui.h>
167
168 #define EXO_API_SUBJECT_TO_CHANGE
169 #include <exo/exo.h>
170@@ -511,7 +509,7 @@
171 icon_size = MAX(width, height);
172 else
173 icon_size = 32;
174- pb = xfce_themed_icon_load(bookmark->icon, icon_size);
175+ pb = xfce_panel_pixbuf_from_source(bookmark->icon, NULL, icon_size);
176
177 if(G_LIKELY(pb != NULL)){
178 image = gtk_image_new_from_pixbuf(pb);
179@@ -739,7 +737,19 @@
180 static GdkPixbuf*
181 pview_pixbuf_factory(gint size)
182 {
183- return xfce_themed_icon_load_category(2, size);
184+ static const gchar *icons[] = { "system-file-manager",
185+ "xfce-filemanager",
186+ "file-manager",
187+ "folder",
188+ NULL };
189+ int i = 0;
190+ GdkPixbuf *pb = NULL;
191+
192+ while (icons[i] && !pb) {
193+ pb = xfce_panel_pixbuf_from_source(icons[i], NULL, size);
194+ i++;
195+ }
196+ return pb;
197 }
198
199 static void
200diff -ur xfce4-places-plugin-1.2.0/panel-plugin/view.h xfce4-places-plugin-1.2.0-ui/panel-plugin/view.h
201--- xfce4-places-plugin-1.2.0/panel-plugin/view.h 2008-01-09 02:20:42.000000000 +0100
202+++ xfce4-places-plugin-1.2.0-ui/panel-plugin/view.h 2011-02-19 18:47:20.404090918 +0100
203@@ -25,7 +25,7 @@
204
205 #include <glib.h>
206 #include <gtk/gtk.h>
207-#include <libxfce4panel/xfce-panel-plugin.h>
208+#include <libxfce4panel/libxfce4panel.h>
209
210 #define USE_RECENT_DOCUMENTS GTK_CHECK_VERSION(2,10,0)
211
A places plugin for the Xfce panel
This page took 0.129645 seconds and 4 git commands to generate.