Updated readme

ChangeLog

@@ -1,4 +1,4 @@
-2015-05-03 master
+2015-05-23 master
 - Note: the changes listed here are based on the previous release tint2 0.11, however some distributions (e.g. Debian)
   offered packages using newer commits and/or patches; thus from the user's perspective some of these features are
   already present. They are marked with '(already released by distros)'.

README.md

@@ -1,14 +1,14 @@
-### New unstable release: 0.12-rc4
+### New unstable release: 0.12-rc5
 Changes: https://gitlab.com/o9000/tint2/blob/master/ChangeLog
 
 Documentation: https://gitlab.com/o9000/tint2/wikis/home
 
 Try it out with (see also [dependencies](https://gitlab.com/o9000/tint2/wikis/Install#dependencies)):
 ```
-mkdir tint2-0.12-rc4
-cd tint2-0.12-rc4
-wget 'https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12-rc4' --output-document tint2-0.12-rc4.tar.gz
-tar -xzf tint2-0.12-rc4.tar.gz
+mkdir tint2-0.12-rc5
+cd tint2-0.12-rc5
+wget 'https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12-rc5' --output-document tint2-0.12-rc5.tar.gz
+tar -xzf tint2-0.12-rc5.tar.gz
 cd tint2.git
 mkdir build
 cd build

src/launcher/launcher.c

@@ -404,7 +404,7 @@ void launcher_action(LauncherIcon *icon, XEvent* evt)
 	char *cmd = calloc(strlen(icon->cmd) + 10, 1);
 	sprintf(cmd, "(%s&)", icon->cmd);
 #if HAVE_SN
-	SnLauncherContext* ctx;
+	SnLauncherContext* ctx = 0;
 	Time time;
 	if (startup_notifications) {
 		ctx = sn_launcher_context_new(server.sn_dsp, server.screen);

src/server.h

@@ -15,9 +15,8 @@
 
 #ifdef HAVE_SN
 #include <libsn/sn.h>
-#include <glib.h>
 #endif
-
+#include <glib.h>
 
 typedef struct Global_atom
 {
@@ -155,4 +154,4 @@ void get_monitors();
 void get_desktops();
 int server_get_number_of_desktops();
 
-#endif
+#endif

src/systray/systraybar.c

@@ -610,17 +610,20 @@ void systray_render_icon_now(void* t)
 		return;
 	}
 
+	int empty = 1;
 	XImage *ximage = XGetImage(server.dsp, traywin->tray_id, 0, 0, traywin->width, traywin->height, AllPlanes, XYPixmap);
-	XColor color;
-	int x, y, empty = 1;
-	for (x = 0; empty && x < traywin->width; x++) {
-		for (y = 0; empty && y < traywin->height; y++) {
-			color.pixel = XGetPixel(ximage, x, y);
-			if (color.pixel != 0)
-				empty = 0;
+	if (ximage) {
+		XColor color;
+		int x, y;
+		for (x = 0; empty && x < traywin->width; x++) {
+			for (y = 0; empty && y < traywin->height; y++) {
+				color.pixel = XGetPixel(ximage, x, y);
+				if (color.pixel != 0)
+					empty = 0;
+			}
 		}
+		XFree(ximage);
 	}
-	XFree(ximage);
 	if (traywin->empty != empty) {
 		traywin->empty = empty;
 		systray.area.resize = 1;

src/tint2conf/CMakeLists.txt

@@ -56,13 +56,17 @@ target_link_libraries( tint2conf ${X11_T2C_LIBRARIES}
                                  ${RSVG_LIBRARIES} )
 
 if ( NOT DATADIR )
-  set( DATADIR share )
+  set(DATADIR share)
 endif( NOT DATADIR )
 
 add_definitions( -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" )
+add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${DATADIR}/locale\" )
+add_definitions( -DGETTEXT_PACKAGE=\"tint2conf\" )
 set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -pthread" )
 set_target_properties( tint2conf PROPERTIES LINK_FLAGS "-pthread" )
 
+add_subdirectory(po)
+
 install( TARGETS tint2conf DESTINATION bin )
 install( FILES tint2conf.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
 install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )

src/tint2conf/main.c

@@ -119,26 +119,12 @@ static const char *global_ui =
 	"  </popup>"
 	"</ui>";
 
-
-// define menubar and toolbar action
-static GtkActionEntry entries[] = {
-	{"ThemeMenu", NULL, _("Theme"), NULL, NULL, NULL},
-	{"ThemeAdd", GTK_STOCK_ADD, _("_Import theme..."), "<Control>N", _("Import theme"), G_CALLBACK(menuImport)},
-	{"ThemeDefault", GTK_STOCK_NEW, _("_Import default theme..."), NULL, _("Import default theme"), G_CALLBACK(menuImportDefault)},
-	{"ThemeSaveAs", GTK_STOCK_SAVE_AS, _("_Save as..."), NULL, _("Save theme as"), G_CALLBACK(menuSaveAs)},
-	{"ThemeDelete", GTK_STOCK_DELETE, _("_Delete"), NULL, _("Delete theme"), G_CALLBACK(menuDelete)},
-	{"ThemeProperties", GTK_STOCK_PROPERTIES, _("_Edit theme..."), NULL, _("Edit selected theme"), G_CALLBACK(edit_current_theme)},
-	{"ThemeQuit", GTK_STOCK_QUIT, _("_Quit"), "<control>Q", _("Quit"), G_CALLBACK(gtk_main_quit)},
-	{"EditMenu", NULL, "Edit", NULL, NULL, NULL},
-	{"EditRefresh", GTK_STOCK_REFRESH, _("Refresh"), NULL, _("Refresh"), G_CALLBACK(refresh_current_theme)},
-	{"EditRefreshAll", GTK_STOCK_REFRESH, _("Refresh all"), NULL, _("Refresh all"), G_CALLBACK(load_all_themes)},
-	{"HelpMenu", NULL, _("Help"), NULL, NULL, NULL},
-	{"HelpAbout", GTK_STOCK_ABOUT, _("_About"), "<Control>A", _("About"), G_CALLBACK(menuAbout)}
-};
-
-
 int main(int argc, char **argv)
 {
+	bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+	textdomain(GETTEXT_PACKAGE);
+
 	GtkWidget *vBox = NULL, *scrollbar = NULL;
 	GtkActionGroup *actionGroup;
 
@@ -167,6 +153,23 @@ int main(int argc, char **argv)
 	gtk_container_add(GTK_CONTAINER(g_window), vBox);
 
 	actionGroup = gtk_action_group_new("menuActionGroup");
+
+	// Menubar and toolbar entries
+	GtkActionEntry entries[] = {
+		{"ThemeMenu", NULL, _("Theme"), NULL, NULL, NULL},
+		{"ThemeAdd", GTK_STOCK_ADD, _("_Import theme..."), "<Control>N", _("Import theme"), G_CALLBACK(menuImport)},
+		{"ThemeDefault", GTK_STOCK_NEW, _("_Import default theme..."), NULL, _("Import default theme"), G_CALLBACK(menuImportDefault)},
+		{"ThemeSaveAs", GTK_STOCK_SAVE_AS, _("_Save as..."), NULL, _("Save theme as"), G_CALLBACK(menuSaveAs)},
+		{"ThemeDelete", GTK_STOCK_DELETE, _("_Delete"), NULL, _("Delete theme"), G_CALLBACK(menuDelete)},
+		{"ThemeProperties", GTK_STOCK_PROPERTIES, _("_Edit theme..."), NULL, _("Edit selected theme"), G_CALLBACK(edit_current_theme)},
+		{"ThemeQuit", GTK_STOCK_QUIT, _("_Quit"), "<control>Q", _("Quit"), G_CALLBACK(gtk_main_quit)},
+		{"EditMenu", NULL, _("Edit"), NULL, NULL, NULL},
+		{"EditRefresh", GTK_STOCK_REFRESH, _("Refresh"), NULL, _("Refresh"), G_CALLBACK(refresh_current_theme)},
+		{"EditRefreshAll", GTK_STOCK_REFRESH, _("Refresh all"), NULL, _("Refresh all"), G_CALLBACK(load_all_themes)},
+		{"HelpMenu", NULL, _("Help"), NULL, NULL, NULL},
+		{"HelpAbout", GTK_STOCK_ABOUT, _("_About"), "<Control>A", _("About"), G_CALLBACK(menuAbout)}
+	};
+
 	gtk_action_group_add_actions(actionGroup, entries, G_N_ELEMENTS(entries), NULL);
 	globalUIManager = gtk_ui_manager_new();
 	gtk_ui_manager_insert_action_group(globalUIManager, actionGroup, 0);

src/tint2conf/main.h

@@ -11,6 +11,7 @@
 #include <glib/gi18n-lib.h>
 #else
 #define _(String) String
+#define GETTEXT_PACKAGE "tint2conf"
 #endif
 
 #define SNAPSHOT_TICK 190

src/tint2conf/po/CMakeLists.txt

@@ -0,0 +1,20 @@
+include(FindGettext)
+if (GETTEXT_FOUND)
+    set(GETTEXT_PACKAGE tint2conf)
+    file(GLOB POTFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.po")
+    string(REPLACE ".po" " " LANGUAGES ${POTFILES})
+    message(STATUS "gettext found languages: ${LANGUAGES}")
+    string(REPLACE " " ";" LANGUAGES ${LANGUAGES})
+    if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.8")
+        GETTEXT_CREATE_TRANSLATIONS("${CMAKE_CURRENT_SOURCE_DIR}/tint2conf.pot" ALL ${POTFILES})
+    else()
+        foreach(LANG ${LANGUAGES})
+            GETTEXT_PROCESS_PO_FILES(${LANG} ALL PO_FILES ${LANG}.po)
+            install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo"
+                    DESTINATION "${CMAKE_INSTALL_PREFIX}/${DATADIR}/locale/${LANG}/LC_MESSAGES"
+                    RENAME "${GETTEXT_PACKAGE}.mo")
+            endforeach ()
+    endif()
+else ()
+    message(STATUS "gettext not found")
+endif ()