2 new revisions:
Revision: a6dd5402b3f0
Author: Muneyuki Noguchi <[email protected]>
Date: Sun Jun 10 01:57:27 2012
Log: Don't mix declarations and code in C....
http://code.google.com/p/uim/source/detail?r=a6dd5402b3f0
Revision: 65c28dbbf66d
Author: Muneyuki Noguchi <[email protected]>
Date: Sun Jun 10 02:02:20 2012
Log: Don't use gtk3-rc-get-immodule-file any more....
http://code.google.com/p/uim/source/detail?r=65c28dbbf66d
==============================================================================
Revision: a6dd5402b3f0
Author: Muneyuki Noguchi <[email protected]>
Date: Sun Jun 10 01:57:27 2012
Log: Don't mix declarations and code in C.
* gtk2/candwin/horizontal-gtk.c
- (label_draw): Don't mix declarations and code because ISO C90 forbits
that.
* gtk2/immodule/uim-cand-win-horizontal-gtk.c
- Ditto.
http://code.google.com/p/uim/source/detail?r=a6dd5402b3f0
Modified:
/gtk2/candwin/horizontal-gtk.c
/gtk2/immodule/uim-cand-win-horizontal-gtk.c
=======================================
--- /gtk2/candwin/horizontal-gtk.c Sun Jun 10 00:27:29 2012
+++ /gtk2/candwin/horizontal-gtk.c Sun Jun 10 01:57:27 2012
@@ -274,17 +274,16 @@
UIMCandidateWindow *cwin = UIM_CANDIDATE_WINDOW(data);
struct index_button *selected;
GtkWidget *selected_label = NULL;
-
- selected = cwin->selected;
- if (selected)
- selected_label = gtk_bin_get_child(GTK_BIN(selected->button));
-
GdkRGBA *bg_color, *fg_color;
GtkStyleContext *context;
PangoLayout *layout;
gint x, y;
GtkStateFlags state;
+ selected = cwin->selected;
+ if (selected)
+ selected_label = gtk_bin_get_child(GTK_BIN(selected->button));
+
layout = gtk_label_get_layout(GTK_LABEL(label));
gtk_label_get_layout_offsets(GTK_LABEL(label), &x, &y);
=======================================
--- /gtk2/immodule/uim-cand-win-horizontal-gtk.c Mon Apr 30 21:39:16 2012
+++ /gtk2/immodule/uim-cand-win-horizontal-gtk.c Sun Jun 10 01:57:27 2012
@@ -211,17 +211,16 @@
UIMCandWinHorizontalGtk *horizontal_cwin = data;
struct index_button *selected;
GtkWidget *selected_label = NULL;
-
- selected = horizontal_cwin->selected;
- if (selected)
- selected_label = gtk_bin_get_child(GTK_BIN(selected->button));
-
GdkRGBA *bg_color, *fg_color;
GtkStyleContext *context;
PangoLayout *layout;
gint x, y;
GtkStateFlags state;
+ selected = horizontal_cwin->selected;
+ if (selected)
+ selected_label = gtk_bin_get_child(GTK_BIN(selected->button));
+
layout = gtk_label_get_layout(GTK_LABEL(label));
gtk_label_get_layout_offsets(GTK_LABEL(label), &x, &y);
==============================================================================
Revision: 65c28dbbf66d
Author: Muneyuki Noguchi <[email protected]>
Date: Sun Jun 10 02:02:20 2012
Log: Don't use gtk3-rc-get-immodule-file any more.
* gtk3/immodule/Makefile.am
- (gtk3_rc_get_immodule_file_SOURCES,
gtk3_rc_get_immodule_file_CFLAGS,
gtk3_rc_get_immodule_file_LDADD,
GTK3_RC_GET_IMMODULE_FILE): Remove.
http://code.google.com/p/uim/source/detail?r=65c28dbbf66d
Modified:
/gtk3/immodule/Makefile.am
=======================================
--- /gtk3/immodule/Makefile.am Mon Apr 30 19:43:24 2012
+++ /gtk3/immodule/Makefile.am Sun Jun 10 02:02:20 2012
@@ -35,26 +35,16 @@
../../gtk2/immodule/compose.c ../../gtk2/immodule/compose.h \
../../gtk2/immodule/text-util.c ../../gtk2/immodule/text-util.h
-noinst_PROGRAMS = gtk3-rc-get-immodule-file
-gtk3_rc_get_immodule_file_SOURCES = \
- ../../gtk2/immodule/gtk-rc-get-immodule-file.c
-gtk3_rc_get_immodule_file_CFLAGS = @GTK3_CFLAGS@
-gtk3_rc_get_immodule_file_LDADD = @GTK3_LIBS@
-GTK3_RC_GET_IMMODULE_FILE =
$(top_builddir)/gtk3/immodule/gtk3-rc-get-immodule-file
QUERY_COMMAND = gtk-query-immodules-3.0
-install-data-hook: gtk3-rc-get-immodule-file
+install-data-hook:
if test -z $(DESTDIR); then \
if test $(libdir) = $(GTK3_LIBDIR); then \
if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
$(QUERY_COMMAND) --update-cache; \
- echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \
else \
echo "********************** Warning ***********************"; \
echo " $(QUERY_COMMAND) not found"; \
- echo " Please make sure to update"; \
- echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \
- echo " manually."; \
echo "******************************************************"; \
fi \
else \
