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

Fix wifibrowser(1)

Browse Source
This commit is contained in:
Pierre Pronchery 2015-09-01 02:50:49 +02:00
parent 65ecefd9ec
commit b555283969
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/applets/wpa_supplicant.c
View File

@ -285,7 +285,8 @@ static WPA * _wpa_init(PanelAppletHelper * helper, GtkWidget ** widget)
_wpa_start(wpa); _wpa_start(wpa);
gtk_widget_show_all(hbox); gtk_widget_show_all(hbox);
pango_font_description_free(bold); pango_font_description_free(bold);
if(panel_window_get_type(helper->window) if(helper->window == NULL
|| panel_window_get_type(helper->window)
== PANEL_WINDOW_TYPE_NOTIFICATION) == PANEL_WINDOW_TYPE_NOTIFICATION)
wpa->widget = hbox; wpa->widget = hbox;
else else
@ -397,7 +398,9 @@ static void _wpa_set_status(WPA * wpa, gboolean connected, gboolean associated,
fprintf(stderr, "DEBUG: %s(%u, %u, \"%s\")\n", __func__, connected, fprintf(stderr, "DEBUG: %s(%u, %u, \"%s\")\n", __func__, connected,
associated, network); associated, network);
#endif #endif
iconsize = panel_window_get_icon_size(wpa->helper->window); iconsize = (wpa->helper->window != NULL)
? panel_window_get_icon_size(wpa->helper->window)
: GTK_ICON_SIZE_SMALL_TOOLBAR;
gtk_icon_size_lookup(iconsize, &size, &size); gtk_icon_size_lookup(iconsize, &size, &size);
if(connected == FALSE && network == NULL) if(connected == FALSE && network == NULL)
{ {

14
src/project.conf
View File

@ -1,14 +1,14 @@
targets=libPanel,panel,panelctl,run targets=libPanel,panel,panelctl,run
#cppflags=-D EMBEDDED #cppflags=-D EMBEDDED
cflags_force=-W cflags=-W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
cflags=-Wall -g -O2 -pedantic -fPIC -fstack-protector ldflags_force=-Wl,-z,relro -Wl,-z,now
dist=Makefile,helper.c,panel.h,window.h dist=Makefile,helper.c,panel.h,window.h
[libPanel] [libPanel]
type=library type=library
sources=panel.c,window.c sources=panel.c,window.c
cppflags=-D PREFIX=\"$(PREFIX)\" cppflags=-D PREFIX=\"$(PREFIX)\"
cflags=`pkg-config --cflags libDesktop` cflags=`pkg-config --cflags libDesktop` -fPIC
ldflags=`pkg-config --libs libDesktop` -lintl ldflags=`pkg-config --libs libDesktop` -lintl
install=$(LIBDIR) install=$(LIBDIR)
@ -17,8 +17,8 @@ type=binary
depends=$(OBJDIR)libPanel.a depends=$(OBJDIR)libPanel.a
sources=main.c sources=main.c
cppflags=-D PREFIX=\"$(PREFIX)\" cppflags=-D PREFIX=\"$(PREFIX)\"
cflags=`pkg-config --cflags libDesktop` cflags=`pkg-config --cflags libDesktop` -fPIE
ldflags=`pkg-config --libs libDesktop` -lintl -L. -L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lPanel -Wl,-pie ldflags=`pkg-config --libs libDesktop` -lintl -L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lPanel -Wl,-pie
install=$(BINDIR) install=$(BINDIR)
[main.c] [main.c]
@ -33,7 +33,7 @@ depends=../include/Panel.h,panel.h,window.h
[panelctl] [panelctl]
type=binary type=binary
sources=panelctl.c sources=panelctl.c
cflags=`pkg-config --cflags libDesktop` cflags=`pkg-config --cflags libDesktop` -fPIE
ldflags=`pkg-config --libs libDesktop` -lintl -Wl,-pie ldflags=`pkg-config --libs libDesktop` -lintl -Wl,-pie
install=$(BINDIR) install=$(BINDIR)
@ -44,7 +44,7 @@ depends=../include/Panel.h,panel.h,../config.h
type=binary type=binary
sources=run.c sources=run.c
cppflags=-D PREFIX=\"$(PREFIX)\" cppflags=-D PREFIX=\"$(PREFIX)\"
cflags=`pkg-config --cflags libSystem gtk+-2.0` cflags=`pkg-config --cflags libSystem gtk+-2.0` -fPIE
ldflags=`pkg-config --libs libSystem gtk+-2.0` -lintl -Wl,-pie ldflags=`pkg-config --libs libSystem gtk+-2.0` -lintl -Wl,-pie
#for Gtk+ 3 #for Gtk+ 3
#cflags=`pkg-config --cflags libSystem gtk+-3.0` #cflags=`pkg-config --cflags libSystem gtk+-3.0`

8
tests/project.conf
View File

@ -1,9 +1,9 @@
targets=applets,applets2,tests.log targets=applets,applets2,tests.log
cppflags_force=-I ../include cppflags_force=-I ../include
cflags_force=-W `pkg-config --cflags libDesktop` cflags_force=`pkg-config --cflags libDesktop`
cflags=-Wall -g -O2 -pedantic -fPIC -fstack-protector cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
ldflags_force=-W `pkg-config --libs libDesktop` ldflags_force=`pkg-config --libs libDesktop`
ldflags=-Wl,-pie ldflags=-Wl,-pie -Wl,-z,relro -Wl,-z,now
dist=Makefile,tests.sh dist=Makefile,tests.sh
[applets] [applets]

6
tools/project.conf
View File

@ -1,8 +1,8 @@
targets=panel-embed,panel-message,panel-notify,panel-test,settings,wifibrowser targets=panel-embed,panel-message,panel-notify,panel-test,settings,wifibrowser
cflags_force=-W `pkg-config --cflags libDesktop` cflags_force=`pkg-config --cflags libDesktop`
cflags=-Wall -g -O2 -pedantic -fPIC -fstack-protector cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
ldflags_force=`pkg-config --libs libDesktop` ldflags_force=`pkg-config --libs libDesktop`
ldflags=-Wl,-pie ldflags=-Wl,-pie -Wl,-z,relro -Wl,-z,now
dist=Makefile,helper.c dist=Makefile,helper.c
[panel-embed] [panel-embed]