formatting pass
This commit is contained in:
		
							parent
							
								
									0f940a7460
								
							
						
					
					
						commit
						8907cbb063
					
				
							
								
								
									
										4
									
								
								config.h
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								config.h
									
									
									
									
									
								
							|  | @ -40,8 +40,8 @@ To remove plugins completely; | ||||||
| 	"enable-smooth-scrolling", false, \ | 	"enable-smooth-scrolling", false, \ | ||||||
|     "default-charset", "utf-8" |     "default-charset", "utf-8" | ||||||
| /* CACHE */ | /* CACHE */ | ||||||
| #define CACHE_DIR "/home/nuno/.cache/rose" | #define DATA_DIR "/home/nuno/.cache/rose" | ||||||
| #define DATA_MANAGER_OPTS "base-cache-directory", CACHE_DIR, "base-data-directory", CACHE_DIR, | #define DATA_MANAGER_OPTS "base-cache-directory", DATA_DIR, "base-data-directory", DATA_DIR | ||||||
| 
 | 
 | ||||||
| // GTK 
 | // GTK 
 | ||||||
| #define GTK_SETTINGS_CONFIG_H "gtk-application-prefer-dark-theme", false, "gtk-enable-animations", false | #define GTK_SETTINGS_CONFIG_H "gtk-application-prefer-dark-theme", false, "gtk-enable-animations", false | ||||||
|  |  | ||||||
							
								
								
									
										15
									
								
								makefile
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								makefile
									
									
									
									
									
								
							|  | @ -31,8 +31,8 @@ FORMATTER=clang-format -i -style=$(STYLE_BLUEPRINT) | ||||||
| # Change hardcoded paths when building
 | # Change hardcoded paths when building
 | ||||||
| ## Cache
 | ## Cache
 | ||||||
| USER=`whoami` | USER=`whoami` | ||||||
| DEFAULT_CACHE_DIR=/home/loki/.cache/rose | DEFAULT_DATA_DIR=/home/nuno/.cache/rose | ||||||
| CURRENT_CACHE_DIR=/home/$(USER)/.cache/rose | CURRENT_DATA_DIR=/home/$(USER)/.cache/rose | ||||||
| ## dir
 | ## dir
 | ||||||
| DEFAULT_DIR=/home/loki/Documents/core/software/fresh/C/rose-browser/rosenrot | DEFAULT_DIR=/home/loki/Documents/core/software/fresh/C/rose-browser/rosenrot | ||||||
| CURRENT_DIR=`pwd` | CURRENT_DIR=`pwd` | ||||||
|  | @ -42,10 +42,10 @@ build: $(SRC) $(PLUGINS) $(CONFIG) | ||||||
| 	cd plugins/readability/ && sh recompute_READABILITY_N.sh | 	cd plugins/readability/ && sh recompute_READABILITY_N.sh | ||||||
| 	cd plugins/style && sh recompute_STYLE_N.sh  | 	cd plugins/style && sh recompute_STYLE_N.sh  | ||||||
| 	# Make cache | 	# Make cache | ||||||
| 	mkdir -p $(CURRENT_CACHE_DIR) | 	mkdir -p $(CURRENT_DATA_DIR) | ||||||
| 	# Hardcode cache path | 	# Hardcode cache path | ||||||
| 	find $(CURRENT_DIR) -type f -not -path "*.git*" -not -path "*makefile*" -exec \
 | 	find $(CURRENT_DIR) -type f -not -path "*.git*" -not -path "*makefile*" -exec \
 | ||||||
| 		sed -i "s|$(DEFAULT_CACHE_DIR)|$(CURRENT_CACHE_DIR)|g" {} + | 		sed -i "s|$(DEFAULT_DATA_DIR)|$(CURRENT_DATA_DIR)|g" {} + | ||||||
| 	# Hardcode git repository path | 	# Hardcode git repository path | ||||||
| 	find $(CURRENT_DIR) -type f -not -path "*.git*" -not -path "*makefile*" -exec \
 | 	find $(CURRENT_DIR) -type f -not -path "*.git*" -not -path "*makefile*" -exec \
 | ||||||
| 		sed -i "s|$(DEFAULT_DIR)|$(CURRENT_DIR)|g" {} + | 		sed -i "s|$(DEFAULT_DIR)|$(CURRENT_DIR)|g" {} + | ||||||
|  | @ -82,11 +82,14 @@ uninstall: | ||||||
| 	rm -r /usr/share/themes/rose | 	rm -r /usr/share/themes/rose | ||||||
| 	rm /usr/bin/rose | 	rm /usr/bin/rose | ||||||
| 	rm /usr/bin/rose-mklink | 	rm /usr/bin/rose-mklink | ||||||
| 	rm $(CACHE_DIR) | 	rm $(DATA_DIR) | ||||||
| 
 | 
 | ||||||
| clean: | clean: | ||||||
| 	rm rose | 	rm rose | ||||||
| 	rm $(CACHE_DIR) | 	rm $(DATA_DIR) | ||||||
| 
 | 
 | ||||||
| format: $(SRC) $(PLUGINS) | format: $(SRC) $(PLUGINS) | ||||||
| 	$(FORMATTER) $(SRC) $(PLUGINS) $(rose.h) | 	$(FORMATTER) $(SRC) $(PLUGINS) $(rose.h) | ||||||
|  | 
 | ||||||
|  | diagnose_deprecations: | ||||||
|  | 	make && G_ENABLE_DIAGNOSTIC=1 ./rose | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								rose.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								rose.c
									
									
									
									
									
								
							|  | @ -78,7 +78,7 @@ void handle_signal_load_changed(WebKitWebView* self, WebKitLoadEvent load_event, | ||||||
| { | { | ||||||
|     switch (load_event) { |     switch (load_event) { | ||||||
|         /* see <https://webkitgtk.org/reference/webkit2gtk/2.5.1/WebKitWebView.html>
 |         /* see <https://webkitgtk.org/reference/webkit2gtk/2.5.1/WebKitWebView.html>
 | ||||||
|      */ |          */ | ||||||
|     case WEBKIT_LOAD_STARTED: |     case WEBKIT_LOAD_STARTED: | ||||||
|         set_custom_style(self); |         set_custom_style(self); | ||||||
|         redirect_if_annoying(self, webkit_web_view_get_uri(self)); |         redirect_if_annoying(self, webkit_web_view_get_uri(self)); | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user