|
From: <ale...@us...> - 2003-11-03 00:26:48
|
Update of /cvsroot/morphix/langconf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv3027/src
Modified Files:
main.c main.h
Log Message:
added some make-install fixes, cleanups
Index: main.c
===================================================================
RCS file: /cvsroot/morphix/langconf/src/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.c 28 Oct 2003 01:46:06 -0000 1.2
--- main.c 3 Nov 2003 00:26:45 -0000 1.3
***************
*** 32,36 ****
GtkTreeModel *model;
gchar *loc_desc;
! debug("Selection chaned\n");
if (gtk_tree_selection_get_selected(selection,&model,&iter)) {
gtk_tree_model_get(model,&iter, LANG_DESC, &loc_desc, -1);
--- 32,36 ----
GtkTreeModel *model;
gchar *loc_desc;
! debug("Selection changed\n");
if (gtk_tree_selection_get_selected(selection,&model,&iter)) {
gtk_tree_model_get(model,&iter, LANG_DESC, &loc_desc, -1);
***************
*** 50,53 ****
--- 50,64 ----
FILE *fp = NULL;
GtkWidget *image = lookup_widget(MainWindow,"image1");
+
+ gchar *image_loc;
+ gint length = strlen(PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/globe.png");
+ image_loc = (gchar *)malloc(length + 1);
+ if (image_loc == NULL) {
+ debug("Malloc failed in setup!\n");
+ }
+ strcpy(image_loc,PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/globe.png");
+ gtk_image_set_from_file(GTK_IMAGE(image),image_loc);
+ free(image_loc);
+ /*
fp = fopen(GLOBE_LOC,"r");
if (fp == NULL) {
***************
*** 60,63 ****
--- 71,75 ----
gtk_image_set_from_file(GTK_IMAGE(image),GLOBE_LOC);
}
+ */
read_locale_list();
setup_language_list();
Index: main.h
===================================================================
RCS file: /cvsroot/morphix/langconf/src/main.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** main.h 26 Oct 2003 23:02:46 -0000 1.1.1.1
--- main.h 3 Nov 2003 00:26:45 -0000 1.2
***************
*** 3,9 ****
#include <gtk/gtk.h>
!
#define GLOBE_LOC "/home/alex/Projects/langconf/pixmaps/globe.png"
#define GLOBE_LOC_2 "/usr/share/langconf/globe.png"
void quit_langconf();
void setup_language_list();
--- 3,10 ----
#include <gtk/gtk.h>
! /*
#define GLOBE_LOC "/home/alex/Projects/langconf/pixmaps/globe.png"
#define GLOBE_LOC_2 "/usr/share/langconf/globe.png"
+ */
void quit_langconf();
void setup_language_list();
|