Commit 3873e40d authored by Simon Morlat's avatar Simon Morlat

restore intl of .ui files (thanks intltool grrr)

parent ec314446
......@@ -62,9 +62,6 @@ PACKAGE_WIN32_FILELIST=$(PACKAGE)-win32.filelist
PACKAGE_BUNDLE_FILE=$(top_srcdir)/build/macos/$(PACKAGE).bundle
EXTRA_DIST = config.rpath BUGS linphone.kdevelop \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
README.arm \
README.mingw \
README.macos \
......@@ -75,7 +72,7 @@ EXTRA_DIST = config.rpath BUGS linphone.kdevelop \
$(LINPHONEDEPS_FILELIST) \
$(ISS_SCRIPT).in
DISTCLEANFILES= intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache $(ISS_SCRIPT) $(PACKAGE_WIN32_FILELIST)
DISTCLEANFILES= $(ISS_SCRIPT) $(PACKAGE_WIN32_FILELIST)
CLEANFILES=Portfile Portfile-devel
......
......@@ -1431,8 +1431,11 @@ int main(int argc, char *argv[]){
g_object_set(settings, "gtk-menu-images", TRUE, NULL);
g_object_set(settings, "gtk-button-images", TRUE, NULL);
if (workingdir!=NULL)
chdir(workingdir);
if (workingdir!=NULL){
if (chdir(workingdir)==-1){
g_error("Could not change directory to %s : %s",workingdir,strerror(errno));
}
}
/* Now, look for the factory configuration file, we do it this late
since we want to have had time to change directory and to parse
......
......@@ -11,18 +11,18 @@ gtk/buddylookup.c
gtk/setupwizard.c
gtk/incall_view.c
gtk/loginframe.c
gtk/main.ui
gtk/about.ui
gtk/contact.ui
gtk/log.ui
gtk/password.ui
gtk/call_logs.ui
gtk/main.ui
gtk/sip_account.ui
gtk/chatroom.ui
gtk/parameters.ui
gtk/buddylookup.ui
gtk/waiting.ui
[type: gettext/glade]gtk/main.ui
[type: gettext/glade]gtk/about.ui
[type: gettext/glade]gtk/contact.ui
[type: gettext/glade]gtk/log.ui
[type: gettext/glade]gtk/password.ui
[type: gettext/glade]gtk/call_logs.ui
[type: gettext/glade]gtk/main.ui
[type: gettext/glade]gtk/sip_account.ui
[type: gettext/glade]gtk/chatroom.ui
[type: gettext/glade]gtk/parameters.ui
[type: gettext/glade]gtk/buddylookup.ui
[type: gettext/glade]gtk/waiting.ui
coreapi/linphonecore.c
coreapi/misc.c
coreapi/presence.c
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment