@@ -18,9 +18,6 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H -/* Define if you have libenchant */ -#undef HAVE_ENCHANT - /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT @@ -60,9 +57,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* ISO codes prefix */ -#undef ISO_CODES_PREFIX - /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR config.h.in @@ -732,7 +732,7 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='get2gnow' PACKAGE_TARNAME='get2gnow' -PACKAGE_VERSION='0.0.eC.b4' +PACKAGE_VERSION='0.0.eC.DB3' PACKAGE_PREFIX="${prefix}" PACKAGE_STRING="${PACKAGE_NAME} ${PACKAGE_VERSION}" PACKAGE_BUGREPORT="http://uberChicGeekChick.Com/?projects=${PACKAGE_NAME}" @@ -937,10 +937,6 @@ LIBget2gnow_CFLAGS LIBget2gnow_LIBS get2gnow_CFLAGS get2gnow_LIBS -ENCHANT_CFLAGS -ENCHANT_LIBS -HAVE_ENCHANT_TRUE -HAVE_ENCHANT_FALSE GETTEXT_PACKAGE USE_NLS MSGFMT_OPTS @@ -978,9 +974,7 @@ GNOME_KEYRING_LIBS LIBget2gnow_CFLAGS LIBget2gnow_LIBS get2gnow_CFLAGS -get2gnow_LIBS -ENCHANT_CFLAGS -ENCHANT_LIBS' +get2gnow_LIBS' # Initialize some variables set by options. @@ -1582,8 +1576,6 @@ Optional Features: --enable-debug turn on debugging --enable-gnome-keyring=[no/yes/auto] compile with Gnome Keyring support - --enable-spell=[no/yes/auto] - compile with spell support Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1621,10 +1613,6 @@ Some influential environment variables: get2gnow_CFLAGS C compiler flags for get2gnow, overriding pkg-config get2gnow_LIBS linker flags for get2gnow, overriding pkg-config - ENCHANT_CFLAGS - C compiler flags for ENCHANT, overriding pkg-config - ENCHANT_LIBS - linker flags for ENCHANT, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -22740,7 +22728,7 @@ echo "${ECHO_T}$complCXXFLAGS" >&6; } - # Check whether --enable-debug was given. +# Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then enableval=$enable_debug; else @@ -22775,7 +22763,6 @@ GTK_REQUIRED=2.12.12 GCONF_REQUIRED=1.2.0 LIBGIO_REQUIRED=2.15.5 LIBCANBERRA_REQUIRED=0.4 -ENCHANT_REQUIRED=1.2.0 ISO_CODES_REQUIRED=0.35 @@ -23146,150 +23133,6 @@ echo "${ECHO_T}yes" >&6; } fi - -# Check whether --enable-spell was given. -if test "${enable_spell+set}" = set; then - enableval=$enable_spell; -else - enable_spell=auto -fi - - -if test "x$enable_spell" != "xno"; then - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for ENCHANT" >&5 -echo $ECHO_N "checking for ENCHANT... $ECHO_C" >&6; } - -if test -n "$ENCHANT_CFLAGS"; then - pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - enchant >= \$ENCHANT_REQUIRED, - iso-codes >= \$ISO_CODES_REQUIRED - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - enchant >= $ENCHANT_REQUIRED, - iso-codes >= $ISO_CODES_REQUIRED - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags " - enchant >= $ENCHANT_REQUIRED, - iso-codes >= $ISO_CODES_REQUIRED - " 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$ENCHANT_LIBS"; then - pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - enchant >= \$ENCHANT_REQUIRED, - iso-codes >= \$ISO_CODES_REQUIRED - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - enchant >= $ENCHANT_REQUIRED, - iso-codes >= $ISO_CODES_REQUIRED - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs " - enchant >= $ENCHANT_REQUIRED, - iso-codes >= $ISO_CODES_REQUIRED - " 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " - enchant >= $ENCHANT_REQUIRED, - iso-codes >= $ISO_CODES_REQUIRED - " 2>&1` - else - ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors " - enchant >= $ENCHANT_REQUIRED, - iso-codes >= $ISO_CODES_REQUIRED - " 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$ENCHANT_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - have_enchant="no" -elif test $pkg_failed = untried; then - have_enchant="no" -else - ENCHANT_CFLAGS=$pkg_cv_ENCHANT_CFLAGS - ENCHANT_LIBS=$pkg_cv_ENCHANT_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - have_enchant="yes" -fi - - if test "x$have_enchant" = "xyes"; then - { echo "$as_me:$LINENO: checking whether iso-codes has iso-639 and iso-3166 domains" >&5 -echo $ECHO_N "checking whether iso-codes has iso-639 and iso-3166 domains... $ECHO_C" >&6; } - if $PKG_CONFIG --variable=domains iso-codes | grep 639 > /dev/null && \ - $PKG_CONFIG --variable=domains iso-codes | grep 3166 > /dev/null ; then - -cat >>confdefs.h <<_ACEOF -#define ISO_CODES_PREFIX "`$PKG_CONFIG --variable=prefix iso-codes`" -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_ENCHANT -_ACEOF - - result=yes - else - result=no - have_enchant="no" - fi - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - fi -else - have_enchant=no -fi - -if test "x$enable_spell" = "xyes" -a "x$have_enchant" != "xyes"; then - { { echo "$as_me:$LINENO: error: Couldn't find spell dependencies." >&5 -echo "$as_me: error: Couldn't find spell dependencies." >&2;} - { (exit 1); exit 1; }; } -fi - - if test "x$have_enchant" = "xyes"; then - HAVE_ENCHANT_TRUE= - HAVE_ENCHANT_FALSE='#' -else - HAVE_ENCHANT_TRUE='#' - HAVE_ENCHANT_FALSE= -fi - - GETTEXT_PACKAGE=get2gnow @@ -24988,13 +24831,6 @@ echo "$as_me: error: conditional \"HAVE_GNOME_KEYRING\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_ENCHANT_TRUE}" && test -z "${HAVE_ENCHANT_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_ENCHANT\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_ENCHANT\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -25740,10 +25576,6 @@ LIBget2gnow_CFLAGS!$LIBget2gnow_CFLAGS$ac_delim LIBget2gnow_LIBS!$LIBget2gnow_LIBS$ac_delim get2gnow_CFLAGS!$get2gnow_CFLAGS$ac_delim get2gnow_LIBS!$get2gnow_LIBS$ac_delim -ENCHANT_CFLAGS!$ENCHANT_CFLAGS$ac_delim -ENCHANT_LIBS!$ENCHANT_LIBS$ac_delim -HAVE_ENCHANT_TRUE!$HAVE_ENCHANT_TRUE$ac_delim -HAVE_ENCHANT_FALSE!$HAVE_ENCHANT_FALSE$ac_delim GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim USE_NLS!$USE_NLS$ac_delim MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim @@ -25761,7 +25593,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -26389,6 +26221,9 @@ fi echo echo "Prefix: $prefix" -echo "Spell: $have_enchant" echo "GNOME Keyring: $have_gnome_keyring" +echo "Debug Mode: $enable_debug" +if test x$enable_debug = xyes ; then + echo "Debug BUILDDIR: $ac_pwd" +fi echo configure @@ -1,4 +1,4 @@ -AC_INIT([get2gnow], [0.0.eC.b4], [http://uberChicGeekChick.Com/?projects=get2gnow], [get2gnow]) +AC_INIT([get2gnow], [0.0.eC.DB3], [http://uberChicGeekChick.Com/?projects=get2gnow], [get2gnow]) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (C) 2009 Kaity G. B.]) @@ -42,7 +42,6 @@ GTK_REQUIRED=2.12.12 GCONF_REQUIRED=1.2.0 LIBGIO_REQUIRED=2.15.5 LIBCANBERRA_REQUIRED=0.4 -ENCHANT_REQUIRED=1.2.0 ISO_CODES_REQUIRED=0.35 dnl ----------------------------------------------------------- @@ -98,44 +97,6 @@ AC_SUBST(get2gnow_CFLAGS) AC_SUBST(get2gnow_LIBS) dnl ----------------------------------------------------------- -dnl Enchant -dnl ----------------------------------------------------------- -AC_ARG_ENABLE(spell, - AS_HELP_STRING([--enable-spell=@<:@no/yes/auto@:>@], - [compile with spell support]), , - enable_spell=auto) - -if test "x$enable_spell" != "xno"; then - PKG_CHECK_MODULES(ENCHANT, - [ - enchant >= $ENCHANT_REQUIRED, - iso-codes >= $ISO_CODES_REQUIRED - ], have_enchant="yes", have_enchant="no") - - if test "x$have_enchant" = "xyes"; then - AC_MSG_CHECKING([whether iso-codes has iso-639 and iso-3166 domains]) - if $PKG_CONFIG --variable=domains iso-codes | grep 639 > /dev/null && \ - $PKG_CONFIG --variable=domains iso-codes | grep 3166 > /dev/null ; then - AC_DEFINE_UNQUOTED(ISO_CODES_PREFIX, ["`$PKG_CONFIG --variable=prefix iso-codes`"], [ISO codes prefix]) - AC_DEFINE(HAVE_ENCHANT, [], [Define if you have libenchant]) - result=yes - else - result=no - have_enchant="no" - fi - AC_MSG_RESULT([$result]) - fi -else - have_enchant=no -fi - -if test "x$enable_spell" = "xyes" -a "x$have_enchant" != "xyes"; then - AC_MSG_ERROR([Couldn't find spell dependencies.]) -fi - -AM_CONDITIONAL(HAVE_ENCHANT, test "x$have_enchant" = "xyes") - -dnl ----------------------------------------------------------- dnl Language Support dnl ----------------------------------------------------------- GETTEXT_PACKAGE=get2gnow @@ -154,7 +115,10 @@ po/Makefile ]) echo -echo "Prefix: $prefix" -echo "Spell: $have_enchant" -echo "GNOME Keyring: $have_gnome_keyring" +echo "Prefix: $prefix" +echo "GNOME Keyring: $have_gnome_keyring" +echo "Debug Mode: $enable_debug" +if test x$enable_debug = xyes ; then + echo "Debug BUILDDIR: $abs_top_builddir" +fi echo configure.in @@ -1,6 +1,5 @@ <?xml version="1.0"?> <interface> - <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> <object class="GtkWindow" id="main_window"> <property name="width_request">230</property> @@ -17,12 +16,12 @@ <object class="GtkMenuBar" id="main_menubar"> <property name="visible">True</property> <child> - <object class="GtkMenuItem" id="services"> + <object class="GtkMenuItem" id="connections"> <property name="visible">True</property> - <property name="label" translatable="yes">_Services</property> + <property name="label" translatable="yes">_Connections</property> <property name="use_underline">True</property> <child type="submenu"> - <object class="GtkMenu" id="twitter_menu"> + <object class="GtkMenu" id="connections_menu"> <child> <object class="GtkImageMenuItem" id="twitter_connect"> <property name="label">_Connect</property> @@ -205,9 +204,9 @@ </object> </child> <child> - <object class="GtkRadioMenuItem" id="view_direct_replies"> + <object class="GtkRadioMenuItem" id="view_mentions"> <property name="visible">True</property> - <property name="label" translatable="yes">_@ Replies</property> + <property name="label" translatable="yes">_@ Mentions</property> <property name="use_underline">True</property> <property name="group">view_public_timeline</property> </object> @@ -359,10 +358,11 @@ <object class="GtkMenu" id="help_menu"> <child> <object class="GtkImageMenuItem" id="help_contents"> - <property name="label">gtk-help</property> + <property name="label">_Help</property> <property name="visible">True</property> <property name="use_underline">True</property> - <property name="use_stock">True</property> + <property name="image">image19</property> + <property name="use_stock">False</property> <property name="accel_group">accelgroup1</property> <accelerator key="F1" signal="activate"/> </object> @@ -607,8 +607,8 @@ <placeholder/> </child> <child> - <object class="GtkHBox" id="hbox2"> - <property name="visible">True</property> + <object class="GtkHBox" id="friends_hbox"> + <property name="sensitive">False</property> <child> <object class="GtkLabel" id="friends_label"> <property name="sensitive">False</property> @@ -1009,4 +1009,8 @@ _Controls</property> <column type="gchararray"/> </columns> </object> + <object class="GtkImage" id="image19"> + <property name="visible">True</property> + <property name="stock">gtk-help</property> + </object> </interface> data/main-window.ui @@ -8,8 +8,7 @@ AM_CFLAGS= \ -DDATADIR=\""$(datadir)"\" \ -DLOCALEDIR=\""$(localedir)"\" \ -DLIBDIR=\""$(libdir)"\" \ - $(get2gnow_CFLAGS) \ - $(ENCHANT_CFLAGS) \ + $(get2gnow_CFLAGS) \ $(WARN_CFLAGS) \ -std=$(C_STD_MODE) @@ -19,7 +18,7 @@ if HAVE_GNOME_KEYRING keyring_sources = keyring.c keyring.h endif -get2gnow_SOURCES = \ +get2gnow_SOURCES = \ $(keyring_sources) \ main.c main.h \ gconf.c gconf.h \ @@ -50,5 +49,4 @@ get2gnow_SOURCES = \ get2gnow_LDADD= \ - $(get2gnow_LIBS) \ - $(ENCHANT_LIBS) + $(get2gnow_LIBS) src/Makefile.am @@ -154,8 +154,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ -ENCHANT_LIBS = @ENCHANT_LIBS@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -307,13 +305,11 @@ AM_CFLAGS = \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DLOCALEDIR=\""$(localedir)"\" \ - $(get2gnow_CFLAGS) \ - $(ENCHANT_CFLAGS) \ + $(get2gnow_CFLAGS) \ $(WARN_CFLAGS) get2gnow_LDADD = \ - $(get2gnow_LIBS) \ - $(ENCHANT_LIBS) + $(get2gnow_LIBS) all: all-am src/Makefile.in @@ -61,7 +61,7 @@ struct _AppPriv { GtkWindow *window; GtkMenuBar *menubar; - GtkMenuItem *menu_services; + GtkMenuItem *menu_connections; GtkMenuItem *menu_tweets; GtkMenuItem *menu_friends; GtkMenuItem *menu_timelines; @@ -84,7 +84,7 @@ struct _AppPriv { GtkRadioMenuItem *timeline_friends; GtkRadioMenuItem *timeline_mine; GtkRadioMenuItem *timeline_dm; - GtkRadioMenuItem *timeline_replies; + GtkRadioMenuItem *timeline_mentions; GtkRadioMenuItem *timeline_favorites; GtkAction *friends_menu_friends_manager; @@ -116,6 +116,7 @@ struct _AppPriv { GtkWidget *expand_label; /* Stuff for sending a dm to a selected user. */ + GtkHBox *friends_hbox; GtkLabel *friends_label; GtkComboBox *friends_combo; GtkButton *friends_send_dm; @@ -260,7 +261,7 @@ static void app_setup(void){ "main_window", &app_priv->window, "main_menubar", &app_priv->menubar, - "services", &app_priv->menu_services, + "connections", &app_priv->menu_connections, "tweets", &app_priv->menu_tweets, "friends", &app_priv->menu_friends, "timelines", &app_priv->menu_timelines, @@ -274,7 +275,7 @@ static void app_setup(void){ "view_friends_timeline", &app_priv->timeline_friends, "view_my_timeline", &app_priv->timeline_mine, "view_direct_messages", &app_priv->timeline_dm, - "view_direct_replies", &app_priv->timeline_replies, + "view_mentions", &app_priv->timeline_mentions, "view_favorites_timeline", &app_priv->timeline_favorites, "friends_menu_friends_manager", &app_priv->friends_menu_friends_manager, @@ -301,6 +302,8 @@ static void app_setup(void){ "expanded_tweet_count", &app_priv->expanded_tweet_count, "sexy_send", &app_priv->sexy_send, "sexy_dm", &app_priv->sexy_dm, + + "friends_hbox", &app_priv->friends_hbox, "friends_combo", &app_priv->friends_combo, "friends_label", &app_priv->friends_label, "friends_send_dm", &app_priv->friends_send_dm, @@ -321,56 +324,54 @@ static void app_setup(void){ /* Connect the signals */ gtkbuilder_connect( ui, app, - "main_window", "destroy", main_window_destroy_cb, - "main_window", "delete_event", main_window_delete_event_cb, - "main_window", "configure_event", app_window_configure_event_cb, - - "twitter_connect", "activate", app_connect_cb, - "twitter_disconnect", "activate", app_disconnect_cb, - "accounts", "activate", app_accounts_cb, - "preferences", "activate", app_preferences_cb, - "quit", "activate", app_quit_cb, - - "tweets_new_tweet", "activate", tweets_new_tweet, - "tweets_reply", "activate", tweets_reply, - "tweets_retweet", "activate", tweets_retweet, - "tweets_save_fave", "activate", tweets_save_fave, - "tweets_new_dm", "activate", tweets_new_dm, - - "twitter_refresh", "activate", app_refresh_timeline, - "view_combined_timeline", "activate", app_timeline_cb, - "view_public_timeline", "activate", app_timeline_cb, - "view_friends_timeline", "activate", app_timeline_cb, - "view_my_timeline", "activate", app_timeline_cb, - "view_direct_messages", "activate", app_timeline_cb, - "view_direct_replies", "activate", app_timeline_cb, - "view_favorites_timeline", "activate", app_timeline_cb, - - "friends_menu_friends_manager", "activate", friends_menu_request, - "friends_menu_timelines", "activate", friends_menu_request, - "friends_menu_follow", "activate", friends_menu_request, - "friends_menu_unfollow", "activate", friends_menu_request, - "friends_menu_block", "activate", friends_menu_request, - "friends_menu_tweets", "activate", friends_menu_request, - "friends_menu_profile", "activate", friends_menu_request, - - "help_contents", "activate", app_help_contents_cb, - "help_about", "activate", app_about_cb, - - "expanded_tweet_dm_button", "clicked", tweets_new_dm, - "expanded_tweet_view_users_profile_button", "clicked", tweets_user_view_profile, - "expanded_tweet_view_users_timeline_button", "clicked", tweets_user_view_tweets, - - "expanded_tweet_user_follow_button", "clicked", tweets_user_follow, - "expanded_tweet_user_unfollow_button", "clicked", tweets_user_unfollow, - "expanded_tweet_user_block_button", "clicked", tweets_user_block, - - "dm_data_hide", "clicked", app_dm_data_hide, - - "expanded_tweet_reply_button", "clicked", tweets_reply, - "expanded_tweet_retweet_button", "clicked", tweets_retweet, - "expanded_tweet_make_fave_button", "clicked", tweets_save_fave, - NULL + "main_window", "destroy", main_window_destroy_cb, + "main_window", "delete_event", main_window_delete_event_cb, + "main_window", "configure_event", app_window_configure_event_cb, + + "twitter_connect", "activate", app_connect_cb, + "twitter_disconnect", "activate", app_disconnect_cb, + "accounts", "activate", app_accounts_cb, + "preferences", "activate", app_preferences_cb, + "quit", "activate", app_quit_cb, + + "tweets_new_tweet", "activate", tweets_new_tweet, + "tweets_reply", "activate", tweets_reply, + "tweets_retweet", "activate", tweets_retweet, + "tweets_save_fave", "activate", tweets_save_fave, + "tweets_new_dm", "activate", tweets_new_dm, + + "twitter_refresh", "activate", app_refresh_timeline, + "view_combined_timeline", "activate", app_timeline_cb, + "view_public_timeline", "activate", app_timeline_cb, + "view_friends_timeline", "activate", app_timeline_cb, + "view_my_timeline", "activate", app_timeline_cb, + "view_direct_messages", "activate", app_timeline_cb, + "view_mentions", "activate", app_timeline_cb, + "view_favorites_timeline", "activate", app_timeline_cb, + + "friends_menu_friends_manager", "activate", friends_menu_request, + "friends_menu_timelines", "activate", friends_menu_request, + "friends_menu_follow", "activate", friends_menu_request, + "friends_menu_unfollow", "activate", friends_menu_request, + "friends_menu_block", "activate", friends_menu_request, + "friends_menu_tweets", "activate", friends_menu_request, + "friends_menu_profile", "activate", friends_menu_request, + + "help_contents", "activate", app_help_contents_cb, + "help_about", "activate", app_about_cb, + + "expanded_tweet_dm_button", "clicked", tweets_new_dm, + "expanded_tweet_view_users_profile_button", "clicked", tweets_user_view_profile, + "expanded_tweet_view_users_timeline_button", "clicked", tweets_user_view_tweets, + + "expanded_tweet_user_follow_button", "clicked", tweets_user_follow, + "expanded_tweet_user_unfollow_button", "clicked", tweets_user_unfollow, + "expanded_tweet_user_block_button", "clicked", tweets_user_block, + + "expanded_tweet_reply_button", "clicked", tweets_reply, + "expanded_tweet_retweet_button", "clicked", tweets_retweet, + "expanded_tweet_make_fave_button", "clicked", tweets_save_fave, + NULL ); /* Set up connected related widgets */ @@ -476,6 +477,7 @@ static void app_init_expanded_tweet(void){ g_signal_connect(app_priv->sexy_entry, "activate", G_CALLBACK(tweets_send_sexy), NULL); g_signal_connect(app_priv->sexy_send, "clicked", G_CALLBACK(tweets_sexy_send_clicked), app_priv->sexy_entry); g_signal_connect(app_priv->sexy_dm, "clicked", G_CALLBACK(tweets_sexy_dm_clicked), app_priv->sexy_entry); + g_signal_connect(app_priv->dm_data_hide, "clicked", G_CALLBACK(app_dm_data_hide), app_priv->dm_data_hide); }//app_init_expanded_tweet GtkWindow *app_get_window(void){ @@ -490,10 +492,14 @@ GtkComboBox *app_get_friends_combo_box(void){ return app_priv->friends_combo; }//app_get_friends_combo_box -SexySpellEntry *app_get_sexy_entry(void){ +SexySpellEntry *app_get_sexy(void){ return app_priv->sexy_entry; }//app_get_sexy_entry +GtkEntry *app_get_sexy_entry(void){ + return GTK_ENTRY(app_priv->sexy_entry); +}//app_get_sexy_entry + void app_set_sexy_entry(gchar *tweet){ gtk_entry_set_text(GTK_ENTRY(app_priv->sexy_entry), tweet); app_select_sexy_entry(); @@ -504,8 +510,19 @@ void app_select_sexy_entry(void){ gtk_entry_set_position(GTK_ENTRY(app_priv->sexy_entry), -1 ); }//app_select_sexy_entry +void app_sexy_append_char(const char c){ + gchar *str=g_strdup_printf("%c", c); + app_sexy_append_string((const gchar *)str); + g_free(str); +}//app_sexy_append_char + +void app_sexy_append_string(const gchar *str){ + gint position=(gint)gtk_entry_get_text_length(GTK_ENTRY(app_priv->sexy_entry)); + gtk_editable_insert_text(GTK_EDITABLE(app_priv->sexy_entry), str, -1, &position ); +}//app_sexy_append_string + GtkMenuItem *app_get_menu(const gchar *menu){ - if( (g_str_equal(menu, "services")) ) return GET_PRIV(app)->menu_services; + if( (g_str_equal(menu, "connections")) ) return GET_PRIV(app)->menu_connections; if( (g_str_equal(menu, "tweets")) ) return GET_PRIV(app)->menu_tweets; if( (g_str_equal(menu, "friends")) ) return GET_PRIV(app)->menu_friends; if( (g_str_equal(menu, "timelines")) ) return GET_PRIV(app)->menu_timelines; @@ -542,6 +559,8 @@ void app_dm_data_fill(GList *followers){ } void app_dm_data_show(void){ + gtk_widget_show( GTK_WIDGET(app_priv->friends_hbox) ); + gtk_widget_set_sensitive( GTK_WIDGET(app_priv->friends_hbox), TRUE ); gtk_widget_show( GTK_WIDGET(app_priv->friends_combo) ); gtk_widget_set_sensitive( GTK_WIDGET(app_priv->friends_combo), TRUE ); gtk_widget_show( GTK_WIDGET(app_priv->friends_label) ); @@ -554,6 +573,8 @@ void app_dm_data_show(void){ } void app_dm_data_hide(void){ + gtk_widget_hide( GTK_WIDGET(app_priv->friends_hbox) ); + gtk_widget_set_sensitive( GTK_WIDGET(app_priv->friends_hbox), FALSE ); gtk_widget_hide( GTK_WIDGET(app_priv->friends_combo) ); gtk_widget_set_sensitive( GTK_WIDGET(app_priv->friends_combo), FALSE ); gtk_widget_hide( GTK_WIDGET(app_priv->friends_label) ); @@ -605,7 +626,7 @@ static void app_set_radio_group(App *app, GtkBuilder *ui){ const gchar *radio_actions[] = { "view_combined_timeline", "view_friends_timeline", - "view_direct_replies", + "view_mentions", "view_direct_messages", "view_favorites_timeline", "view_my_timeline", @@ -694,8 +715,8 @@ static void app_timeline_cb(GtkRadioMenuItem *item, App *app){ if(GTK_CHECK_MENU_ITEM(app_priv->timeline_dm)->active) return network_get_timeline(API_DIRECT_MESSAGES); - if(GTK_CHECK_MENU_ITEM(app_priv->timeline_replies)->active) - return network_get_timeline(API_REPLIES); + if(GTK_CHECK_MENU_ITEM(app_priv->timeline_mentions)->active) + return network_get_timeline(API_MENTIONS); if(GTK_CHECK_MENU_ITEM(app_priv->timeline_friends)->active) return network_get_timeline(API_TIMELINE_FRIENDS); @@ -927,8 +948,8 @@ static void app_set_default_timeline(App *app, gchar *timeline){ if( (g_str_equal(timeline, API_TIMELINE_FRIENDS)) ) return gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(app_priv->timeline_friends), TRUE); - if( (g_str_equal(timeline, API_REPLIES)) ) - return gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(app_priv->timeline_replies), TRUE); + if( (g_str_equal(timeline, API_MENTIONS)) ) + return gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(app_priv->timeline_mentions), TRUE); if( (g_str_equal(timeline, API_DIRECT_MESSAGES)) ) return gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(app_priv->timeline_dm), TRUE); src/app.c @@ -64,8 +64,11 @@ GtkWindow *app_get_window(void); TweetList *app_get_tweet_list(void); GtkMenuBar *app_get_main_menu(void); GtkComboBox *app_get_friends_combo_box(void); -SexySpellEntry *app_get_sexy_entry(void); +SexySpellEntry *app_get_sexy(void); +GtkEntry *app_get_sexy_entry(void); void app_set_sexy_entry(gchar *tweet); +void app_sexy_append_char(const char c); +void app_sexy_append_string(const gchar *str); void app_select_sexy_entry(void); GtkMenuItem *app_get_menu(const gchar *menu); void app_refresh_timeline(GtkWidget *window, App *app); src/app.h @@ -409,7 +409,7 @@ void network_get_combined_timeline(void){ /* SoupMessage *msg; */ gchar *timelines[]={ API_TIMELINE_FRIENDS, - API_REPLIES, + API_MENTIONS, API_DIRECT_MESSAGES, NULL }; src/network.c @@ -41,7 +41,7 @@ #define API_TIMELINE_FRIENDS "/statuses/friends_timeline.xml" #define API_TIMELINE_MY "/statuses/user_timeline.xml" #define API_TIMELINE_USER "/statuses/user_timeline/%s.xml" -#define API_REPLIES "/statuses/replies.xml" +#define API_MENTIONS "/statuses/mentions.xml" #define API_DIRECT_MESSAGES "/direct_messages.xml" #define API_FAVORITES "/favorites.xml" src/network.h @@ -136,7 +136,7 @@ static void preferences_notify_bool_cb (Conf *conf, const gchar *key, gpointer u static void preferences_timeline_setup (Prefs *prefs){ static const gchar *timelines[] = { API_TIMELINE_FRIENDS, N_("My Friends' Tweets"), - API_REPLIES, N_("@ Replies"), + API_MENTIONS, N_("@ Mentions"), API_DIRECT_MESSAGES, N_("My DMs Inbox"), API_FAVORITES, N_("My Favorites"), API_TIMELINE_MY, N_("My Tweets"), src/preferences.c @@ -75,7 +75,7 @@ typedef struct SelectedTweet { gchar *tweet; } SelectedTweet;//SelectedTweet -static void tweets_include_and_begin_to_send(gchar *tweet, gboolean release); +static void tweets_include_and_begin_to_send(gchar *tweet, gboolean a_response, gboolean release); unsigned long int in_reply_to_status_id=0; @@ -106,9 +106,11 @@ void tweets_hotkey(GtkWidget *widget, GdkEventKey *event){ switch( event->state ){ case GDK_MOD1_MASK: switch(event->keyval){ - case GDK_Return: return tweets_retweet(); case GDK_S: case GDK_s: - return g_signal_emit_by_name(app_get_menu("services"), "activate"); + return tweets_send(); + case GDK_Return: return tweets_retweet(); + case GDK_C: case GDK_c: + return g_signal_emit_by_name(app_get_menu("connections"), "activate"); case GDK_T: case GDK_t: return g_signal_emit_by_name(app_get_menu("tweets"), "activate"); case GDK_F: case GDK_f: @@ -130,6 +132,7 @@ void tweets_hotkey(GtkWidget *widget, GdkEventKey *event){ case GDK_CONTROL_MASK: switch( event->keyval ){ case GDK_Return: + return app_sexy_append_char('\n'); case GDK_N: case GDK_n: return tweets_new_tweet(); case GDK_Q: case GDK_q: @@ -167,15 +170,13 @@ void tweets_hotkey(GtkWidget *widget, GdkEventKey *event){ void tweets_new_tweet(void){ if(in_reply_to_status_id) in_reply_to_status_id=0; - tweets_include_and_begin_to_send("", FALSE); + tweets_include_and_begin_to_send("", FALSE, FALSE); }//tweets_new_tweet void tweets_reply(void){ - if(!selected_tweet) - return; + if(!selected_tweet) return; gchar *tweet=g_strdup_printf("@%s ", selected_tweet->user_name); - in_reply_to_status_id=selected_tweet->id; - tweets_include_and_begin_to_send(tweet, TRUE); + tweets_include_and_begin_to_send(tweet, TRUE, TRUE); }//tweets_reply void tweets_retweet(void){ @@ -183,23 +184,38 @@ void tweets_retweet(void){ return; gchar *tweet=g_strdup_printf("RT @%s %s", selected_tweet->user_name, selected_tweet->tweet); in_reply_to_status_id=selected_tweet->id; - tweets_include_and_begin_to_send(tweet, TRUE); + tweets_include_and_begin_to_send(tweet, TRUE, TRUE); }//tweets_retweet +static void tweets_include_and_begin_to_send(gchar *tweet, gboolean a_response, gboolean release){ + if(!(tweet)) return; + if(a_response) in_reply_to_status_id=selected_tweet->id; + app_set_sexy_entry(tweet); + if(release) g_free(tweet); +}//tweets_include_and_begin_to_send + +static gshort tweetlen(gchar *tweet){ + gushort character_count=0; + while(*tweet){ + unsigned char l=*tweet++; + if(l=='<' || l=='>') + character_count+=3; + character_count++; + } + return TWEET_MAX_CHARS-character_count; +}//tweets_coun_tweet_length + void tweets_update_expanded_count(GtkEntry *entry, GdkEventKey *event, GtkLabel *tweet_character_counter){ - static guint excess_count=0; + gshort character_count=tweetlen(entry->text); gchar *remaining_characters=NULL; - gint character_count=160 - gtk_entry_get_text_length(entry); if(character_count < 0){ - if(!( (++excess_count)%10 )) - gtk_widget_error_bell(GTK_WIDGET(entry)); + gtk_widget_error_bell(GTK_WIDGET(entry)); remaining_characters=g_markup_printf_escaped("<span size=\"small\" foreground=\"red\">%i</span>", character_count); - }else{ - if(excess_count) excess_count=0; + }else remaining_characters=g_markup_printf_escaped("<span size=\"small\" foreground=\"green\">%i</span>", character_count); - } gtk_label_set_markup( tweet_character_counter, remaining_characters ); + g_free(remaining_characters); }//tweets_update_expanded_count void tweets_sexy_send_clicked(GtkButton *button, GtkEntry *entry){ @@ -220,27 +236,37 @@ void tweets_sexy_dm_clicked(GtkButton *button, GtkEntry *entry){ tweets_send_sexy(entry, selected_tweet->user_name); }//tweets_sexy_dm_clicked +void tweets_send(void){ + gchar *user_name=NULL; + GtkEntry *entry=app_get_sexy_entry(); + if(!(entry->text)){ + gtk_widget_error_bell(GTK_WIDGET(entry)); + return; + } + user_name=gtk_combo_box_get_active_text(app_get_friends_combo_box()); + tweets_send_sexy(entry, user_name); + if(user_name) g_free(user_name); +}//tweet_send + void tweets_send_sexy(GtkEntry *entry, gpointer user_data){ - if( G_STR_EMPTY(entry->text) || gtk_entry_get_text_length(entry) > 160 ) { + if( G_STR_EMPTY(entry->text) ) + return tweets_reply(); + + if(gtk_entry_get_text_length(entry) > TWEET_MAX_CHARS ) { gtk_widget_error_bell(GTK_WIDGET(entry)); return; } - gchar *tweet=g_strdup(url_encode(entry->text)); + gchar *tweet=url_encode(entry->text); const gchar *user_name=(const gchar *)user_data; if(G_STR_EMPTY(user_name)) network_post_status(tweet); else network_send_message(user_name, (const gchar *)tweet); + g_free(tweet); app_set_sexy_entry((gchar *)""); }//tweets_send_sexy -static void tweets_include_and_begin_to_send(gchar *tweet, gboolean release){ - if(G_STR_EMPTY(tweet)) return; - app_set_sexy_entry(tweet); - if(release) g_free(tweet); -}//tweets_include_and_begin_to_send - void tweets_new_dm(void){ user_get_and_set_followers(); }//tweets_new_dm src/tweets.c @@ -36,6 +36,8 @@ #define TWEETS_RETURN_MODIFIERS_STATUSBAR_MSG "HotKeys: press [Return] and '@' to reply, '>' to re-tweet, [Ctrl+N] to tweet, and/or [Ctrl+D] or <Shift>+[Return] to DM." +#define TWEET_MAX_CHARS 140 + extern unsigned long int in_reply_to_status_id; G_BEGIN_DECLS @@ -70,6 +72,7 @@ void tweets_update_expanded_count(GtkEntry *entry, GdkEventKey *event, GtkLabel void tweets_sexy_send_clicked(GtkButton *button, GtkEntry *entry); void tweets_sexy_dm_clicked(GtkButton *button, GtkEntry *entry); void tweets_send_sexy(GtkEntry *entry, gpointer user_data); +void tweets_send(void); G_END_DECLS src/tweets.h 424fedfac3001d3fa5d07e47354a85b12aac5440 uberChick uberchick@uberchicgeekchick.com http://github.com/uberchicgeekchick/get2gnow/commit/87b5b3e930fc6ddac28be8bbf4fd15d51e69f313 87b5b3e930fc6ddac28be8bbf4fd15d51e69f313 2009-04-25T22:03:19-07:00 2009-04-25T22:03:19-07:00 get2gnow 0.0.eC.DB3: A get2gnow 1st: Twitter's new 'mentions' resource implemented. Also includes many bug-fixes, tweaks, & hacks toward version 1.0.0 release. Twitter has implemented several changes to their REST resources. One major one is they've dropped their '/status/replies.?' in favor of a new resource: '/status/mentions.?'. I have implimented this new resource and updated my menu, UI, and etc. I've also re-implemented my pre-GTK+2.0 - 2.16 hack so once again get2gnow will work just fine on any thing past GTK+2.0 - 2.12. I have fixed some more issues with FriendRequest actions. Again these all occur when Twitter respondes incorrectly. This is because the original code did not validate responses from Twitter it only checks http_status code. I still need to add further validation but I have fixed several random segfaults. I have also improved my new tweeting interface. I've added a keyboard hotkey for 'Alt+S' to send tweets & dms. I added this for any one who was used to submitting tweets through the old UI. The fastest way way to press 'Alt+S', I found myself pressing this quit often out of per habit, when trying to send my tweets. This is only a temporary shortcut but one I hope will continue to make get2gnow as usable as possible. I have also removed the enchant checking routines from configure & etc. As spell checking is now handled by libsexy, which requires enchant right now, but may change its spell cheching engine later. So either way get2gnow no longer uses or needs to know anything about enchant so it no longer looks. Next is adding support for having an identi.ca account as well. And than extending that to support multiple twitter & laconica accounts & services. Committed on: 2009-04-25 @ 11:03:16 PM 57cfe8883cc9fef689c2cbba51a75b2e42ef270d uberChick uberchick@uberchicgeekchick.com